From 219a1b9b88e5d01c51a5ebeb22aa2d89e32b1c3b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 13 Jul 2018 13:18:41 +0200
Subject: v1.35.4

---
 PHPINFO       |  4 ++++
 REFLECTION    |  2 +-
 composer.json |  7 ++++---
 php-twig.spec | 12 ++++++++----
 4 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 PHPINFO

diff --git a/PHPINFO b/PHPINFO
new file mode 100644
index 0000000..012644b
--- /dev/null
+++ b/PHPINFO
@@ -0,0 +1,4 @@
+
+twig
+
+Version => 1.35.4
diff --git a/REFLECTION b/REFLECTION
index 04b495e..4e4bef0 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #78 twig version 1.35.3 ] {
+Extension [ <persistent> extension #79 twig version 1.35.4 ] {
 
   - Functions {
     Function [ <internal:twig> function twig_template_get_attributes ] {
diff --git a/composer.json b/composer.json
index 7dab303..0a1728f 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Twig, the flexible, fast, and secure template language for PHP",
     "keywords": ["templating"],
-    "homepage": "http://twig.sensiolabs.org",
+    "homepage": "https://twig.symfony.com",
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -14,7 +14,7 @@
         },
         {
             "name": "Twig Team",
-            "homepage": "http://twig.sensiolabs.org/contributors",
+            "homepage": "https://twig.symfony.com/contributors",
             "role": "Contributors"
         },
         {
@@ -27,7 +27,8 @@
         "forum": "https://groups.google.com/forum/#!forum/twig-users"
     },
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=5.3.3",
+        "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^3.3",
diff --git a/php-twig.spec b/php-twig.spec
index 0c6e64d..389c32c 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -30,8 +30,8 @@
 
 %global github_owner     twigphp
 %global github_name      Twig
-%global github_version   1.35.3
-%global github_commit    b48680b6eb7d16b5025b9bfc4108d86f6b8af86f
+%global github_version   1.35.4
+%global github_commit    7e081e98378a1e78c29cc9eba4aefa5d78a05d2a
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %if "%{php_version}" < "7"
@@ -206,7 +206,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 %if %{with_ext}
 : Ext -- NTS
 mv ext/%{ext_name} ext/NTS
-%if %{with_zts}
+sed -e '/PHP_TWIG_VERSION/s/-DEV//' -i ext/NTS/php_twig.h
+	%if %{with_zts}
 : Ext -- ZTS
 cp -pr ext/NTS ext/ZTS
 %endif
@@ -315,7 +316,7 @@ sed -e '/listener/d' phpunit.xml.dist > phpunit.xml
 
 : Test suite without extension
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php70 php71 php72 php73; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit --verbose || ret=1
   fi
@@ -352,6 +353,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 13 2018 Remi Collet <remi@remirepo.net> - 1.35.4-1
+- update to 1.35.4
+
 * Tue Mar 20 2018 Remi Collet <remi@remirepo.net> - 1.35.3-1
 - update to 1.35.3
 
-- 
cgit