Fixed 2.x tests

FriendsOfSymfony · Jun 28, 2017 · f997866 · f997866
1 parent 8d847e4
commit f997866
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Tests/Functional/app/AppKernel.php b/Tests/Functional/app/AppKernel.php
@@ -87,9 +87,6 @@ public function getLogDir()
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load($this->rootConfig);
-        if(class_exists('Symfony\Component\Asset\Package')) {
-            $loader->load(__DIR__.'/config/assets.yml');
-        }
     }
 
     public function serialize()

diff --git a/Tests/Functional/app/config/assets.yml b/Tests/Functional/app/config/assets.yml
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
@@ -0,0 +1,9 @@
+<?php
+
+$file = __DIR__.'/../vendor/autoload.php';
+if (!file_exists($file)) {
+    throw new RuntimeException('Install dependencies using composer to run the test suite.');
+}
+
+$autoload = require $file;
+Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($autoload, 'loadClass'));
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="vendor/autoload.php" color="true">
+<phpunit bootstrap="./Tests/bootstrap.php" colors="true">
     <php>
         <ini name="xdebug.max_nesting_level" value="200" />
     </php>