fix: call to ::container

api-platform · Jun 15, 2021 · e0d02ac · e0d02ac
1 parent d510c3b
commit e0d02ac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php b/tests/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilterTest.php
@@ -725,7 +725,7 @@ protected function buildSearchFilter(ManagerRegistry $managerRegistry, ?array $p
         });
 
         $iriConverter = $iriConverterProphecy->reveal();
-        $propertyAccessor = self::$kernel->getContainer()->get('test.property_accessor');
+        $propertyAccessor = static::$kernel->getContainer()->get('test.property_accessor');
 
         $identifierExtractorProphecy = $this->prophesize(IdentifiersExtractorInterface::class);
         $identifierExtractorProphecy->getIdentifiersFromResourceClass(Argument::type('string'))->willReturn(['id']);

diff --git a/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php b/tests/Bridge/Doctrine/Orm/Filter/SearchFilterTest.php
@@ -343,7 +343,7 @@ public function testNotPassingIdentifiersExtractor()
         $requestStack->push(Request::create('/api/dummies', 'GET', []));
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $iriConverter = $iriConverterProphecy->reveal();
-        $propertyAccessor = self::$kernel->getContainer()->get('test.property_accessor');
+        $propertyAccessor = static::$kernel->getContainer()->get('test.property_accessor');
 
         return new SearchFilter($this->managerRegistry, $requestStack, $iriConverter, $propertyAccessor, null, null, null);
     }
@@ -593,7 +593,7 @@ protected function buildSearchFilter(ManagerRegistry $managerRegistry, ?array $p
         });
 
         $iriConverter = $iriConverterProphecy->reveal();
-        $propertyAccessor = self::$kernel->getContainer()->get('test.property_accessor');
+        $propertyAccessor = static::$kernel->getContainer()->get('test.property_accessor');
 
         $identifierExtractorProphecy = $this->prophesize(IdentifiersExtractorInterface::class);
         $identifierExtractorProphecy->getIdentifiersFromResourceClass(Argument::type('string'))->willReturn(['id']);

diff --git a/tests/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php b/tests/Bridge/Symfony/Bundle/Test/ApiTestCaseTest.php
@@ -143,7 +143,7 @@ public function testAssertMatchesResourceItemJsonSchemaOutput(): void
         $this->recreateSchema();
 
         /** @var EntityManagerInterface $manager */
-        $manager = self::$container->get('doctrine')->getManager();
+        $manager = (method_exists(static::class, 'getContainer') ? static::getContainer() : static::$container)->get('doctrine')->getManager();
         $dummyDtoInputOutput = new DummyDtoInputOutput();
         $dummyDtoInputOutput->str = 'lorem';
         $dummyDtoInputOutput->num = 54;
@@ -187,7 +187,8 @@ public function testFindIriBy(): void
         ]);
         $this->assertResponseIsSuccessful();
 
-        $resource = 'mongodb' === self::$container->getParameter('kernel.environment') ? DummyDocument::class : Dummy::class;
+        $container = method_exists(static::class, 'getContainer') ? static::getContainer() : static::$container;
+        $resource = 'mongodb' === $container->getParameter('kernel.environment') ? DummyDocument::class : Dummy::class;
         $this->assertMatchesRegularExpression('~^/dummies/\d+~', self::findIriBy($resource, ['name' => 'Kevin']));
         $this->assertNull(self::findIriBy($resource, ['name' => 'not-exist']));
     }
@@ -197,7 +198,7 @@ private function recreateSchema(): void
         self::bootKernel();
 
         /** @var EntityManagerInterface $manager */
-        $manager = self::$container->get('doctrine')->getManager();
+        $manager = (method_exists(static::class, 'getContainer') ? static::getContainer() : static::$container)->get('doctrine')->getManager();
         /** @var \Doctrine\ORM\Mapping\ClassMetadata[] $classes */
         $classes = $manager->getMetadataFactory()->getAllMetadata();
         $schemaTool = new SchemaTool($manager);

diff --git a/tests/Bridge/Symfony/Bundle/Test/ClientTest.php b/tests/Bridge/Symfony/Bundle/Test/ClientTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void
         /**
          * @var EntityManagerInterface
          */
-        $manager = self::$container->get('doctrine')->getManager();
+        $manager = (method_exists(static::class, 'getContainer') ? static::getContainer() : static::$container)->get('doctrine')->getManager();
         /** @var \Doctrine\ORM\Mapping\ClassMetadata[] $classes */
         $classes = $manager->getMetadataFactory()->getAllMetadata();
         $schemaTool = new SchemaTool($manager);
@@ -41,8 +41,8 @@ public function testRequest(): void
     {
         $client = self::createClient();
         $client->getKernelBrowser();
-        $this->assertSame(self::$kernel->getContainer(), $client->getContainer());
-        $this->assertSame(self::$kernel, $client->getKernel());
+        $this->assertSame(method_exists(static::class, 'getContainer') ? static::getContainer() : static::$kernel->getContainer(), $client->getContainer());
+        $this->assertSame(static::$kernel, $client->getKernel());
 
         $client->enableProfiler();
         $response = $client->request('GET', '/');

diff --git a/tests/Util/AnnotationFilterExtractorTraitTest.php b/tests/Util/AnnotationFilterExtractorTraitTest.php
@@ -31,7 +31,7 @@ class AnnotationFilterExtractorTraitTest extends KernelTestCase
     protected function setUp(): void
     {
         self::bootKernel();
-        $this->extractor = new AnnotationFilterExtractor(self::$kernel->getContainer()->get('test.annotation_reader'));
+        $this->extractor = new AnnotationFilterExtractor(static::$kernel->getContainer()->get('test.annotation_reader'));
     }
 
     public function testReadAnnotations()