Remove types for php 5.6 support

doctrine · May 30, 2019 · dfb078d · dfb078d
1 parent b8562ec
commit dfb078d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 45 deletions.
diff --git a/Tests/Fixtures/FooBundle/DataFixtures/DependentOnRequiredConstructorArgsFixtures.php b/Tests/Fixtures/FooBundle/DataFixtures/DependentOnRequiredConstructorArgsFixtures.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures;
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\ODMFixtureInterface;
@@ -10,12 +8,12 @@
 
 class DependentOnRequiredConstructorArgsFixtures implements ODMFixtureInterface, DependentFixtureInterface
 {
-    public function load(ObjectManager $manager) : void
+    public function load(ObjectManager $manager)
     {
         // ...
     }
 
-    public function getDependencies() : array
+    public function getDependencies()
     {
         return [RequiredConstructorArgsFixtures::class];
     }

diff --git a/Tests/Fixtures/FooBundle/DataFixtures/OtherFixtures.php b/Tests/Fixtures/FooBundle/DataFixtures/OtherFixtures.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures;
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\FixtureGroupInterface;
@@ -10,12 +8,12 @@
 
 class OtherFixtures implements ODMFixtureInterface, FixtureGroupInterface
 {
-    public function load(ObjectManager $manager) : void
+    public function load(ObjectManager $manager)
     {
         // ...
     }
 
-    public static function getGroups() : array
+    public static function getGroups()
     {
         return ['staging', 'fulfilledDependencyGroup'];
     }

diff --git a/Tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php b/Tests/Fixtures/FooBundle/DataFixtures/RequiredConstructorArgsFixtures.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures;
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\ODMFixtureInterface;
@@ -13,7 +11,7 @@ public function __construct(string $fooRequiredArg)
     {
     }
 
-    public function load(ObjectManager $manager) : void
+    public function load(ObjectManager $manager)
     {
         // ...
     }

diff --git a/Tests/Fixtures/FooBundle/DataFixtures/WithDependenciesFixtures.php b/Tests/Fixtures/FooBundle/DataFixtures/WithDependenciesFixtures.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures;
 
 use Doctrine\Bundle\MongoDBBundle\Fixture\FixtureGroupInterface;
@@ -11,17 +9,17 @@
 
 class WithDependenciesFixtures implements ODMFixtureInterface, DependentFixtureInterface, FixtureGroupInterface
 {
-    public function load(ObjectManager $manager) : void
+    public function load(ObjectManager $manager)
     {
         // ...
     }
 
-    public function getDependencies() : array
+    public function getDependencies()
     {
         return [OtherFixtures::class];
     }
 
-    public static function getGroups() : array
+    public static function getGroups()
     {
         return ['missingDependencyGroup', 'fulfilledDependencyGroup'];
     }

diff --git a/Tests/Fixtures/FooBundle/FooBundle.php b/Tests/Fixtures/FooBundle/FooBundle.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

diff --git a/Tests/IntegrationTest.php b/Tests/IntegrationTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 namespace Doctrine\Bundle\MongoDBBundle\Tests;
 
 use Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\FixturesCompilerPass;
@@ -11,7 +9,6 @@
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures\WithDependenciesFixtures;
 use Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\FooBundle;
 use Doctrine\Common\Persistence\ManagerRegistry;
-use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use Symfony\Bridge\Doctrine\DataFixtures\ContainerAwareLoader;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
@@ -28,10 +25,10 @@
 
 class IntegrationTest extends TestCase
 {
-    public function testFixturesLoader(): void
+    public function testFixturesLoader()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
 
@@ -59,12 +56,12 @@ public function testFixturesLoader(): void
         $this->assertInstanceOf(WithDependenciesFixtures::class, $actualFixtures[1]);
     }
 
-    public function testFixturesLoaderWhenFixtureHasDependencyThatIsNotYetLoaded(): void
+    public function testFixturesLoaderWhenFixtureHasDependencyThatIsNotYetLoaded()
     {
         // See https://github.com/doctrine/DoctrineFixturesBundle/issues/215
 
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             $c->autowire(WithDependenciesFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
 
@@ -96,10 +93,10 @@ public function testFixturesLoaderWhenFixtureHasDependencyThatIsNotYetLoaded():
      * @expectedException \LogicException
      * @expectedExceptionMessage The "Doctrine\Bundle\MongoDBBundle\Tests\Fixtures\FooBundle\DataFixtures\RequiredConstructorArgsFixtures" fixture class is trying to be loaded, but is not available. Make sure this class is defined as a service and tagged with "doctrine.fixture.odm.mongodb".
      */
-    public function testExceptionIfDependentFixtureNotWired(): void
+    public function testExceptionIfDependentFixtureNotWired()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             $c->autowire(DependentOnRequiredConstructorArgsFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
 
@@ -114,10 +111,10 @@ public function testExceptionIfDependentFixtureNotWired(): void
         $loader->getFixtures();
     }
 
-    public function testFixturesLoaderWithGroupsOptionViaInterface(): void
+    public function testFixturesLoaderWithGroupsOptionViaInterface()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             // has a "staging" group via the getGroups() method
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
@@ -146,10 +143,10 @@ public function testFixturesLoaderWithGroupsOptionViaInterface(): void
         $this->assertInstanceOf(OtherFixtures::class, $actualFixtures[0]);
     }
 
-    public function testFixturesLoaderWithGroupsOptionViaTag(): void
+    public function testFixturesLoaderWithGroupsOptionViaTag()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             // has a "staging" group via the getGroups() method
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG, ['group' => 'group1'])
@@ -173,10 +170,10 @@ public function testFixturesLoaderWithGroupsOptionViaTag(): void
         $this->assertCount(0, $loader->getFixtures(['group3']));
     }
 
-    public function testLoadFixturesViaGroupWithMissingDependency(): void
+    public function testLoadFixturesViaGroupWithMissingDependency()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             // has a "staging" group via the getGroups() method
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
@@ -199,10 +196,10 @@ public function testLoadFixturesViaGroupWithMissingDependency(): void
         $loader->getFixtures(['missingDependencyGroup']);
     }
 
-    public function testLoadFixturesViaGroupWithFulfilledDependency(): void
+    public function testLoadFixturesViaGroupWithFulfilledDependency()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             // has a "staging" group via the getGroups() method
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
@@ -232,10 +229,10 @@ public function testLoadFixturesViaGroupWithFulfilledDependency(): void
         ], $actualFixtureClasses);
     }
 
-    public function testLoadFixturesByShortName(): void
+    public function testLoadFixturesByShortName()
     {
         $kernel = new IntegrationTestKernel('dev', true);
-        $kernel->addServices(static function (ContainerBuilder $c): void {
+        $kernel->addServices(static function (ContainerBuilder $c) {
             // has a "staging" group via the getGroups() method
             $c->autowire(OtherFixtures::class)
                 ->addTag(FixturesCompilerPass::FIXTURE_TAG);
@@ -275,19 +272,19 @@ class IntegrationTestKernel extends Kernel
     /** @var int */
     private $randomKey;
 
-    public function __construct(string $environment, bool $debug)
+    public function __construct($environment, $debug)
     {
         $this->randomKey = rand(100, 999);
 
         parent::__construct($environment, $debug);
     }
 
-    protected function getContainerClass(): string
+    protected function getContainerClass()
     {
         return 'test' . $this->randomKey . parent::getContainerClass();
     }
 
-    public function registerBundles(): array
+    public function registerBundles()
     {
         return [
             new FrameworkBundle(),
@@ -296,29 +293,29 @@ public function registerBundles(): array
         ];
     }
 
-    public function addServices(callable $callback): void
+    public function addServices(callable $callback)
     {
         $this->servicesCallback = $callback;
     }
 
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
+    protected function configureRoutes(RouteCollectionBuilder $routes)
     {
     }
 
-    protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader): void
+    protected function configureContainer(ContainerBuilder $c, LoaderInterface $loader)
     {
         $c->setParameter('kernel.secret', 'foo');
         $c->register('doctrine', ManagerRegistry::class);
         $callback = $this->servicesCallback;
         $callback($c);
     }
 
-    public function getCacheDir(): string
+    public function getCacheDir()
     {
         return sys_get_temp_dir() . '/doctrine_mongodb_odm_bundle' . $this->randomKey;
     }
 
-    public function getLogDir(): string
+    public function getLogDir()
     {
         return sys_get_temp_dir();
     }