Merge pull request #143 from marlon-be/feature/symfony5

davedevelopment · web-flow · commit 4e71b881d2b1 · 2019-12-27T10:23:43.000Z
add support for Symfony 5 components
diff --git a/composer.json b/composer.json
@@ -16,8 +16,8 @@
     }],
     "require": {
         "php": ">=5.3.2",
-        "symfony/console": "^2.0||^3.0||^4.0",
-        "symfony/config": "^2.0||^3.0||^4.0"
+        "symfony/console": "^2.0||^3.0||^4.0||^5.0",
+        "symfony/config": "^2.0||^3.0||^4.0||^5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "3.*",
diff --git a/src/Phpmig/Console/Command/DownCommand.php b/src/Phpmig/Console/Command/DownCommand.php
@@ -58,15 +58,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $version = $input->getArgument('version');
 
         if (!in_array($version, $versions)) {
-            return;
+            return 0;
         }
 
         if (!isset($migrations[$version])) {
-            return;
+            return 0;
         }
 
         $container = $this->getContainer();
         $container['phpmig.migrator']->down($migrations[$version]);
+
+        return 0;
     }
 }
 
diff --git a/src/Phpmig/Console/Command/GenerateCommand.php b/src/Phpmig/Console/Command/GenerateCommand.php
@@ -153,7 +153,7 @@ public function down()
             '.' . str_replace(getcwd(), '', $path)
         );
 
-        return;
+        return 0;
     }
 
     protected function transMigName($migrationName)
diff --git a/src/Phpmig/Console/Command/MigrateCommand.php b/src/Phpmig/Console/Command/MigrateCommand.php
@@ -112,5 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $container['phpmig.migrator']->up($migration);
             }
         }
+
+        return 0;
     }
 }
diff --git a/src/Phpmig/Console/Command/RedoCommand.php b/src/Phpmig/Console/Command/RedoCommand.php
@@ -58,16 +58,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $version = $input->getArgument('version');
 
         if (!in_array($version, $versions)) {
-            return;
+            return 0;
         }
 
         if (!isset($migrations[$version])) {
-            return;
+            return 0;
         }
 
         $container = $this->getContainer();
         $container['phpmig.migrator']->down($migrations[$version]);
         $container['phpmig.migrator']->up($migrations[$version]);
+
+        return 0;
     }
 }
 
diff --git a/src/Phpmig/Console/Command/RollbackCommand.php b/src/Phpmig/Console/Command/RollbackCommand.php
@@ -55,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $migrations = $this->getMigrations();
         $versions   = $this->getAdapter()->fetchAll();
-        
+
         $version = $input->getOption('target');
 
         ksort($migrations);
@@ -64,9 +64,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Check we have at least 1 migration to revert
         if (empty($versions) || $version == end($versions)) {
             $output->writeln("<error>No migrations to rollback</error>");
-            return;
+            return 0;
         }
-        
+
         // If no target version was supplied, revert the last migration
         if (null === $version) {
             // Get the migration before the last run migration
@@ -75,17 +75,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             // Get the first migration number
             $first = reset($versions);
-            
+
             // If the target version is before the first migration, revert all migrations
             if ($version < $first) {
                 $version = 0;
             }
         }
-        
+
         // Check the target version exists
         if (0 !== $version && !isset($migrations[$version])) {
             $output->writeln("<error>Target version ($version) not found</error>");
-            return;
+            return 0;
         }
 
         // Revert the migration(s)
@@ -100,5 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $container['phpmig.migrator']->down($migration);
             }
         }
+
+        return 0;
     }
 }
diff --git a/src/Phpmig/Console/Command/StatusCommand.php b/src/Phpmig/Console/Command/StatusCommand.php
@@ -54,7 +54,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $versions = $this->getAdapter()->fetchAll();
         foreach($this->getMigrations() as $migration) {
-            
+
             if (in_array($migration->getVersion(), $versions)) {
                 $status = "     <info>up</info> ";
                 unset($versions[array_search($migration->getVersion(), $versions)]);
@@ -63,23 +63,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
 
             $output->writeln(
-                $status . 
-                sprintf(" %14s ", $migration->getVersion()) . 
+                $status .
+                sprintf(" %14s ", $migration->getVersion()) .
                 " <comment>" . $migration->getName() . "</comment>"
             );
         }
 
         foreach($versions as $missing) {
             $output->writeln(
-                '   <error>up</error> ' . 
-                sprintf(" %14s ", $missing) . 
+                '   <error>up</error> ' .
+                sprintf(" %14s ", $missing) .
                 ' <error>** MISSING **</error> '
             );
         }
 
         // print status
         $output->writeln("");
-        return;
+        return 0;
     }
 }
 
diff --git a/src/Phpmig/Console/Command/UpCommand.php b/src/Phpmig/Console/Command/UpCommand.php
@@ -58,15 +58,17 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $version = $input->getArgument('version');
 
         if (in_array($version, $versions)) {
-            return;
+            return 0;
         }
 
         if (!isset($migrations[$version])) {
-            return;
+            return 0;
         }
 
         $container = $this->getContainer();
         $container['phpmig.migrator']->up($migrations[$version]);
+
+        return 0;
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -58,15 +58,17 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`58`	`58`	`$version = $input->getArgument('version');`
`59`	`59`
`60`	`60`	`if (!in_array($version, $versions)) {`
`61`		`- return;`
	`61`	`+ return 0;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (!isset($migrations[$version])) {`
`65`		`- return;`
	`65`	`+ return 0;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$container = $this->getContainer();`
`69`	`69`	`$container['phpmig.migrator']->down($migrations[$version]);`
	`70`	`+`
	`71`	`+ return 0;`
`70`	`72`	`}`
`71`	`73`	`}`
`72`	`74`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function down()`
`153`	`153`	`'.' . str_replace(getcwd(), '', $path)`
`154`	`154`	`);`
`155`	`155`
`156`		`- return;`
	`156`	`+ return 0;`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`protected function transMigName($migrationName)`
Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`112`	`112`	`$container['phpmig.migrator']->up($migration);`
`113`	`113`	`}`
`114`	`114`	`}`
	`115`	`+`
	`116`	`+ return 0;`
`115`	`117`	`}`
`116`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,16 +58,18 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`58`	`58`	`$version = $input->getArgument('version');`
`59`	`59`
`60`	`60`	`if (!in_array($version, $versions)) {`
`61`		`- return;`
	`61`	`+ return 0;`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`if (!isset($migrations[$version])) {`
`65`		`- return;`
	`65`	`+ return 0;`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`$container = $this->getContainer();`
`69`	`69`	`$container['phpmig.migrator']->down($migrations[$version]);`
`70`	`70`	`$container['phpmig.migrator']->up($migrations[$version]);`
	`71`	`+`
	`72`	`+ return 0;`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`55`	`55`
`56`	`56`	`$migrations = $this->getMigrations();`
`57`	`57`	`$versions = $this->getAdapter()->fetchAll();`
`58`		`-`
	`58`	`+`
`59`	`59`	`$version = $input->getOption('target');`
`60`	`60`
`61`	`61`	`ksort($migrations);`
`@@ -64,9 +64,9 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`64`	`64`	`// Check we have at least 1 migration to revert`
`65`	`65`	`if (empty($versions) \|\| $version == end($versions)) {`
`66`	`66`	`$output->writeln("<error>No migrations to rollback</error>");`
`67`		`- return;`
	`67`	`+ return 0;`
`68`	`68`	`}`
`69`		`-`
	`69`	`+`
`70`	`70`	`// If no target version was supplied, revert the last migration`
`71`	`71`	`if (null === $version) {`
`72`	`72`	`// Get the migration before the last run migration`
`@@ -75,17 +75,17 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`75`	`75`	`} else {`
`76`	`76`	`// Get the first migration number`
`77`	`77`	`$first = reset($versions);`
`78`		`-`
	`78`	`+`
`79`	`79`	`// If the target version is before the first migration, revert all migrations`
`80`	`80`	`if ($version < $first) {`
`81`	`81`	`$version = 0;`
`82`	`82`	`}`
`83`	`83`	`}`
`84`		`-`
	`84`	`+`
`85`	`85`	`// Check the target version exists`
`86`	`86`	`if (0 !== $version && !isset($migrations[$version])) {`
`87`	`87`	`$output->writeln("<error>Target version ($version) not found</error>");`
`88`		`- return;`
	`88`	`+ return 0;`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`// Revert the migration(s)`
`@@ -100,5 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`100`	`100`	`$container['phpmig.migrator']->down($migration);`
`101`	`101`	`}`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ return 0;`
`103`	`105`	`}`
`104`	`106`	`}`