Updates for test deprecations

GwendolenLynch · GwendolenLynch · commit fedf5f9d9909 · 2022-01-04T16:57:52.000+01:00
diff --git a/.env b/.env
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 /composer.lock
 /vendor/
-/tests/Fixtures/var/
+/var/
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,11 @@ language: php
 
 matrix:
     include:
-        - php: 7.4snapshot
+        - php: 7.4
           env: COMPOSER_FLAGS="--prefer-lowest"
-        - php: 7.4snapshot
-        - php: 7.4snapshot
+        - php: 7.4
+        - php: 8.0
+        - php: 8.1
           env: PHPUNIT_FLAGS="--coverage-text"
         - php: nightly
     fast_finish: true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          colors="true"
          bootstrap="vendor/autoload.php"
 >
@@ -19,11 +18,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory>src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
diff --git a/tests/DataFixtures/TestFixtures.php b/tests/DataFixtures/TestFixtures.php
@@ -6,7 +6,7 @@
 
 use Camelot\DoctrinePostgres\Tests\Fixtures\App\Entity\JsonEntity;
 use Doctrine\Bundle\FixturesBundle\Fixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 final class TestFixtures extends Fixture
 {
diff --git a/tests/Fixtures/App/Kernel.php b/tests/Fixtures/App/Kernel.php
@@ -5,55 +5,24 @@
 namespace Camelot\DoctrinePostgres\Tests\Fixtures\App;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
 
-    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
-
-    public function registerBundles(): iterable
-    {
-        $contents = require $this->getProjectDir() . '/App/config/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
-                yield new $class();
-            }
-        }
-    }
-
     public function getProjectDir(): string
     {
-        return \dirname(__DIR__);
+        return __DIR__;
     }
 
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
+    public function getCacheDir(): string
     {
-        $container->addResource(new FileResource($this->getProjectDir() . '/App/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', true);
-        $confDir = $this->getProjectDir() . '/App/config';
-
-        $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');
-    }
-
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
-    {
-        $confDir = $this->getProjectDir() . '/App/config';
-
-        $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
+        return $this->getProjectDir().'/../../../var/cache/'.$this->environment;
     }
 
-    protected function build(ContainerBuilder $container): void
+    public function getLogDir(): string
     {
+        return $this->getProjectDir().'/../../../var/log';
     }
 }
diff --git a/tests/Fixtures/App/Repository/JsonEntityRepository.php b/tests/Fixtures/App/Repository/JsonEntityRepository.php
@@ -6,7 +6,7 @@
 
 use Camelot\DoctrinePostgres\Tests\Fixtures\App\Entity\JsonEntity;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 
 /**
  * @method JsonEntity|null find($id, $lockMode = null, $lockVersion = null)
diff --git a/tests/Fixtures/App/bin/console b/tests/Fixtures/App/bin/console
@@ -3,40 +3,12 @@
 
 use Camelot\DoctrinePostgres\Tests\Fixtures\App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
 
-if (\in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true) === false) {
-    echo 'Warning: The console should be invoked via the CLI version of PHP, not the ' . \PHP_SAPI . ' SAPI' . \PHP_EOL;
-}
+require_once dirname(__DIR__, 4).'/vendor/autoload_runtime.php';
 
-set_time_limit(0);
+return function (array $context) {
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
 
-require \dirname(__DIR__) . '/../../../vendor/autoload.php';
+    return new Application($kernel);
+};
 
-if (!class_exists(Application::class)) {
-    throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
-}
-
-$input = new ArgvInput();
-if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
-    putenv('APP_ENV=' . $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
-}
-
-if ($input->hasParameterOption('--no-debug', true)) {
-    putenv('APP_DEBUG=' . $_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
-}
-
-require \dirname(__DIR__) . '/config/bootstrap.php';
-
-if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
-
-    if (class_exists(Debug::class)) {
-        Debug::enable();
-    }
-}
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$application = new Application($kernel);
-$application->run($input);
diff --git a/tests/Fixtures/App/config/bootstrap.php b/tests/Fixtures/App/config/bootstrap.php
diff --git a/tests/Fixtures/App/config/packages/doctrine.yaml b/tests/Fixtures/App/config/packages/doctrine.yaml
@@ -10,6 +10,6 @@ doctrine:
             TestAppBundle:
                 is_bundle: false
                 type: annotation
-                dir: '%kernel.project_dir%/App/Entity'
+                dir: '%kernel.project_dir%/Entity'
                 prefix: 'Camelot\DoctrinePostgres\Tests\Fixtures\App\Entity'
                 alias: TestAppBundle
diff --git a/tests/Fixtures/App/config/packages/framework.yaml b/tests/Fixtures/App/config/packages/framework.yaml
@@ -1,12 +1,8 @@
 framework:
-    secret: '%env(APP_SECRET)%'
-    #csrf_protection: true
-    #http_method_override: true
+    test: true
 
     session:
-        handler_id: ~
-        cookie_secure: auto
-        cookie_samesite: lax
+        storage_factory_id: session.storage.factory.mock_file
 
     php_errors:
         log: true
diff --git a/tests/Fixtures/App/config/services.yaml b/tests/Fixtures/App/config/services.yaml
@@ -14,5 +14,3 @@ services:
     Camelot\DoctrinePostgres\Tests\DataFixtures\TestFixtures:
 
     Camelot\DoctrinePostgres\Tests\Fixtures\App\Repository\JsonEntityRepository:
-
-    Doctrine\Bundle\FixturesBundle\Loader\SymfonyFixturesLoader:
diff --git a/tests/Functional/BootstrapTest.php b/tests/Functional/BootstrapTest.php
@@ -27,7 +27,7 @@ public function testCleanUp(): void
         self::assertSame(0, $result);
     }
 
-    protected static function getKernelClass()
+    protected static function getKernelClass(): string
     {
         return Kernel::class;
     }
diff --git a/tests/Functional/DoctrinePostgresFunctionalTest.php b/tests/Functional/DoctrinePostgresFunctionalTest.php
@@ -10,8 +10,8 @@
 use Camelot\DoctrinePostgres\Tests\Fixtures\App\Repository\JsonEntityRepository;
 use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
-use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Tester\CommandTester;
@@ -92,14 +92,14 @@ public function testCreateExtendedSchema(): void
     public function testLoadFixtures(): void
     {
         /** @var ManagerRegistry $doctrine */
-        $doctrine = self::$container->get('doctrine');
+        $doctrine = self::getContainer()->get('doctrine');
         /** @var \Doctrine\ORM\EntityManagerInterface $em */
         $em = $doctrine->getManager();
 
         $purger = new ORMPurger($em);
         $purger->setPurgeMode(ORMPurger::PURGE_MODE_TRUNCATE);
         $executor = new ORMExecutor($em, $purger);
-        $executor->execute([self::$container->get(TestFixtures::class)]);
+        $executor->execute([self::getContainer()->get(TestFixtures::class)]);
         $entities = $em->getRepository(JsonEntity::class)->findAll();
 
         self::assertNotEmpty($entities);
@@ -166,7 +166,7 @@ public function providerCustomStringFunctions(): iterable
     public function testCustomStringFunctions(string $name, string $class): void
     {
         /** @var ManagerRegistry $doctrine */
-        $doctrine = self::$container->get('doctrine');
+        $doctrine = self::getContainer()->get('doctrine');
         /** @var \Doctrine\ORM\EntityManagerInterface $em */
         $em = $doctrine->getManager();
 
@@ -179,15 +179,15 @@ public function testCustomStringFunctions(string $name, string $class): void
     public function testILikeQuery(): void
     {
         /** @var JsonEntityRepository $repo */
-        $repo = self::$container->get(JsonEntityRepository::class);
+        $repo = self::getContainer()->get(JsonEntityRepository::class);
         $entities = $repo->findAllLike('%as%');
         $entity = $repo->findOneLike('%as%');
 
         self::assertCount(1, $entities);
         self::assertSame('basalt', $entity->getTitle());
     }
 
-    protected static function getKernelClass()
+    protected static function getKernelClass(): string
     {
         return Kernel::class;
     }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`use Camelot\DoctrinePostgres\Tests\Fixtures\App\Entity\JsonEntity;`
`8`	`8`	`use Doctrine\Bundle\FixturesBundle\Fixture;`
`9`		`-use Doctrine\Common\Persistence\ObjectManager;`
	`9`	`+use Doctrine\Persistence\ObjectManager;`
`10`	`10`
`11`	`11`	`final class TestFixtures extends Fixture`
`12`	`12`	`{`