Updating Symfony lib and dependencies:

Package operations: 2 installs, 23 updates, 0 removals - Updating psr/log (1.1.0 => 1.1.2) - Updating symfony/debug (v3.4.30 => v3.4.35) - Updating symfony/console (v3.4.30 => v3.4.35) - Updating symfony/dotenv (v3.4.30 => v3.4.35) - Updating symfony/routing (v3.4.30 => v3.4.35) - Updating symfony/finder (v3.4.30 => v3.4.35) - Updating symfony/filesystem (v3.4.30 => v3.4.35) - Installing symfony/polyfill-util (v1.12.0) - Installing symfony/polyfill-php56 (v1.12.0) - Updating symfony/http-foundation (v3.4.30 => v3.4.35) - Updating symfony/event-dispatcher (v3.4.30 => v3.4.35) - Updating symfony/http-kernel (v3.4.30 => v3.4.35) - Updating symfony/config (v3.4.30 => v3.4.35) - Updating symfony/dependency-injection (v3.4.30 => v3.4.35) - Updating symfony/class-loader (v3.4.30 => v3.4.35) - Updating symfony/cache (v3.4.30 => v3.4.35) - Updating symfony/framework-bundle (v3.4.30 => v3.4.35) - Updating twig/twig (v1.42.2 => v1.42.4) - Updating symfony/twig-bridge (v3.4.30 => v3.4.35) - Updating symfony/twig-bundle (v3.4.30 => v3.4.35) - Updating symfony/yaml (v3.4.30 => v3.4.35) - Updating symfony/stopwatch (v3.4.30 => v3.4.35) - Updating symfony/var-dumper (v3.4.30 => v3.4.35) - Updating symfony/web-profiler-bundle (v3.4.30 => v3.4.35) - Updating symfony/css-selector (v3.4.30 => v3.4.35)
2026-04-24 02:58:43 +02:00 · 2019-11-18 18:04:32 +01:00
parent 532eb466a1
commit c76cccd2e7
633 changed files with 4154 additions and 4093 deletions
--- a/lib/twig/twig/.gitignore
+++ b/lib/twig/twig/.gitignore
@@ -3,3 +3,4 @@
 /ext/twig/autom4te.cache/
 /phpunit.xml
 /vendor
+.phpunit.result.cache
--- a/lib/twig/twig/.php_cs.dist
+++ b/lib/twig/twig/.php_cs.dist
@@ -4,6 +4,8 @@ return PhpCsFixer\Config::create()
    ->setRules([
        '@Symfony' => true,
        '@Symfony:risky' => true,
+        '@PHPUnit75Migration:risky' => true,
+        'php_unit_dedicate_assert' => ['target' => '5.6'],
        'array_syntax' => ['syntax' => 'short'],
        'php_unit_fqcn_annotation' => true,
        'no_unreachable_default_argument_value' => false,
--- a/lib/twig/twig/.travis.yml
+++ b/lib/twig/twig/.travis.yml
@@ -1,5 +1,7 @@
 language: php

+dist: trusty
+
 sudo: false

 cache:
@@ -7,8 +9,11 @@ cache:
        - vendor
        - $HOME/.composer/cache/files

+
 env:
-    - TWIG_EXT=no
+    global:
+        - TWIG_EXT=no
+        - SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1

 before_install:
    - phpenv config-rm xdebug.ini || return 0
@@ -25,9 +30,6 @@ script: ./vendor/bin/simple-phpunit
 jobs:
    fast_finish: true
    include:
-        - php: 5.4
-        - php: 5.4
-          env: TWIG_EXT=yes
        - php: 5.5
        - php: 5.5
          env: TWIG_EXT=yes
--- a/lib/twig/twig/CHANGELOG
+++ b/lib/twig/twig/CHANGELOG
@@ -1,3 +1,16 @@
+* 1.42.4 (2019-11-11)
+
+ * optimized "block('foo') ?? 'bar"
+ * added supported for exponential numbers
+
+* 1.42.3 (2019-08-24)
+
+ * fixed the "split" filter when the delimiter is "0"
+ * fixed the "empty" test on Traversable instances
+ * fixed cache when opcache is installed but disabled
+ * fixed PHP 7.4 compatibility
+ * bumped the minimal PHP version to 5.5
+
 * 1.42.2 (2019-06-18)

 * Display partial output (PHP buffer) when an error occurs in debug mode
--- a/lib/twig/twig/README.rst
+++ b/lib/twig/twig/README.rst
@@ -7,6 +7,15 @@ and documentation).
 Twig uses a syntax similar to the Django and Jinja template languages which
 inspired the Twig runtime environment.

+Sponsors
+--------
+
+.. raw:: html
+
+    <a href="https://blackfire.io/docs/introduction?utm_source=twig&utm_medium=github_readme&utm_campaign=logo">
+        <img src="https://static.blackfire.io/assets/intemporals/logo/png/blackfire-io_secondary_horizontal_transparent.png?1" width="255px" alt="Blackfire.io">
+    </a>
+
 More Information
 ----------------

--- a/lib/twig/twig/composer.json
+++ b/lib/twig/twig/composer.json
@@ -24,12 +24,12 @@
        }
    ],
    "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0",
        "symfony/polyfill-ctype": "^1.8"
    },
    "require-dev": {
-        "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0",
-        "symfony/debug": "^2.7",
+        "symfony/phpunit-bridge": "^4.4@dev|^5.0",
+        "symfony/debug": "^3.4|^4.2",
        "psr/container": "^1.0"
    },
    "autoload": {
@@ -40,6 +40,11 @@
            "Twig\\" : "src/"
        }
    },
+    "autoload-dev": {
+        "psr-4" : {
+            "Twig\\Tests\\" : "tests"
+        }
+    },
    "extra": {
        "branch-alias": {
            "dev-master": "1.42-dev"
--- a/lib/twig/twig/ext/twig/php_twig.h
+++ b/lib/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H

-#define PHP_TWIG_VERSION "1.42.2"
+#define PHP_TWIG_VERSION "1.42.4"

 #include "php.h"

--- a/lib/twig/twig/phpunit.xml.dist
+++ b/lib/twig/twig/phpunit.xml.dist
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="vendor/autoload.php"
->
-  <testsuites>
-    <testsuite name="Twig Test Suite">
-      <directory>./test/Twig/</directory>
-    </testsuite>
-  </testsuites>
-
-  <php>
-    <ini name="error_reporting" value="-1" />
-    <ini name="xdebug.overload_var_dump" value="0" />
-  </php>
-
-  <listeners>
-    <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-  </listeners>
-
-  <filter>
-    <whitelist>
-      <directory suffix=".php">./src/</directory>
-    </whitelist>
-  </filter>
-</phpunit>
--- a/lib/twig/twig/src/Cache/FilesystemCache.php
+++ b/lib/twig/twig/src/Cache/FilesystemCache.php
@@ -67,8 +67,8 @@ class FilesystemCache implements CacheInterface

            if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
                // Compile cached file into bytecode cache
-                if (\function_exists('opcache_invalidate')) {
-                    opcache_invalidate($key, true);
+                if (\function_exists('opcache_invalidate') && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
+                    @opcache_invalidate($key, true);
                } elseif (\function_exists('apc_compile_file')) {
                    apc_compile_file($key);
                }
--- a/lib/twig/twig/src/Environment.php
+++ b/lib/twig/twig/src/Environment.php
@@ -41,11 +41,11 @@ use Twig\TokenParser\TokenParserInterface;
 */
 class Environment
 {
-    const VERSION = '1.42.2';
-    const VERSION_ID = 14202;
+    const VERSION = '1.42.4';
+    const VERSION_ID = 14204;
    const MAJOR_VERSION = 1;
    const MINOR_VERSION = 42;
-    const RELEASE_VERSION = 2;
+    const RELEASE_VERSION = 4;
    const EXTRA_VERSION = '';

    protected $charset;
@@ -515,7 +515,7 @@ class Environment
     *
     * This method should not be used as a generic way to load templates.
     *
-     * @param string $template The template name
+     * @param string $template The template source
     * @param string $name     An optional name of the template to be used in error messages
     *
     * @return TemplateWrapper A template instance representing the given template name
--- a/lib/twig/twig/src/Extension/CoreExtension.php
+++ b/lib/twig/twig/src/Extension/CoreExtension.php
@@ -790,7 +790,7 @@ function twig_join_filter($value, $glue = '', $and = null)
 */
 function twig_split_filter(Environment $env, $value, $delimiter, $limit = null)
 {
-    if (!empty($delimiter)) {
+    if (\strlen($delimiter) > 0) {
        return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
    }

@@ -1507,6 +1507,10 @@ function twig_test_empty($value)
        return 0 == \count($value);
    }

+    if ($value instanceof \Traversable) {
+        return !iterator_count($value);
+    }
+
    if (\is_object($value) && method_exists($value, '__toString')) {
        return '' === (string) $value;
    }
--- a/lib/twig/twig/src/Lexer.php
+++ b/lib/twig/twig/src/Lexer.php
@@ -47,7 +47,7 @@ class Lexer implements \Twig_LexerInterface
    const STATE_INTERPOLATION = 4;

    const REGEX_NAME = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?/A';
+    const REGEX_NUMBER = '/[0-9]+(?:\.[0-9]+)?([Ee][\+\-][0-9]+)?/A';
    const REGEX_STRING = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
    const REGEX_DQ_STRING_DELIM = '/"/A';
    const REGEX_DQ_STRING_PART = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
--- a/lib/twig/twig/src/Node/Expression/NullCoalesceExpression.php
+++ b/lib/twig/twig/src/Node/Expression/NullCoalesceExpression.php
@@ -22,11 +22,15 @@ class NullCoalesceExpression extends ConditionalExpression
 {
    public function __construct(\Twig_NodeInterface $left, \Twig_NodeInterface $right, $lineno)
    {
-        $test = new AndBinary(
-            new DefinedTest(clone $left, 'defined', new Node(), $left->getTemplateLine()),
-            new NotUnary(new NullTest($left, 'null', new Node(), $left->getTemplateLine()), $left->getTemplateLine()),
-            $left->getTemplateLine()
-        );
+        $test = new DefinedTest(clone $left, 'defined', new Node(), $left->getTemplateLine());
+        // for "block()", we don't need the null test as the return value is always a string
+        if (!$left instanceof BlockReferenceExpression) {
+            $test = new AndBinary(
+                $test,
+                new NotUnary(new NullTest($left, 'null', new Node(), $left->getTemplateLine()), $left->getTemplateLine()),
+                $left->getTemplateLine()
+            );
+        }

        parent::__construct($test, $left, $right, $lineno);
    }
--- a/lib/twig/twig/src/Template.php
+++ b/lib/twig/twig/src/Template.php
@@ -537,7 +537,7 @@ abstract class Template implements \Twig_TemplateInterface
        if (self::METHOD_CALL !== $type) {
            $arrayItem = \is_bool($item) || \is_float($item) ? (int) $item : $item;

-            if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, $object)))
+            if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, (array) $object)))
                || ($object instanceof \ArrayAccess && isset($object[$arrayItem]))
            ) {
                if ($isDefinedTest) {
@@ -604,7 +604,7 @@ abstract class Template implements \Twig_TemplateInterface

        // object property
        if (self::METHOD_CALL !== $type && !$object instanceof self) { // \Twig\Template does not have public properties, and we don't want to allow access to internal ones
-            if (isset($object->$item) || \array_key_exists((string) $item, $object)) {
+            if (isset($object->$item) || \array_key_exists((string) $item, (array) $object)) {
                if ($isDefinedTest) {
                    return true;
                }