Merge pull request #45 from DivanteLtd/php8

Php8 compatibility
DivanteLtd · Sep 6, 2022 · 13b6e5b · 13b6e5b
2 parents 38eae0d + 4f6d5b9
commit 13b6e5b
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 14 deletions.
diff --git a/src/Command/BricksUpdateCommand.php b/src/Command/BricksUpdateCommand.php
@@ -59,7 +59,7 @@ protected function configure()
      * @param OutputInterface $output
      * @return int|void|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $inputOutput = new SymfonyStyle($input, $output);
         $bundleName = $input->getArgument('bundle');
@@ -74,5 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->installerService->createObjectBrickDefinition($brickName, $brickFile);
             $inputOutput->success(sprintf('Brick %s was successfully installed!', $brickName));
         }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Command/ClassesUpdateCommand.php b/src/Command/ClassesUpdateCommand.php
@@ -61,7 +61,7 @@ protected function configure()
      * @param OutputInterface $output
      * @return int|void|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $inputOutput = new SymfonyStyle($input, $output);
         $bundleName = $input->getArgument('bundle');
@@ -74,5 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->installerService->createClassDefinition($className, $classFile);
             $inputOutput->success(sprintf('Class %s was successfully installed!', $className));
         }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Command/DeleteByIdCommand.php b/src/Command/DeleteByIdCommand.php
@@ -9,6 +9,7 @@
 namespace PimcoreDevkitBundle\Command;
 
 use Pimcore\Console\AbstractCommand;
+use Symfony\Component\Console\Command\Command;
 use Pimcore\Model\Asset;
 use Pimcore\Model\Document;
 use Pimcore\Model\DataObject\AbstractObject;
@@ -46,18 +47,18 @@ protected function configure(): void
      * @param OutputInterface $output
      * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $type = $input->getOption("type");
         if (!$type) {
             $output->writeln("Missing -t option.");
-            return;
+            return Command::FAILURE;
         }
 
         $id = $input->getOption("id");
         if (!$id) {
             $output->writeln("Missing -id option.");
-            return;
+            return Command::FAILURE;
         }
 
         try {
@@ -73,13 +74,15 @@ protected function execute(InputInterface $input, OutputInterface $output): void
                     break;
                 default:
                     $output->writeln("Incorrect tree type, allowed types: object, document, asset.");
-                    return;
+                    return Command::FAILURE;
             }
 
             $output->writeln("Element " . $id . " has been deleted.");
         } catch (\Exception $e) {
             $output->writeln($e->getMessage());
         }
+
+        return Command::SUCCESS;
     }
 
     /**

diff --git a/src/Command/DeleteFolderCommand.php b/src/Command/DeleteFolderCommand.php
@@ -9,6 +9,7 @@
 namespace PimcoreDevkitBundle\Command;
 
 use Pimcore\Console\AbstractCommand;
+use Symfony\Component\Console\Command\Command;
 use Pimcore\Model\DataObject\Folder;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -44,18 +45,18 @@ protected function configure(): void
      * @param OutputInterface $output
      * @return void
      */
-    protected function execute(InputInterface $input, OutputInterface $output): void
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $type = $input->getOption("type");
         if (!$type) {
             $output->writeln("Missing -t option.");
-            return;
+            return Command::FAILURE;
         }
 
         $path = $input->getOption("folder");
         if (!$path) {
             $output->writeln("Missing -f option.");
-            return;
+            return Command::FAILURE;
         }
 
         try {
@@ -71,13 +72,15 @@ protected function execute(InputInterface $input, OutputInterface $output): void
                     break;
                 default:
                     $output->writeln("Incorrect tree type, allowed types: object, document, asset.");
-                    return;
+                    return Command::FAILURE;
             }
 
             $output->writeln("Folder " . $path . " has been deleted.");
         } catch (\Exception $e) {
             $output->writeln($e->getMessage());
         }
+
+        return Command::SUCCESS;
     }
 
     /**

diff --git a/src/Command/FieldcollectionsUpdateCommand.php b/src/Command/FieldcollectionsUpdateCommand.php
@@ -52,7 +52,7 @@ protected function configure()
      * @param OutputInterface $output
      * @return int|void|null
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $inputOutput = new SymfonyStyle($input, $output);
         $bundleName = $input->getArgument('bundle');
@@ -65,5 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $this->installerService->createFieldcollectionDefinition($fieldcollectionName, $fieldcollectionFile);
             $inputOutput->success(sprintf('Fieldcollection %s was successfully installed!', $fieldcollectionName));
         }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/src/Command/RemoveAllObjectsCommand.php b/src/Command/RemoveAllObjectsCommand.php
@@ -10,6 +10,7 @@
 
 use PimcoreDevkitBundle\Service\DataObjectService;
 use Pimcore\Console\AbstractCommand;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -43,7 +44,7 @@ protected function configure()
      * @return void
      * @throws \Exception
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $classesList = $input->getOption('classes');
 
@@ -60,5 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             $output->writeln("TOTAL REMOVED:  $cnt");
         }
+
+        return Command::SUCCESS;
     }
 }
diff --git a/src/FileLocator/PimcoreBundlesFilesLocator.php b/src/FileLocator/PimcoreBundlesFilesLocator.php
@@ -76,10 +76,14 @@ private function getPimcoreFiles(string $bundleCatalog): array
     {
         $finder = $this->getFinder();
         try {
-            $finder->in(sprintf('src/%s/' . static::SUBCATALOG, $bundleCatalog));
+            $finder->in(sprintf('src/%s/%s', $bundleCatalog, static::SUBCATALOG));
         } catch (DirectoryNotFoundException $exception) {
-            return [];
         }
+        try {
+            $finder->in(sprintf('app/%s', static::SUBCATALOG));
+        } catch (DirectoryNotFoundException $exception) {
+        }
+
         if (!$finder->hasResults()) {
             return [];
         }