Fix compat of commands with Symfony 5

nicolas-grekas · lcobucci · commit 4d6b1f3e637b · 2019-10-23T16:00:19.000+02:00
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/CollectionRegionCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/CollectionRegionCommand.php
@@ -116,15 +116,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 )
             );
 
-            return;
+            return 0;
         }
 
         if ($input->getOption('all')) {
             $ui->comment('Clearing <info>all</info> second-level cache collection regions');
 
             $cache->evictEntityRegions();
 
-            return;
+            return 0;
         }
 
         if ($ownerId) {
@@ -138,10 +138,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
             $cache->evictCollection($ownerClass, $assoc, $ownerId);
 
-            return;
+            return 0;
         }
 
         $ui->comment(sprintf('Clearing second-level cache for collection <info>"%s#%s"</info>', $ownerClass, $assoc));
         $cache->evictCollectionRegion($ownerClass, $assoc);
+
+        return 0;
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/EntityRegionCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/EntityRegionCommand.php
@@ -108,15 +108,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $ui->comment(sprintf('Flushing cache provider configured for entity named <info>"%s"</info>', $entityClass));
 
-            return;
+            return 0;
         }
 
         if ($input->getOption('all')) {
             $ui->comment('Clearing <info>all</info> second-level cache entity regions');
 
             $cache->evictEntityRegions();
 
-            return;
+            return 0;
         }
 
         if ($entityId) {
@@ -129,10 +129,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
             $cache->evictEntity($entityClass, $entityId);
 
-            return;
+            return 0;
         }
 
         $ui->comment(sprintf('Clearing second-level cache for entity <info>"%s"</info>', $entityClass));
         $cache->evictEntityRegion($entityClass);
+
+        return 0;
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryRegionCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryRegionCommand.php
@@ -112,18 +112,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 )
             );
 
-            return;
+            return 0;
         }
 
         if ($input->getOption('all')) {
             $ui->comment('Clearing <info>all</info> second-level cache query regions');
 
             $cache->evictQueryRegions();
 
-            return;
+            return 0;
         }
 
         $ui->comment(sprintf('Clearing second-level cache query region named <info>"%s"</info>', $name));
         $cache->evictQueryRegion($name);
+
+        return 0;
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
@@ -127,6 +127,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $numSpaces = $input->getOption('num-spaces');
 
         $this->convertDoctrine1Schema($fromPaths, $destPath, $toType, $numSpaces, $extend, $output);
+
+        return 0;
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php
@@ -167,6 +167,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $destPath
             )
         );
+
+        return 0;
     }
 
     /**
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateEntitiesCommand.php
@@ -112,7 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (empty($metadatas)) {
             $ui->success('No Metadata Classes to process.');
-            return;
+            return 0;
         }
 
         $entityGenerator = new EntityGenerator();
@@ -138,5 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Outputting information message
         $ui->newLine();
         $ui->success(sprintf('Entity classes generated to "%s"', $destPath));
+
+        return 0;
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateProxiesCommand.php
@@ -91,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (empty($metadatas)) {
             $ui->success('No Metadata Classes to process.');
-            return;
+            return 0;
         }
 
         foreach ($metadatas as $metadata) {
@@ -104,5 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // Outputting information message
         $ui->newLine();
         $ui->text(sprintf('Proxy classes generated to "<info>%s</info>"', $destPath));
+
+        return 0;
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/GenerateRepositoriesCommand.php
@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (empty($metadatas)) {
             $ui->success('No Metadata Classes to process.');
-            return;
+            return 0;
         }
 
         $numRepositories = 0;
@@ -104,11 +104,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($numRepositories === 0) {
             $ui->text('No Repository classes were found to be processed.');
-            return;
+            return 0;
         }
 
         // Outputting information message
         $ui->newLine();
         $ui->text(sprintf('Repository classes generated to "<info>%s</info>"', $destPath));
+
+        return 0;
     }
 }
diff --git a/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php
@@ -104,11 +104,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($input->getOption('show-sql')) {
             $ui->text($query->getSQL());
-            return;
+            return 0;
         }
 
         $resultSet = $query->execute([], constant($hydrationMode));
 
         $ui->text(Debug::dump($resultSet, $input->getOption('depth'), true, false));
+
+        return 0;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -116,15 +116,15 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`116`	`116`	`)`
`117`	`117`	`);`
`118`	`118`
`119`		`- return;`
	`119`	`+ return 0;`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if ($input->getOption('all')) {`
`123`	`123`	`$ui->comment('Clearing <info>all</info> second-level cache collection regions');`
`124`	`124`
`125`	`125`	`$cache->evictEntityRegions();`
`126`	`126`
`127`		`- return;`
	`127`	`+ return 0;`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`if ($ownerId) {`
`@@ -138,10 +138,12 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`138`	`138`	`);`
`139`	`139`	`$cache->evictCollection($ownerClass, $assoc, $ownerId);`
`140`	`140`
`141`		`- return;`
	`141`	`+ return 0;`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`$ui->comment(sprintf('Clearing second-level cache for collection <info>"%s#%s"</info>', $ownerClass, $assoc));`
`145`	`145`	`$cache->evictCollectionRegion($ownerClass, $assoc);`
	`146`	`+`
	`147`	`+ return 0;`
`146`	`148`	`}`
`147`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,15 +108,15 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`108`	`108`
`109`	`109`	`$ui->comment(sprintf('Flushing cache provider configured for entity named <info>"%s"</info>', $entityClass));`
`110`	`110`
`111`		`- return;`
	`111`	`+ return 0;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if ($input->getOption('all')) {`
`115`	`115`	`$ui->comment('Clearing <info>all</info> second-level cache entity regions');`
`116`	`116`
`117`	`117`	`$cache->evictEntityRegions();`
`118`	`118`
`119`		`- return;`
	`119`	`+ return 0;`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if ($entityId) {`
`@@ -129,10 +129,12 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`129`	`129`	`);`
`130`	`130`	`$cache->evictEntity($entityClass, $entityId);`
`131`	`131`
`132`		`- return;`
	`132`	`+ return 0;`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`$ui->comment(sprintf('Clearing second-level cache for entity <info>"%s"</info>', $entityClass));`
`136`	`136`	`$cache->evictEntityRegion($entityClass);`
	`137`	`+`
	`138`	`+ return 0;`
`137`	`139`	`}`
`138`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,18 +112,20 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`112`	`112`	`)`
`113`	`113`	`);`
`114`	`114`
`115`		`- return;`
	`115`	`+ return 0;`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`if ($input->getOption('all')) {`
`119`	`119`	`$ui->comment('Clearing <info>all</info> second-level cache query regions');`
`120`	`120`
`121`	`121`	`$cache->evictQueryRegions();`
`122`	`122`
`123`		`- return;`
	`123`	`+ return 0;`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$ui->comment(sprintf('Clearing second-level cache query region named <info>"%s"</info>', $name));`
`127`	`127`	`$cache->evictQueryRegion($name);`
	`128`	`+`
	`129`	`+ return 0;`
`128`	`130`	`}`
`129`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,8 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`127`	`127`	`$numSpaces = $input->getOption('num-spaces');`
`128`	`128`
`129`	`129`	`$this->convertDoctrine1Schema($fromPaths, $destPath, $toType, $numSpaces, $extend, $output);`
	`130`	`+`
	`131`	`+ return 0;`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,8 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`167`	`167`	`$destPath`
`168`	`168`	`)`
`169`	`169`	`);`
	`170`	`+`
	`171`	`+ return 0;`
`170`	`172`	`}`
`171`	`173`
`172`	`174`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`112`	`112`
`113`	`113`	`if (empty($metadatas)) {`
`114`	`114`	`$ui->success('No Metadata Classes to process.');`
`115`		`- return;`
	`115`	`+ return 0;`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`$entityGenerator = new EntityGenerator();`
`@@ -138,5 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`138`	`138`	`// Outputting information message`
`139`	`139`	`$ui->newLine();`
`140`	`140`	`$ui->success(sprintf('Entity classes generated to "%s"', $destPath));`
	`141`	`+`
	`142`	`+ return 0;`
`141`	`143`	`}`
`142`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`91`	`91`
`92`	`92`	`if (empty($metadatas)) {`
`93`	`93`	`$ui->success('No Metadata Classes to process.');`
`94`		`- return;`
	`94`	`+ return 0;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`foreach ($metadatas as $metadata) {`
`@@ -104,5 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`104`	`104`	`// Outputting information message`
`105`	`105`	`$ui->newLine();`
`106`	`106`	`$ui->text(sprintf('Proxy classes generated to "<info>%s</info>"', $destPath));`
	`107`	`+`
	`108`	`+ return 0;`
`107`	`109`	`}`
`108`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`84`	`84`
`85`	`85`	`if (empty($metadatas)) {`
`86`	`86`	`$ui->success('No Metadata Classes to process.');`
`87`		`- return;`
	`87`	`+ return 0;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`$numRepositories = 0;`
`@@ -104,11 +104,13 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`104`	`104`
`105`	`105`	`if ($numRepositories === 0) {`
`106`	`106`	`$ui->text('No Repository classes were found to be processed.');`
`107`		`- return;`
	`107`	`+ return 0;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`// Outputting information message`
`111`	`111`	`$ui->newLine();`
`112`	`112`	`$ui->text(sprintf('Repository classes generated to "<info>%s</info>"', $destPath));`
	`113`	`+`
	`114`	`+ return 0;`
`113`	`115`	`}`
`114`	`116`	`}`