diff --git a/phpunit.xml.dist b/phpunit.xml.dist index d800c5769..ce7732785 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,7 +9,7 @@ processIsolation="false" stopOnFailure="false" syntaxCheck="false" - bootstrap="test/bootstrap.php" + bootstrap="vendor/autoload.php" > diff --git a/test/Twig/Tests/AutoloaderTest.php b/test/Twig/Tests/AutoloaderTest.php index 52107c0c1..42529402e 100644 --- a/test/Twig/Tests/AutoloaderTest.php +++ b/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/test/Twig/Tests/Cache/FilesystemTest.php b/test/Twig/Tests/Cache/FilesystemTest.php index aca68ce0b..e9e600c1f 100644 --- a/test/Twig/Tests/Cache/FilesystemTest.php +++ b/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/test/Twig/Tests/CompilerTest.php b/test/Twig/Tests/CompilerTest.php index da7f53315..4d4b8df9e 100644 --- a/test/Twig/Tests/CompilerTest.php +++ b/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/test/Twig/Tests/ContainerRuntimeLoaderTest.php b/test/Twig/Tests/ContainerRuntimeLoaderTest.php index 558edf227..c111f9284 100644 --- a/test/Twig/Tests/ContainerRuntimeLoaderTest.php +++ b/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/test/Twig/Tests/CustomExtensionTest.php b/test/Twig/Tests/CustomExtensionTest.php index c706df264..f9d44fda5 100644 --- a/test/Twig/Tests/CustomExtensionTest.php +++ b/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/test/Twig/Tests/EnvironmentTest.php b/test/Twig/Tests/EnvironmentTest.php index f0d42bd2a..ca9f2cf8a 100644 --- a/test/Twig/Tests/EnvironmentTest.php +++ b/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(); diff --git a/test/Twig/Tests/ErrorTest.php b/test/Twig/Tests/ErrorTest.php index b0eeca2e6..3ec572ab2 100644 --- a/test/Twig/Tests/ErrorTest.php +++ b/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/test/Twig/Tests/ExpressionParserTest.php b/test/Twig/Tests/ExpressionParserTest.php index 54f2ecc96..3a173f035 100644 --- a/test/Twig/Tests/ExpressionParserTest.php +++ b/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/test/Twig/Tests/Extension/CoreTest.php b/test/Twig/Tests/Extension/CoreTest.php index c5429d487..da5273348 100644 --- a/test/Twig/Tests/Extension/CoreTest.php +++ b/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 diff --git a/test/Twig/Tests/Extension/SandboxTest.php b/test/Twig/Tests/Extension/SandboxTest.php index 0b2158269..9d90e0ea7 100644 --- a/test/Twig/Tests/Extension/SandboxTest.php +++ b/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/test/Twig/Tests/FactoryRuntimeLoaderTest.php b/test/Twig/Tests/FactoryRuntimeLoaderTest.php index f418edf78..f97d30694 100644 --- a/test/Twig/Tests/FactoryRuntimeLoaderTest.php +++ b/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/test/Twig/Tests/FileCachingTest.php b/test/Twig/Tests/FileCachingTest.php index f7ff53c3f..e8a23eade 100644 --- a/test/Twig/Tests/FileCachingTest.php +++ b/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/test/Twig/Tests/FileExtensionEscapingStrategyTest.php b/test/Twig/Tests/FileExtensionEscapingStrategyTest.php index b310a5be3..a983a47c8 100644 --- a/test/Twig/Tests/FileExtensionEscapingStrategyTest.php +++ b/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/test/Twig/Tests/LexerTest.php b/test/Twig/Tests/LexerTest.php index c46044971..ffe9a235b 100644 --- a/test/Twig/Tests/LexerTest.php +++ b/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/test/Twig/Tests/Loader/ArrayTest.php b/test/Twig/Tests/Loader/ArrayTest.php index 7e1ea8129..593063933 100644 --- a/test/Twig/Tests/Loader/ArrayTest.php +++ b/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/test/Twig/Tests/Loader/ChainTest.php b/test/Twig/Tests/Loader/ChainTest.php index 733de4f02..8a8a84a5a 100644 --- a/test/Twig/Tests/Loader/ChainTest.php +++ b/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/test/Twig/Tests/Loader/FilesystemTest.php b/test/Twig/Tests/Loader/FilesystemTest.php index c8cbaf718..bd2acbd75 100644 --- a/test/Twig/Tests/Loader/FilesystemTest.php +++ b/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/test/Twig/Tests/NativeExtensionTest.php b/test/Twig/Tests/NativeExtensionTest.php index f1278eec3..50736dc22 100644 --- a/test/Twig/Tests/NativeExtensionTest.php +++ b/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/test/Twig/Tests/Node/Expression/CallTest.php b/test/Twig/Tests/Node/Expression/CallTest.php index be7b417b9..883bb6127 100644 --- a/test/Twig/Tests/Node/Expression/CallTest.php +++ b/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/test/Twig/Tests/NodeVisitor/OptimizerTest.php b/test/Twig/Tests/NodeVisitor/OptimizerTest.php index 0a48e6dd7..92c0ecac7 100644 --- a/test/Twig/Tests/NodeVisitor/OptimizerTest.php +++ b/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/test/Twig/Tests/ParserTest.php b/test/Twig/Tests/ParserTest.php index 1bc2b0965..342fb7bab 100644 --- a/test/Twig/Tests/ParserTest.php +++ b/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/test/Twig/Tests/Profiler/Dumper/AbstractTest.php b/test/Twig/Tests/Profiler/Dumper/AbstractTest.php index da97f478a..a71b97b97 100644 --- a/test/Twig/Tests/Profiler/Dumper/AbstractTest.php +++ b/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/test/Twig/Tests/Profiler/ProfileTest.php b/test/Twig/Tests/Profiler/ProfileTest.php index f786f06ca..0bebdcd45 100644 --- a/test/Twig/Tests/Profiler/ProfileTest.php +++ b/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() { diff --git a/test/Twig/Tests/TemplateTest.php b/test/Twig/Tests/TemplateTest.php index 4da2d5750..c22a43336 100644 --- a/test/Twig/Tests/TemplateTest.php +++ b/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/test/Twig/Tests/TemplateWrapperTest.php b/test/Twig/Tests/TemplateWrapperTest.php index 9cd1ced9a..cc71052c4 100644 --- a/test/Twig/Tests/TemplateWrapperTest.php +++ b/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/test/Twig/Tests/TokenStreamTest.php b/test/Twig/Tests/TokenStreamTest.php index 88f39a1fa..f219c9554 100644 --- a/test/Twig/Tests/TokenStreamTest.php +++ b/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/test/Twig/Tests/Util/DeprecationCollectorTest.php b/test/Twig/Tests/Util/DeprecationCollectorTest.php index 9f7d14d17..887a90afa 100644 --- a/test/Twig/Tests/Util/DeprecationCollectorTest.php +++ b/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/test/Twig/Tests/escapingTest.php b/test/Twig/Tests/escapingTest.php index e5b90935a..9b98dddcf 100644 --- a/test/Twig/Tests/escapingTest.php +++ b/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/test/bootstrap.php b/test/bootstrap.php deleted file mode 100644 index d167b67de..000000000 --- a/test/bootstrap.php +++ /dev/null @@ -1,21 +0,0 @@ -