Fixing tests and deprecations

Author: Toflar

composer.json

@@ -20,7 +20,7 @@
     "symfony/serializer": "^3.4 || ^4.1"
   },
   "require-dev": {
-    "doctrine/doctrine-bundle": "^1.6",
+    "doctrine/doctrine-bundle": "^1.8",
     "symfony/finder": "^3.4 || ^4.1",
     "symfony/framework-bundle": "^3.4 || ^4.1",
     "symfony/phpunit-bridge": "^4.3"

phpunit.xml.dist

@@ -9,6 +9,7 @@
         <ini name="error_reporting" value="-1" />
         <server name="KERNEL_DIR" value="tests/Fixtures" />
         <server name="KERNEL_CLASS" value="AppKernel" />
+        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
     </php>
 
     <testsuites>

tests/AbstractKernelTestCase.php

@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Dunglas\DoctrineJsonOdm\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+abstract class AbstractKernelTestCase extends KernelTestCase
+{
+    /**
+     * @var Application
+     */
+    protected $application;
+
+    protected function setUp()
+    {
+        $this->bootKernel();
+
+        $this->application = new Application(self::$kernel);
+        $this->application->setAutoExit(false);
+    }
+}

tests/Fixtures/AppKernel.php

@@ -9,6 +9,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Dunglas\DoctrineJsonOdm\Bundle\DunglasDoctrineJsonOdmBundle;
+use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\DependencyInjection\MakeServicesPublicPass;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\TestBundle;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
@@ -40,15 +41,15 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
     {
     }
 
-    protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
+    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader)
     {
-        $c->loadFromExtension('framework', [
+        $container->loadFromExtension('framework', [
             'secret' => 'jsonodm',
             'test' => null,
         ]);
 
         $db = getenv('DB');
-        $c->loadFromExtension('doctrine', [
+        $container->loadFromExtension('doctrine', [
             'dbal' => [
                 'driver' => 'MYSQL' === $db ? 'pdo_mysql' : 'pdo_pgsql',
                 'host' => getenv("{$db}_HOST"),
@@ -62,5 +63,8 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
                 'auto_mapping' => true,
             ],
         ]);
+
+        // Make a few services public until we depend on Symfony 4.1+ and can use the new test container
+        $container->addCompilerPass(new MakeServicesPublicPass());
     }
 }

tests/Fixtures/TestBundle/DependencyInjection/MakeServicesPublicPass.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+class MakeServicesPublicPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container): void
+    {
+        static $services = [
+            'doctrine.orm.default_entity_manager',
+            'doctrine.dbal.default_connection',
+            'doctrine',
+        ];
+
+        foreach ($services as $service) {
+            if (!$container->hasDefinition($service)) {
+                continue;
+            }
+
+            $definition = $container->getDefinition($service);
+            $definition->setPublic(true);
+        }
+    }
+}

tests/FunctionalTest.php

@@ -7,7 +7,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Dunglas\DoctrineJsonOdm\tests;
+namespace Dunglas\DoctrineJsonOdm\Tests;
 
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Attribute;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Attributes;
@@ -16,26 +16,16 @@
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Foo;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Product;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\ScalarValue;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Console\Input\StringInput;
 
 /**
  * @author Kévin Dunglas <[email protected]>
  */
-class FunctionalTest extends KernelTestCase
+class FunctionalTest extends AbstractKernelTestCase
 {
-    /**
-     * @var Application
-     */
-    private $application;
-
     protected function setUp()
     {
-        $this->bootKernel();
-
-        $this->application = new Application(self::$kernel);
-        $this->application->setAutoExit(false);
+        parent::setUp();
 
         $this->runCommand('doctrine:schema:drop --force');
         $this->runCommand('doctrine:schema:create');

tests/SerializerTest.php

@@ -7,35 +7,20 @@
  * with this source code in the file LICENSE.
  */
 
-namespace Dunglas\DoctrineJsonOdm\tests;
+namespace Dunglas\DoctrineJsonOdm\Tests;
 
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Attribute;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Attributes;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Bar;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Baz;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\Foo;
 use Dunglas\DoctrineJsonOdm\Tests\Fixtures\TestBundle\Entity\ScalarValue;
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
 /**
  * @author Kévin Dunglas <[email protected]>
  */
-class SerializerTest extends KernelTestCase
+class SerializerTest extends AbstractKernelTestCase
 {
-    /**
-     * @var Application
-     */
-    private $application;
-
-    protected function setUp()
-    {
-        $this->bootKernel();
-
-        $this->application = new Application(self::$kernel);
-        $this->application->setAutoExit(false);
-    }
-
     public function testStoreAndRetrieveDocument()
     {
         $attribute1 = new Attribute();