diff --git a/composer.lock b/composer.lock index 835ea153ac..ddaa66ee82 100644 --- a/composer.lock +++ b/composer.lock @@ -2257,35 +2257,38 @@ }, { "name": "twig/twig", - "version": "v1.32.0", + "version": "v1.35.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9935b662e24d6e634da88901ab534cc12e8c728f" + "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9935b662e24d6e634da88901ab534cc12e8c728f", - "reference": "9935b662e24d6e634da88901ab534cc12e8c728f", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f", + "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f", "shasum": "" }, "require": { - "php": ">=5.2.7" + "php": ">=5.3.3" }, "require-dev": { "psr/container": "^1.0", "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.2" + "symfony/phpunit-bridge": "~3.3@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.32-dev" + "dev-master": "1.35-dev" } }, "autoload": { "psr-0": { "Twig_": "lib/" + }, + "psr-4": { + "Twig\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2315,7 +2318,7 @@ "keywords": [ "templating" ], - "time": "2017-02-27T00:07:03+00:00" + "time": "2017-09-27T18:06:46+00:00" }, { "name": "wikimedia/composer-merge-plugin", diff --git a/core/composer.json b/core/composer.json index bda527f99d..c802e5d6ee 100644 --- a/core/composer.json +++ b/core/composer.json @@ -18,7 +18,7 @@ "symfony/process": "~3.2.8", "symfony/polyfill-iconv": "^1.0", "symfony/yaml": "~3.2.8", - "twig/twig": "^1.23.1", + "twig/twig": "^1.35.0", "doctrine/common": "^2.5", "doctrine/annotations": "^1.2", "guzzlehttp/guzzle": "^6.2.1", diff --git a/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php b/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php index d30d2de13d..dbdf351a71 100644 --- a/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php @@ -57,7 +57,7 @@ public function providerTestMarkupInterfaceEmpty() { 'empty GeneratedLink' => ['', new GeneratedLink()], 'non-empty GeneratedLink' => ['test', (new GeneratedLink())->setGeneratedLink('test')], // Test objects that do not implement \Countable. - 'empty SafeMarkupTestMarkup' => ['', SafeMarkupTestMarkup::create('')], + 'empty SafeMarkupTestMarkup' => ['', SafeMarkupTestMarkup::create('')], 'non-empty SafeMarkupTestMarkup' => ['test', SafeMarkupTestMarkup::create('test')], ]; }