jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/392210 )
Change subject: Update twig....
......................................................................
Update twig....
Change-Id: Id33b8cafefa8a4cd2d4a93852426bb2875573501
---
M composer.lock
M multiversion/vendor/composer/autoload_classmap.php
M multiversion/vendor/composer/autoload_static.php
M multiversion/vendor/composer/installed.json
M multiversion/vendor/twig/twig/.travis.yml
M multiversion/vendor/twig/twig/CHANGELOG
M multiversion/vendor/twig/twig/composer.json
M multiversion/vendor/twig/twig/doc/templates.rst
M multiversion/vendor/twig/twig/ext/twig/php_twig.h
M multiversion/vendor/twig/twig/lib/Twig/Environment.php
M multiversion/vendor/twig/twig/lib/Twig/Profiler/Profile.php
M multiversion/vendor/twig/twig/lib/Twig/TokenParser/Use.php
M multiversion/vendor/twig/twig/phpunit.xml.dist
A multiversion/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
M multiversion/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Cache/FilesystemTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/ContainerRuntimeLoaderTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/CustomExtensionTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/FactoryRuntimeLoaderTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
M
multiversion/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
A
multiversion/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test
M multiversion/vendor/twig/twig/test/Twig/Tests/LexerTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/ParserTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/TemplateWrapperTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
M
multiversion/vendor/twig/twig/test/Twig/Tests/Util/DeprecationCollectorTest.php
M multiversion/vendor/twig/twig/test/Twig/Tests/escapingTest.php
D multiversion/vendor/twig/twig/test/bootstrap.php
44 files changed, 208 insertions(+), 110 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index a5e65f1..8a5ed93 100644
--- a/composer.lock
+++ b/composer.lock
@@ -135,7 +135,7 @@
}
],
"description": "Polyfill of PECL Mongo extension",
- "time": "2016-11-13 21:50:29"
+ "time": "2016-11-13T21:50:29+00:00"
},
{
"name": "perftools/xhgui",
@@ -331,16 +331,16 @@
},
{
"name": "twig/twig",
- "version": "v1.34.4",
+ "version": "v1.35.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git";,
- "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee"
+ "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/twigphp/Twig/zipball/f878bab48edb66ad9c6ed626bf817f60c6c096ee";,
- "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee",
+ "url":
"https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f";,
+ "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
"shasum": ""
},
"require": {
@@ -354,7 +354,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.34-dev"
+ "dev-master": "1.35-dev"
}
},
"autoload": {
@@ -392,38 +392,38 @@
"keywords": [
"templating"
],
- "time": "2017-07-04T13:19:31+00:00"
+ "time": "2017-09-27T18:06:46+00:00"
}
],
"packages-dev": [
{
"name": "doctrine/instantiator",
- "version": "1.0.5",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git";,
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+ "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d";,
- "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+ "url":
"https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda";,
+ "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
"shasum": ""
},
"require": {
- "php": ">=5.3,<8.0-DEV"
+ "php": "^7.1"
},
"require-dev": {
"athletic/athletic": "~0.1.8",
"ext-pdo": "*",
"ext-phar": "*",
- "phpunit/phpunit": "~4.0",
- "squizlabs/php_codesniffer": "~2.0"
+ "phpunit/phpunit": "^6.2.3",
+ "squizlabs/php_codesniffer": "^3.0.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -448,7 +448,7 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14T21:17:01+00:00"
+ "time": "2017-07-22T11:58:36+00:00"
},
{
"name": "jakub-onderka/php-parallel-lint",
@@ -535,16 +535,16 @@
},
{
"name": "phpdocumentor/reflection-common",
- "version": "1.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionCommon.git";,
- "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c";,
- "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+ "url":
"https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6";,
+ "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
"shasum": ""
},
"require": {
@@ -585,24 +585,24 @@
"reflection",
"static analysis"
],
- "time": "2015-12-27T11:43:31+00:00"
+ "time": "2017-09-11T18:02:19+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "3.2.0",
+ "version": "4.1.1",
"source": {
"type": "git",
"url":
"https://github.com/phpDocumentor/ReflectionDocBlock.git";,
- "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585"
+ "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/46f7e8bb075036c92695b15a1ddb6971c751e585";,
- "reference": "46f7e8bb075036c92695b15a1ddb6971c751e585",
+ "url":
"https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2";,
+ "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
"shasum": ""
},
"require": {
- "php": ">=5.5",
+ "php": "^7.0",
"phpdocumentor/reflection-common": "^1.0@dev",
"phpdocumentor/type-resolver": "^0.4.0",
"webmozart/assert": "^1.0"
@@ -630,7 +630,7 @@
}
],
"description": "With this component, a library can provide support
for annotations via DocBlocks or otherwise retrieve information that is
embedded in a DocBlock.",
- "time": "2017-07-15T11:38:20+00:00"
+ "time": "2017-08-30T18:51:59+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@@ -681,22 +681,22 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.7.0",
+ "version": "v1.7.2",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git";,
- "reference": "93d39f1f7f9326d746203c7c056f300f7f126073"
+ "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073";,
- "reference": "93d39f1f7f9326d746203c7c056f300f7f126073",
+ "url":
"https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6";,
+ "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.0.2",
"php": "^5.3|^7.0",
- "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+ "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
"sebastian/comparator": "^1.1|^2.0",
"sebastian/recursion-context": "^1.0|^2.0|^3.0"
},
@@ -707,7 +707,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.6.x-dev"
+ "dev-master": "1.7.x-dev"
}
},
"autoload": {
@@ -740,7 +740,7 @@
"spy",
"stub"
],
- "time": "2017-03-02T20:05:34+00:00"
+ "time": "2017-09-04T11:05:03+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -1570,20 +1570,20 @@
},
{
"name": "symfony/yaml",
- "version": "v3.3.5",
+ "version": "v3.3.13",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git";,
- "reference": "1f93a8d19b8241617f5074a123e282575b821df8"
+ "reference": "0938408c4faa518d95230deabb5f595bf0de31b9"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/symfony/yaml/zipball/1f93a8d19b8241617f5074a123e282575b821df8";,
- "reference": "1f93a8d19b8241617f5074a123e282575b821df8",
+ "url":
"https://api.github.com/repos/symfony/yaml/zipball/0938408c4faa518d95230deabb5f595bf0de31b9";,
+ "reference": "0938408c4faa518d95230deabb5f595bf0de31b9",
"shasum": ""
},
"require": {
- "php": ">=5.5.9"
+ "php": "^5.5.9|>=7.0.8"
},
"require-dev": {
"symfony/console": "~2.8|~3.0"
@@ -1621,7 +1621,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com";,
- "time": "2017-06-15T12:58:50+00:00"
+ "time": "2017-11-10T18:26:04+00:00"
},
{
"name": "webmozart/assert",
diff --git a/multiversion/vendor/composer/autoload_classmap.php
b/multiversion/vendor/composer/autoload_classmap.php
index 0a2df0a..7d8ecf6 100644
--- a/multiversion/vendor/composer/autoload_classmap.php
+++ b/multiversion/vendor/composer/autoload_classmap.php
@@ -83,6 +83,7 @@
'Twig\\Extension\\InitRuntimeInterface' => $vendorDir .
'/twig/twig/src/Extension/InitRuntimeInterface.php',
'Twig\\Extension\\OptimizerExtension' => $vendorDir .
'/twig/twig/src/Extension/OptimizerExtension.php',
'Twig\\Extension\\ProfilerExtension' => $vendorDir .
'/twig/twig/src/Extension/ProfilerExtension.php',
+ 'Twig\\Extension\\RuntimeExtensionInterface' => $vendorDir .
'/twig/twig/src/Extension/RuntimeExtensionInterface.php',
'Twig\\Extension\\SandboxExtension' => $vendorDir .
'/twig/twig/src/Extension/SandboxExtension.php',
'Twig\\Extension\\StagingExtension' => $vendorDir .
'/twig/twig/src/Extension/StagingExtension.php',
'Twig\\Extension\\StringLoaderExtension' => $vendorDir .
'/twig/twig/src/Extension/StringLoaderExtension.php',
diff --git a/multiversion/vendor/composer/autoload_static.php
b/multiversion/vendor/composer/autoload_static.php
index fecbd2e..7d0bf83 100644
--- a/multiversion/vendor/composer/autoload_static.php
+++ b/multiversion/vendor/composer/autoload_static.php
@@ -141,6 +141,7 @@
'Twig\\Extension\\InitRuntimeInterface' => __DIR__ . '/..' .
'/twig/twig/src/Extension/InitRuntimeInterface.php',
'Twig\\Extension\\OptimizerExtension' => __DIR__ . '/..' .
'/twig/twig/src/Extension/OptimizerExtension.php',
'Twig\\Extension\\ProfilerExtension' => __DIR__ . '/..' .
'/twig/twig/src/Extension/ProfilerExtension.php',
+ 'Twig\\Extension\\RuntimeExtensionInterface' => __DIR__ . '/..' .
'/twig/twig/src/Extension/RuntimeExtensionInterface.php',
'Twig\\Extension\\SandboxExtension' => __DIR__ . '/..' .
'/twig/twig/src/Extension/SandboxExtension.php',
'Twig\\Extension\\StagingExtension' => __DIR__ . '/..' .
'/twig/twig/src/Extension/StagingExtension.php',
'Twig\\Extension\\StringLoaderExtension' => __DIR__ . '/..' .
'/twig/twig/src/Extension/StringLoaderExtension.php',
diff --git a/multiversion/vendor/composer/installed.json
b/multiversion/vendor/composer/installed.json
index 05f2157..22860da 100644
--- a/multiversion/vendor/composer/installed.json
+++ b/multiversion/vendor/composer/installed.json
@@ -334,17 +334,17 @@
},
{
"name": "twig/twig",
- "version": "v1.34.4",
- "version_normalized": "1.34.4.0",
+ "version": "v1.35.0",
+ "version_normalized": "1.35.0.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git";,
- "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee"
+ "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/twigphp/Twig/zipball/f878bab48edb66ad9c6ed626bf817f60c6c096ee";,
- "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee",
+ "url":
"https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f";,
+ "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
"shasum": ""
},
"require": {
@@ -355,11 +355,11 @@
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~3.3@dev"
},
- "time": "2017-07-04T13:19:31+00:00",
+ "time": "2017-09-27T18:06:46+00:00",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.34-dev"
+ "dev-master": "1.35-dev"
}
},
"installation-source": "dist",
diff --git a/multiversion/vendor/twig/twig/.travis.yml
b/multiversion/vendor/twig/twig/.travis.yml
index c479e32..147eb7d 100644
--- a/multiversion/vendor/twig/twig/.travis.yml
+++ b/multiversion/vendor/twig/twig/.travis.yml
@@ -21,7 +21,8 @@
- TWIG_EXT=yes
before_install:
- - phpenv config-rm xdebug.ini
+ # turn off XDebug
+ - phpenv config-rm xdebug.ini || return 0
install:
- travis_retry composer install
diff --git a/multiversion/vendor/twig/twig/CHANGELOG
b/multiversion/vendor/twig/twig/CHANGELOG
index e92da05..f738c84 100644
--- a/multiversion/vendor/twig/twig/CHANGELOG
+++ b/multiversion/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,10 @@
+* 1.35.0 (2017-09-27)
+
+ * added Twig_Profiler_Profile::reset()
+ * fixed use TokenParser to return an empty Node
+ * added RuntimeExtensionInterface
+ * added circular reference detection when loading templates
+
* 1.34.4 (2017-07-04)
* added support for runtime loaders in IntegrationTestCase
@@ -142,7 +149,7 @@
* fixed reserved keywords (forbids true, false, null and none keywords for
variables names)
* fixed support for PHP7 (Throwable support)
- * marked the following methods as being internals on Twig_Environment:
+ * marked the following methods as being internals on Twig_Environment:
getFunctions(), getFilters(), getTests(), getFunction(), getFilter(),
getTest(),
getTokenParsers(), getTags(), getNodeVisitors(), getUnaryOperators(),
getBinaryOperators(),
getFunctions(), getFilters(), getGlobals(), initGlobals(),
initExtensions(), and initExtension()
@@ -226,7 +233,7 @@
* fixed limited RCEs when in sandbox mode
* deprecated Twig_Template::getEnvironment()
* deprecated the _self variable for usage outside of the from and import tags
- * added Twig_BaseNodeVisitor to ease the compatibility of node visitors
+ * added Twig_BaseNodeVisitor to ease the compatibility of node visitors
between 1.x and 2.x
* 1.19.0 (2015-07-31)
diff --git a/multiversion/vendor/twig/twig/composer.json
b/multiversion/vendor/twig/twig/composer.json
index 71ceed8..09c1ea5 100644
--- a/multiversion/vendor/twig/twig/composer.json
+++ b/multiversion/vendor/twig/twig/composer.json
@@ -44,7 +44,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "1.34-dev"
+ "dev-master": "1.35-dev"
}
}
}
diff --git a/multiversion/vendor/twig/twig/doc/templates.rst
b/multiversion/vendor/twig/twig/doc/templates.rst
index d4dbe32..3d60779 100644
--- a/multiversion/vendor/twig/twig/doc/templates.rst
+++ b/multiversion/vendor/twig/twig/doc/templates.rst
@@ -611,7 +611,8 @@
{ 2: 'foo', 4: 'bar' }
{# keys as expressions (the expression must be enclosed into parentheses)
-- as of Twig 1.5 #}
- { (1 + 1): 'foo', (a ~ 'b'): 'bar' }
+ {% set foo = 'foo' %}
+ { (foo): 'foo', (1 + 1): 'bar', (foo ~ 'b'): 'baz' }
* ``true`` / ``false``: ``true`` represents the true value, ``false``
represents the false value.
diff --git a/multiversion/vendor/twig/twig/ext/twig/php_twig.h
b/multiversion/vendor/twig/twig/ext/twig/php_twig.h
index 4eea1bb..7fc1601 100644
--- a/multiversion/vendor/twig/twig/ext/twig/php_twig.h
+++ b/multiversion/vendor/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
#ifndef PHP_TWIG_H
#define PHP_TWIG_H
-#define PHP_TWIG_VERSION "1.34.4"
+#define PHP_TWIG_VERSION "1.35.0"
#include "php.h"
diff --git a/multiversion/vendor/twig/twig/lib/Twig/Environment.php
b/multiversion/vendor/twig/twig/lib/Twig/Environment.php
index e22e5de..5de2f27 100644
--- a/multiversion/vendor/twig/twig/lib/Twig/Environment.php
+++ b/multiversion/vendor/twig/twig/lib/Twig/Environment.php
@@ -16,11 +16,11 @@
*/
class Twig_Environment
{
- const VERSION = '1.34.4';
- const VERSION_ID = 13404;
+ const VERSION = '1.35.0';
+ const VERSION_ID = 13500;
const MAJOR_VERSION = 1;
- const MINOR_VERSION = 34;
- const RELEASE_VERSION = 4;
+ const MINOR_VERSION = 35;
+ const RELEASE_VERSION = 0;
const EXTRA_VERSION = '';
protected $charset;
@@ -58,6 +58,7 @@
private $runtimeLoaders = array();
private $runtimes = array();
private $optionsHash;
+ private $loading = array();
/**
* Constructor.
@@ -382,6 +383,10 @@
*
* @param string|Twig_TemplateWrapper|Twig_Template $name The template name
*
+ * @throws Twig_Error_Loader When the template cannot be found
+ * @throws Twig_Error_Runtime When a previously generated cache is
corrupted
+ * @throws Twig_Error_Syntax When an error occurred during compilation
+ *
* @return Twig_TemplateWrapper
*/
public function load($name)
@@ -472,7 +477,22 @@
$this->initRuntime();
}
- return $this->loadedTemplates[$cls] = new $cls($this);
+ if (isset($this->loading[$cls])) {
+ throw new Twig_Error_Runtime(sprintf('Circular reference detected
for Twig template "%s", path: %s.', $name, implode(' -> ',
array_merge($this->loading, array($name)))));
+ }
+
+ $this->loading[$cls] = $name;
+
+ try {
+ $this->loadedTemplates[$cls] = new $cls($this);
+ unset($this->loading[$cls]);
+ } catch (\Exception $e) {
+ unset($this->loading[$cls]);
+
+ throw $e;
+ }
+
+ return $this->loadedTemplates[$cls];
}
/**
diff --git a/multiversion/vendor/twig/twig/lib/Twig/Profiler/Profile.php
b/multiversion/vendor/twig/twig/lib/Twig/Profiler/Profile.php
index 60b9103..3fdc1a8 100644
--- a/multiversion/vendor/twig/twig/lib/Twig/Profiler/Profile.php
+++ b/multiversion/vendor/twig/twig/lib/Twig/Profiler/Profile.php
@@ -145,6 +145,12 @@
);
}
+ public function reset()
+ {
+ $this->starts = $this->ends = $this->profiles = array();
+ $this->enter();
+ }
+
public function getIterator()
{
return new ArrayIterator($this->profiles);
diff --git a/multiversion/vendor/twig/twig/lib/Twig/TokenParser/Use.php
b/multiversion/vendor/twig/twig/lib/Twig/TokenParser/Use.php
index 154c0ad..f15a91e 100644
--- a/multiversion/vendor/twig/twig/lib/Twig/TokenParser/Use.php
+++ b/multiversion/vendor/twig/twig/lib/Twig/TokenParser/Use.php
@@ -57,6 +57,8 @@
$stream->expect(Twig_Token::BLOCK_END_TYPE);
$this->parser->addTrait(new Twig_Node(array('template' => $template,
'targets' => new Twig_Node($targets))));
+
+ return new Twig_Node();
}
public function getTag()
diff --git a/multiversion/vendor/twig/twig/phpunit.xml.dist
b/multiversion/vendor/twig/twig/phpunit.xml.dist
index d800c57..ce77327 100644
--- a/multiversion/vendor/twig/twig/phpunit.xml.dist
+++ b/multiversion/vendor/twig/twig/phpunit.xml.dist
@@ -9,7 +9,7 @@
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
- bootstrap="test/bootstrap.php"
+ bootstrap="vendor/autoload.php"
>
<testsuites>
<testsuite name="Twig Test Suite">
diff --git
a/multiversion/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
b/multiversion/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
new file mode 100644
index 0000000..63bc3b1
--- /dev/null
+++ b/multiversion/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Twig\Extension;
+
+/**
+ * @author Grégoire Pineau <[email protected]>
+ */
+interface RuntimeExtensionInterface
+{
+}
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
index 52107c0..4252940 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_AutoloaderTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_AutoloaderTest extends \PHPUnit\Framework\TestCase
{
/**
* @group legacy
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Cache/FilesystemTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Cache/FilesystemTest.php
index aca68ce..e9e600c 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Cache/FilesystemTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Cache/FilesystemTest.php
@@ -11,7 +11,7 @@
require_once dirname(dirname(__FILE__)).'/FilesystemHelper.php';
-class Twig_Tests_Cache_FilesystemTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Cache_FilesystemTest extends \PHPUnit\Framework\TestCase
{
private $classname;
private $directory;
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
index da7f533..4d4b8df 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_CompilerTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_CompilerTest extends \PHPUnit\Framework\TestCase
{
public function testReprNumericValueWithLocale()
{
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/ContainerRuntimeLoaderTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/ContainerRuntimeLoaderTest.php
index 558edf2..c111f92 100644
---
a/multiversion/vendor/twig/twig/test/Twig/Tests/ContainerRuntimeLoaderTest.php
+++
b/multiversion/vendor/twig/twig/test/Twig/Tests/ContainerRuntimeLoaderTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_ContainerRuntimeLoaderTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_ContainerRuntimeLoaderTest extends \PHPUnit\Framework\TestCase
{
/**
* @requires PHP 5.3
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/CustomExtensionTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/CustomExtensionTest.php
index c706df2..f9d44fd 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/CustomExtensionTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/CustomExtensionTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class CustomExtensionTest extends PHPUnit_Framework_TestCase
+class CustomExtensionTest extends \PHPUnit\Framework\TestCase
{
/**
* @requires PHP 5.3
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
index 5b07c40..ca9f2cf 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
@@ -11,7 +11,7 @@
require_once dirname(__FILE__).'/FilesystemHelper.php';
-class Twig_Tests_EnvironmentTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_EnvironmentTest extends \PHPUnit\Framework\TestCase
{
private $deprecations = array();
@@ -480,6 +480,33 @@
$this->assertEquals('foo', $twig->render('func_string_named_args'));
}
+ /**
+ * @expectedException Twig_Error_Runtime
+ * @expectedExceptionMessage Circular reference detected for Twig template
"base.html.twig", path: base.html.twig -> base.html.twig in "base.html.twig" at
line 1
+ */
+ public function testFailLoadTemplateOnCircularReference()
+ {
+ $twig = new Twig_Environment(new Twig_Loader_Array(array(
+ 'base.html.twig' => '{% extends "base.html.twig" %}',
+ )));
+
+ $twig->loadTemplate('base.html.twig');
+ }
+
+ /**
+ * @expectedException Twig_Error_Runtime
+ * @expectedExceptionMessage Circular reference detected for Twig template
"base1.html.twig", path: base1.html.twig -> base2.html.twig -> base1.html.twig
in "base1.html.twig" at line 1
+ */
+ public function testFailLoadTemplateOnComplexCircularReference()
+ {
+ $twig = new Twig_Environment(new Twig_Loader_Array(array(
+ 'base1.html.twig' => '{% extends "base2.html.twig" %}',
+ 'base2.html.twig' => '{% extends "base1.html.twig" %}',
+ )));
+
+ $twig->loadTemplate('base1.html.twig');
+ }
+
protected function getMockLoader($templateName, $templateContent)
{
// to be removed in 2.0
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
index b0eeca2..3ec572a 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_ErrorTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_ErrorTest extends \PHPUnit\Framework\TestCase
{
public function testErrorWithObjectFilename()
{
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
index 54f2ecc..3a173f0 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_ExpressionParserTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_ExpressionParserTest extends \PHPUnit\Framework\TestCase
{
/**
* @expectedException Twig_Error_Syntax
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
index c5429d4..ca69b4a 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Extension_CoreTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Extension_CoreTest extends \PHPUnit\Framework\TestCase
{
/**
* @dataProvider getRandomFunctionTestData
@@ -264,7 +264,7 @@
array(array(), new CoreTestIterator($i, $keys, true), count($keys)
+ 10),
array('de', 'abcdef', 3, 2),
array(array(), new
SimpleXMLElement('<items><item>1</item><item>2</item></items>'), 3),
- array(array(), new ArrayIterator(array(1, 2)), 3)
+ array(array(), new ArrayIterator(array(1, 2)), 3),
);
}
}
@@ -344,7 +344,7 @@
{
++$this->position;
if ($this->position === $this->maxPosition) {
- throw new LogicException(sprintf('Code should not iterate beyond
%d.', $this->maxPosition));
+ throw new LogicException(sprintf('Code should not iterate beyond
%d.', $this->maxPosition));
}
}
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
index 0b21582..9d90e0e 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Extension_SandboxTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Extension_SandboxTest extends \PHPUnit\Framework\TestCase
{
protected static $params;
protected static $templates;
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/FactoryRuntimeLoaderTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/FactoryRuntimeLoaderTest.php
index f418edf..f97d306 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/FactoryRuntimeLoaderTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/FactoryRuntimeLoaderTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_FactoryRuntimeLoaderTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_FactoryRuntimeLoaderTest extends \PHPUnit\Framework\TestCase
{
public function testLoad()
{
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
index f7ff53c..e8a23ea 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
@@ -11,7 +11,7 @@
require_once dirname(__FILE__).'/FilesystemHelper.php';
-class Twig_Tests_FileCachingTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_FileCachingTest extends \PHPUnit\Framework\TestCase
{
private $env;
private $tmpDir;
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
index b310a5b..a983a47 100644
---
a/multiversion/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
+++
b/multiversion/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_FileExtensionEscapingStrategyTest extends
PHPUnit_Framework_TestCase
+class Twig_Tests_FileExtensionEscapingStrategyTest extends
\PHPUnit\Framework\TestCase
{
/**
* @dataProvider getGuessData
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test
b/multiversion/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test
new file mode 100644
index 0000000..3fe2ad8
--- /dev/null
+++
b/multiversion/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/use_with_parent.test
@@ -0,0 +1,24 @@
+--TEST--
+"use" tag with a parent block
+--TEMPLATE--
+{% extends "parent.twig" %}
+
+{% use 'blocks.twig' %}
+
+{% block body %}
+ {{ parent() -}}
+ CHILD
+ {{ block('content') }}
+{% endblock %}
+--TEMPLATE(parent.twig)--
+{% block body %}
+ PARENT
+{% endblock %}
+--TEMPLATE(blocks.twig)--
+{% block content 'BLOCK' %}
+--DATA--
+return array()
+--EXPECT--
+PARENT
+CHILD
+ BLOCK
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/LexerTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/LexerTest.php
index c460449..ffe9a23 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/LexerTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/LexerTest.php
@@ -8,7 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Tests_LexerTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_LexerTest extends \PHPUnit\Framework\TestCase
{
/**
* @group legacy
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
index 7e1ea81..5930639 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Loader_ArrayTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Loader_ArrayTest extends \PHPUnit\Framework\TestCase
{
/**
* @group legacy
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
index 733de4f..8a8a84a 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Loader_ChainTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Loader_ChainTest extends \PHPUnit\Framework\TestCase
{
/**
* @group legacy
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
index c8cbaf7..bd2acbd 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Loader_FilesystemTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Loader_FilesystemTest extends \PHPUnit\Framework\TestCase
{
public function testGetSourceContext()
{
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
index f1278ee..50736dc 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_NativeExtensionTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_NativeExtensionTest extends \PHPUnit\Framework\TestCase
{
/**
* @requires PHP 5.3
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
index be7b417..883bb61 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Node_Expression_CallTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Node_Expression_CallTest extends \PHPUnit\Framework\TestCase
{
public function testGetArguments()
{
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
index 0a48e6d..92c0eca 100644
---
a/multiversion/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
+++
b/multiversion/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
@@ -8,7 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Tests_NodeVisitor_OptimizerTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_NodeVisitor_OptimizerTest extends \PHPUnit\Framework\TestCase
{
public function testRenderBlockOptimizer()
{
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/ParserTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/ParserTest.php
index 1bc2b09..342fb7b 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/ParserTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/ParserTest.php
@@ -8,7 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Tests_ParserTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_ParserTest extends \PHPUnit\Framework\TestCase
{
/**
* @expectedException Twig_Error_Syntax
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
index da97f47..a71b97b 100644
---
a/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
+++
b/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-abstract class Twig_Tests_Profiler_Dumper_AbstractTest extends
PHPUnit_Framework_TestCase
+abstract class Twig_Tests_Profiler_Dumper_AbstractTest extends
\PHPUnit\Framework\TestCase
{
protected function getProfile()
{
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
index f786f06..08db96a 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Profiler_ProfileTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_Profiler_ProfileTest extends \PHPUnit\Framework\TestCase
{
public function testConstructor()
{
@@ -97,4 +97,14 @@
$this->assertEquals($profile1->getType(), $profile3->getType());
$this->assertEquals($profile1->getName(), $profile3->getName());
}
+
+ public function testReset()
+ {
+ $profile = new Twig_Profiler_Profile();
+ usleep(1);
+ $profile->leave();
+ $profile->reset();
+
+ $this->assertEquals(0, $profile->getDuration());
+ }
}
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
index 4da2d57..c22a433 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
@@ -8,7 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Tests_TemplateTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_TemplateTest extends \PHPUnit\Framework\TestCase
{
/**
* @expectedException LogicException
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateWrapperTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateWrapperTest.php
index 9cd1ced..cc71052 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateWrapperTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/TemplateWrapperTest.php
@@ -8,7 +8,7 @@
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
-class Twig_Tests_TemplateWrapperTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_TemplateWrapperTest extends \PHPUnit\Framework\TestCase
{
public function testHasGetBlocks()
{
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
index 88f39a1..f219c95 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_TokenStreamTest extends PHPUnit_Framework_TestCase
+class Twig_Tests_TokenStreamTest extends \PHPUnit\Framework\TestCase
{
protected static $tokens;
diff --git
a/multiversion/vendor/twig/twig/test/Twig/Tests/Util/DeprecationCollectorTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/Util/DeprecationCollectorTest.php
index 9f7d14d..887a90a 100644
---
a/multiversion/vendor/twig/twig/test/Twig/Tests/Util/DeprecationCollectorTest.php
+++
b/multiversion/vendor/twig/twig/test/Twig/Tests/Util/DeprecationCollectorTest.php
@@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
-class Twig_Tests_Util_DeprecationCollectorTest extends
PHPUnit_Framework_TestCase
+class Twig_Tests_Util_DeprecationCollectorTest extends
\PHPUnit\Framework\TestCase
{
/**
* @requires PHP 5.3
diff --git a/multiversion/vendor/twig/twig/test/Twig/Tests/escapingTest.php
b/multiversion/vendor/twig/twig/test/Twig/Tests/escapingTest.php
index e5b9093..9b98ddd 100644
--- a/multiversion/vendor/twig/twig/test/Twig/Tests/escapingTest.php
+++ b/multiversion/vendor/twig/twig/test/Twig/Tests/escapingTest.php
@@ -6,7 +6,7 @@
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc.
(http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
-class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
+class Twig_Test_EscapingTest extends \PHPUnit\Framework\TestCase
{
/**
* All character encodings supported by htmlspecialchars().
diff --git a/multiversion/vendor/twig/twig/test/bootstrap.php
b/multiversion/vendor/twig/twig/test/bootstrap.php
deleted file mode 100644
index d167b67..0000000
--- a/multiversion/vendor/twig/twig/test/bootstrap.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of Twig.
- *
- * (c) Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (PHP_VERSION_ID < 50300) {
- require_once dirname(__FILE__).'/../lib/Twig/Autoloader.php';
- Twig_Autoloader::register(true);
-} else {
- require __DIR__.'/../vendor/autoload.php';
-
- if (!class_exists('\PHPUnit_Framework_TestCase') &&
class_exists('\PHPUnit\Framework\TestCase')) {
- class_alias('\PHPUnit\Framework\TestCase',
'\PHPUnit_Framework_TestCase');
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/392210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id33b8cafefa8a4cd2d4a93852426bb2875573501
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
