Merge pull request #282 from alcaeus/update-php-versions

alcaeus · web-flow · commit 29089c8143a9 · 2019-11-13T12:06:48.000+01:00
Update supported PHP version
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - nightly
+  - 7.4snapshot
 
 cache:
   directories:
@@ -24,9 +24,6 @@ script:
   - ./vendor/bin/phpunit
 
 jobs:
-  allow_failures:
-    - php: nightly
-
   include:
     - stage: Test
       env: DEPENDENCIES=low
diff --git a/Command/Helper/DoctrineCommandHelper.php b/Command/Helper/DoctrineCommandHelper.php
@@ -11,6 +11,8 @@
 use LogicException;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 use function count;
 use function sprintf;
 
@@ -23,16 +25,17 @@ abstract class DoctrineCommandHelper extends BaseDoctrineCommandHelper
     public static function setApplicationHelper(Application $application, InputInterface $input) : void
     {
         $container = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
 
         /** @var Registry $doctrine */
         $doctrine = $container->get('doctrine');
 
         $managerNames = $doctrine->getManagerNames();
 
         if ($input->getOption('db') !== null || count($managerNames) === 0) {
-            self::setApplicationConnection($application, $input->getOption('db'));
+            self::setApplicationConnection($application, (string) $input->getOption('db'));
         } else {
-            self::setApplicationEntityManager($application, $input->getOption('em'));
+            self::setApplicationEntityManager($application, (string) $input->getOption('em'));
         }
 
         if ($input->getOption('shard') === null) {
@@ -58,6 +61,6 @@ public static function setApplicationHelper(Application $application, InputInter
             ));
         }
 
-        $connection->connect($input->getOption('shard'));
+        $connection->connect((string) $input->getOption('shard'));
     }
 }
diff --git a/Command/MigrationsDiffDoctrineCommand.php b/Command/MigrationsDiffDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for generate migration classes by comparing your current database schema
@@ -36,7 +38,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsDumpSchemaDoctrineCommand.php b/Command/MigrationsDumpSchemaDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for dumping your current database schema to a migration.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsExecuteDoctrineCommand.php b/Command/MigrationsExecuteDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for executing single migrations up or down manually.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsGenerateDoctrineCommand.php b/Command/MigrationsGenerateDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for generating new blank migration classes
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsLatestDoctrineCommand.php b/Command/MigrationsLatestDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for outputting the latest version number.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsMigrateDoctrineCommand.php b/Command/MigrationsMigrateDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for executing a migration to a specified version or the latest available version.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsRollupDoctrineCommand.php b/Command/MigrationsRollupDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for rolling up your historical migration versions and inserting the dumped schema version.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsStatusDoctrineCommand.php b/Command/MigrationsStatusDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command to view the status of a set of migrations.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsUpToDateDoctrineCommand.php b/Command/MigrationsUpToDateDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for checking if your database is up to date or not.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/Command/MigrationsVersionDoctrineCommand.php b/Command/MigrationsVersionDoctrineCommand.php
@@ -10,6 +10,8 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use function assert;
 
 /**
  * Command for manually adding and deleting migration versions from the version table.
@@ -35,7 +37,9 @@ public function initialize(InputInterface $input, OutputInterface $output) : voi
         Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
 
         $configuration = $this->getMigrationConfiguration($input, $output);
-        DoctrineCommand::configureMigrations($application->getKernel()->getContainer(), $configuration);
+        $container     = $application->getKernel()->getContainer();
+        assert($container instanceof ContainerInterface);
+        DoctrineCommand::configureMigrations($container, $configuration);
 
         parent::initialize($input, $output);
     }
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "doctrine/migrations": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7|^6.4|^7.0",
+        "phpunit/phpunit": "^6.4|^7.0",
         "mikey179/vfsstream": "^1.6",
         "doctrine/coding-standard": "^5.0",
         "phpstan/phpstan": "^0.9.2",
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-          "dev-master": "2.0.x-dev"
+          "dev-master": "2.1.x-dev"
         }
     }
 }
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`use LogicException;`
`12`	`12`	`use Symfony\Bundle\FrameworkBundle\Console\Application;`
`13`	`13`	`use Symfony\Component\Console\Input\InputInterface;`
	`14`	`+use Symfony\Component\DependencyInjection\ContainerInterface;`
	`15`	`+use function assert;`
`14`	`16`	`use function count;`
`15`	`17`	`use function sprintf;`
`16`	`18`
`@@ -23,16 +25,17 @@ abstract class DoctrineCommandHelper extends BaseDoctrineCommandHelper`
`23`	`25`	`public static function setApplicationHelper(Application $application, InputInterface $input) : void`
`24`	`26`	`{`
`25`	`27`	`$container = $application->getKernel()->getContainer();`
	`28`	`+ assert($container instanceof ContainerInterface);`
`26`	`29`
`27`	`30`	`/** @var Registry $doctrine */`
`28`	`31`	`$doctrine = $container->get('doctrine');`
`29`	`32`
`30`	`33`	`$managerNames = $doctrine->getManagerNames();`
`31`	`34`
`32`	`35`	`if ($input->getOption('db') !== null \|\| count($managerNames) === 0) {`
`33`		`- self::setApplicationConnection($application, $input->getOption('db'));`
	`36`	`+ self::setApplicationConnection($application, (string) $input->getOption('db'));`
`34`	`37`	`} else {`
`35`		`- self::setApplicationEntityManager($application, $input->getOption('em'));`
	`38`	`+ self::setApplicationEntityManager($application, (string) $input->getOption('em'));`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`if ($input->getOption('shard') === null) {`
`@@ -58,6 +61,6 @@ public static function setApplicationHelper(Application $application, InputInter`
`58`	`61`	`));`
`59`	`62`	`}`
`60`	`63`
`61`		`- $connection->connect($input->getOption('shard'));`
	`64`	`+ $connection->connect((string) $input->getOption('shard'));`
`62`	`65`	`}`
`63`	`66`	`}`