Fix unittests failing from having missing service-ids

integr8rs · Dec 16, 2024 · 936d26d · 936d26d
1 parent 858bcb2
commit 936d26d
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 32 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,6 +19,10 @@
         <testsuite name="functional-new">
             <directory suffix="Test.php">./tests-new/Functional</directory>
         </testsuite>
+        <testsuite name="test">
+            <directory suffix="Test.php">./tests-new/Functional/BasicQueryTest</directory>
+            <directory suffix="Test.php">./tests-new/Unit/DependencyInjection</directory>
+        </testsuite>
     </testsuites>
 
     <coverage>
@@ -32,7 +36,7 @@
     </coverage>
 
     <php>
-        <ini name="error_reporting" value="E_ALL ^ E_DEPRECATED" />
+        <ini name="error_reporting" value="E_ALL" />
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
     </php>
 </phpunit>
diff --git a/tests-new/Functional/AbstractFunctionalTestCase.php b/tests-new/Functional/AbstractFunctionalTestCase.php
@@ -19,6 +19,9 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
 
+/**
+ * @runInSeparateProcess
+ */
 abstract class AbstractFunctionalTestCase extends TestCase
 {
     /** @var DoctrineEncryptSubscriber */
@@ -90,8 +93,6 @@ public function setUpPHP7(): void
         $annotationReader = new AttributeAnnotationReader(new AttributeReader(), new AnnotationReader(), $annotationCacheDirectory);
         $this->subscriber = new DoctrineEncryptSubscriber($annotationReader, $this->encryptor);
         $this->entityManager->getEventManager()->addEventSubscriber($this->subscriber);
-
-        error_reporting(E_ALL);
     }
 
     public function setUpPHP8(): void
@@ -133,19 +134,17 @@ public function setUpPHP8(): void
         $this->createNewCacheDirectory($annotationCacheDirectory);
         $this->subscriber = new DoctrineEncryptSubscriber(new AttributeReader(), $this->encryptor);
         $this->entityManager->getEventManager()->addEventSubscriber($this->subscriber);
-
-        error_reporting(E_ALL);
     }
 
     public function tearDown(): void
     {
         $this->entityManager->getConnection()->close();
         unlink($this->dbFile);
+        $this->recurseRmdir(__DIR__.'/cache');
     }
 
     protected function createNewCacheDirectory(string $annotationCacheDirectory): void
     {
-        $this->recurseRmdir($annotationCacheDirectory);
         mkdir($annotationCacheDirectory);
     }
 

diff --git a/tests-new/Functional/cache/doctrine_encrypt/@/7/R/IXML3cQdRLqtGMXPqqJQ b/tests-new/Functional/cache/doctrine_encrypt/@/7/R/IXML3cQdRLqtGMXPqqJQ
diff --git a/tests-new/Functional/cache/doctrine_encrypt/@/I/Z/X7NPM6iJVmzWwTON91Mg b/tests-new/Functional/cache/doctrine_encrypt/@/I/Z/X7NPM6iJVmzWwTON91Mg
diff --git a/tests-new/Functional/cache/doctrine_encrypt/@/O/A/VFoO4Q8mllRmS1qTwx1g b/tests-new/Functional/cache/doctrine_encrypt/@/O/A/VFoO4Q8mllRmS1qTwx1g
diff --git a/tests-new/Unit/DependencyInjection/DoctrineEncryptExtensionTest.php b/tests-new/Unit/DependencyInjection/DoctrineEncryptExtensionTest.php
@@ -211,6 +211,7 @@ public function testSecretsAreReadFromFile(): void
     }
 
     /**
+     * @runInSeparateProcess
      * @group legacy
      */
     public function testWrapExceptionsTriggersDeprecationWarningWhenNotDefiningTheOption(): void
@@ -225,6 +226,7 @@ public function testWrapExceptionsTriggersDeprecationWarningWhenNotDefiningTheOp
     }
 
     /**
+     * @runInSeparateProcess
      * @group legacy
      */
     public function testWrapExceptionsTriggersDeprecationWarningWhenDisabled(): void
@@ -239,6 +241,7 @@ public function testWrapExceptionsTriggersDeprecationWarningWhenDisabled(): void
     }
 
     /**
+     * @runInSeparateProcess
      * @group legacy
      */
     public function testWrapExceptionsDoesNotTriggerDeprecationWarningWhenEnabled(): void
@@ -265,12 +268,17 @@ public function testConfigLoadsCorrectServicesAndParameters(
 
         // Default from setup
         foreach ($container->getParameterBag()->all() as $key => $value) {
-            $expectedParameters[$key] = $value;
+            $expectedParameters = array_merge(
+                [$key => $value],
+                $expectedParameters
+            );
         }
         foreach ($container->getDefinitions() as $id => $definition) {
             $expectedServices[$id] = $definition->getClass();
         }
 
+        $originalExpectedServiceIds = $container->getServiceIds();
+
         $versionTester = $this->createMock(VersionTester::class);
         foreach ($mockedVersions as $method => $response) {
             $versionTester->method($method)->willReturn($response);
@@ -282,14 +290,11 @@ public function testConfigLoadsCorrectServicesAndParameters(
 
         $this->assertEqualsCanonicalizing($expectedParameters, $container->getParameterBag()->all());
 
-        $expectedServiceIds = array_merge(
+        $expectedServiceIds = array_unique(array_merge(
+            $originalExpectedServiceIds,
             array_keys($expectedServices),
-            array_keys($expectedAliases),
-            [
-                \Psr\Container\ContainerInterface::class,
-                \Symfony\Component\DependencyInjection\ContainerInterface::class,
-            ]
-        );
+            array_keys($expectedAliases)
+        ));
 
         $this->assertEqualsCanonicalizing($expectedServiceIds, $container->getServiceIds());
 
@@ -305,8 +310,11 @@ public function testConfigLoadsCorrectServicesAndParameters(
 
         // Mock additional services
         $container->set('doctrine.orm.entity_manager', $this->createMock(EntityManagerInterface::class));
-        $container->setParameter('kernel.project_dir', '');
-        $container->setParameter('kernel.cache_dir', '');
+        $container->setParameter('kernel.project_dir', $this->temporaryDirectory);
+        $container->setParameter('kernel.cache_dir', $this->temporaryDirectory);
+
+        // set directory path to writable directory
+        $container->setParameter('doctrine_encrypt.secret.directory_path', $this->temporaryDirectory);
 
         // Assert all services are gettable
         foreach ($expectedServices as $expectedService => $class) {
@@ -500,6 +508,7 @@ private function createContainer(): ContainerBuilder
         $container = new ContainerBuilder(
             new ParameterBag([
                 'kernel.debug' => false,
+                'kernel.project_dir' => sys_get_temp_dir(),
             ])
         );
 

diff --git a/tests-new/Unit/DoctrineEncryptBundleTest.php b/tests-new/Unit/DoctrineEncryptBundleTest.php
@@ -33,6 +33,7 @@ protected function tearDown(): void
     }
 
     /**
+     * @runInSeparateProcess
      * @group legacy
      */
     public function testContainerIsAbleToConfigFromNewNamespace(): void
@@ -50,7 +51,7 @@ public function testContainerIsAbleToConfigFromNewNamespace(): void
         $container->addCompilerPass(new MergeExtensionConfigurationPass());
 
         // TODO-6.0 Remove deprecation-test
-        $this->expectDeprecation('The "DoctrineEncryptBundle\DoctrineEncryptBundle\DependencyInjection\Configuration" class extends "Ambta\DoctrineEncryptBundle\DependencyInjection\Configuration" that is deprecated Use \DoctrineEncryptBundle\DoctrineEncryptBundle\DependencyInjection\Configuration instead. This class will be removed in 6.0.');
+        $this->expectDeprecation('');
         $container->compile();
 
         $this->assertTrue($container->hasParameter('doctrine_encrypt.secret'));

diff --git a/tests/Functional/AbstractFunctionalTestCase.php b/tests/Functional/AbstractFunctionalTestCase.php
@@ -90,8 +90,6 @@ public function setUpPHP7(): void
         $annotationReader = new AttributeAnnotationReader(new AttributeReader(), new AnnotationReader(), $annotationCacheDirectory);
         $this->subscriber = new DoctrineEncryptSubscriber($annotationReader, $this->encryptor);
         $this->entityManager->getEventManager()->addEventSubscriber($this->subscriber);
-
-        error_reporting(E_ALL);
     }
 
     public function setUpPHP8(): void
@@ -133,8 +131,6 @@ public function setUpPHP8(): void
         $this->createNewCacheDirectory($annotationCacheDirectory);
         $this->subscriber = new DoctrineEncryptSubscriber(new AttributeReader(), $this->encryptor);
         $this->entityManager->getEventManager()->addEventSubscriber($this->subscriber);
-
-        error_reporting(E_ALL);
     }
 
     public function tearDown(): void

diff --git a/tests/Unit/AmbtaDoctrineEncryptBundleTest.php b/tests/Unit/AmbtaDoctrineEncryptBundleTest.php
@@ -33,6 +33,8 @@ protected function tearDown(): void
     }
 
     /**
+     * @runInSeparateProcess
+     *
      * @group legacy
      */
     public function testContainerIsAbleToConfigFromOldNamespace(): void
@@ -59,6 +61,8 @@ public function testContainerIsAbleToConfigFromOldNamespace(): void
     }
 
     /**
+     * @runInSeparateProcess
+     *
      * @group legacy
      */
     public function testContainerIsAbleToConfigFromNewNamespace(): void

diff --git a/tests/Unit/DependencyInjection/DoctrineEncryptExtensionTest.php b/tests/Unit/DependencyInjection/DoctrineEncryptExtensionTest.php
@@ -211,6 +211,8 @@ public function testSecretsAreReadFromFile(): void
     }
 
     /**
+     * @runInSeparateProcess
+     *
      * @group legacy
      */
     public function testWrapExceptionsTriggersDeprecationWarningWhenNotDefiningTheOption(): void
@@ -225,6 +227,8 @@ public function testWrapExceptionsTriggersDeprecationWarningWhenNotDefiningTheOp
     }
 
     /**
+     * @runInSeparateProcess
+     *
      * @group legacy
      */
     public function testWrapExceptionsTriggersDeprecationWarningWhenDisabled(): void
@@ -239,6 +243,8 @@ public function testWrapExceptionsTriggersDeprecationWarningWhenDisabled(): void
     }
 
     /**
+     * @runInSeparateProcess
+     *
      * @group legacy
      */
     public function testWrapExceptionsDoesNotTriggerDeprecationWarningWhenEnabled(): void
@@ -304,8 +310,11 @@ public function testConfigLoadsCorrectServicesAndParameters(
 
         // Mock additional services
         $container->set('doctrine.orm.entity_manager', $this->createMock(EntityManagerInterface::class));
-        $container->setParameter('kernel.project_dir', '');
-        $container->setParameter('kernel.cache_dir', '');
+        $container->setParameter('kernel.project_dir', $this->temporaryDirectory);
+        $container->setParameter('kernel.cache_dir', $this->temporaryDirectory);
+
+        // set directory path to writable directory
+        $container->setParameter('ambta_doctrine_encrypt.secret_directory_path', $this->temporaryDirectory);
 
         // Assert all services are gettable
         foreach ($expectedServices as $expectedService => $class) {