Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2912542 by jibran: Update twig/twig from v1.32.0 to v1.35.0

8.5.x
Alex Pott 2017-10-12 13:08:51 +01:00
parent b85856f417
commit 693aed2acc
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
composer.lock generated
View File

@ -2257,35 +2257,38 @@
}, },
{ {
"name": "twig/twig", "name": "twig/twig",
"version": "v1.32.0", "version": "v1.35.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twigphp/Twig.git", "url": "https://github.com/twigphp/Twig.git",
"reference": "9935b662e24d6e634da88901ab534cc12e8c728f" "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/9935b662e24d6e634da88901ab534cc12e8c728f", "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
"reference": "9935b662e24d6e634da88901ab534cc12e8c728f", "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.2.7" "php": ">=5.3.3"
}, },
"require-dev": { "require-dev": {
"psr/container": "^1.0", "psr/container": "^1.0",
"symfony/debug": "~2.7", "symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~3.2" "symfony/phpunit-bridge": "~3.3@dev"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.32-dev" "dev-master": "1.35-dev"
} }
}, },
"autoload": { "autoload": {
"psr-0": { "psr-0": {
"Twig_": "lib/" "Twig_": "lib/"
},
"psr-4": {
"Twig\\": "src/"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@ -2315,7 +2318,7 @@
"keywords": [ "keywords": [
"templating" "templating"
], ],
"time": "2017-02-27T00:07:03+00:00" "time": "2017-09-27T18:06:46+00:00"
}, },
{ {
"name": "wikimedia/composer-merge-plugin", "name": "wikimedia/composer-merge-plugin",

2
core/composer.json
View File

@ -18,7 +18,7 @@
"symfony/process": "~3.2.8", "symfony/process": "~3.2.8",
"symfony/polyfill-iconv": "^1.0", "symfony/polyfill-iconv": "^1.0",
"symfony/yaml": "~3.2.8", "symfony/yaml": "~3.2.8",
"twig/twig": "^1.23.1", "twig/twig": "^1.35.0",
"doctrine/common": "^2.5", "doctrine/common": "^2.5",
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.2",
"guzzlehttp/guzzle": "^6.2.1", "guzzlehttp/guzzle": "^6.2.1",

2
core/tests/Drupal/KernelTests/Core/Theme/TwigMarkupInterfaceTest.php
View File

@ -57,7 +57,7 @@ class TwigMarkupInterfaceTest extends KernelTestBase {
'empty GeneratedLink' => ['', new GeneratedLink()], 'empty GeneratedLink' => ['', new GeneratedLink()],
'non-empty GeneratedLink' => ['<span><a hef="http://www.example.com">test</a></span>', (new GeneratedLink())->setGeneratedLink('<a hef="http://www.example.com">test</a>')], 'non-empty GeneratedLink' => ['<span><a hef="http://www.example.com">test</a></span>', (new GeneratedLink())->setGeneratedLink('<a hef="http://www.example.com">test</a>')],
// Test objects that do not implement \Countable. // Test objects that do not implement \Countable.
'empty SafeMarkupTestMarkup' => ['<span></span>', SafeMarkupTestMarkup::create('')], 'empty SafeMarkupTestMarkup' => ['', SafeMarkupTestMarkup::create('')],
'non-empty SafeMarkupTestMarkup' => ['<span>test</span>', SafeMarkupTestMarkup::create('test')], 'non-empty SafeMarkupTestMarkup' => ['<span>test</span>', SafeMarkupTestMarkup::create('test')],
]; ];
} }