refactoring

Author: dmitriy

composer.json

@@ -88,8 +88,7 @@
         "ergebnis/composer-normalize": "^2.3",
         "roave/security-advisories": "dev-master",
         "symfony/debug-pack": "*",
-        "symfony/maker-bundle": "^1.14",
-        "symfony/profiler-pack": "*",
+        "symfony/maker-bundle": "^1.15",
         "symfony/requirements-checker": "^1.1"
     },
     "config": {
@@ -119,7 +118,6 @@
         "psr-4": {
             "App\\Tests\\": "tests/",
             "PHPUnit\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/",
-            "PHPUnit\\Framework\\MockObject\\": "tools/01_phpunit/vendor/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility",
             "Symfony\\Component\\BrowserKit\\": "tools/01_phpunit/vendor/symfony/browser-kit",
             "Symfony\\Bridge\\PhpUnit\\": "tools/01_phpunit/vendor/symfony/phpunit-bridge"
         }

composer.lock

@@ -5,7 +5,8 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
     locale: 'en'
-    app.uuid_regex: '^[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-1[0-9a-fA-F]{3}\-[89ab][0-9a-f]{3}\-[0-9a-fA-F]{12}$'
+    app.uuid_v1_regex: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-1[0-9a-fA-F]{3}-[89abAB][0-9a-f]{3}-[0-9a-fA-F]{12}$'
+    app.uuid_v4_regex: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-f]{3}-[0-9a-fA-F]{12}$'
 
 services:
     # default configuration for services in *this* file
@@ -18,7 +19,8 @@ services:
         bind:
             $projectDir: '%kernel.project_dir%'
             $environment: '%kernel.environment%'
-            $uuidRegex: '%app.uuid_regex%'
+            $uuidV1Regex: '%app.uuid_v1_regex%'
+            $uuidV4Regex: '%app.uuid_v4_regex%'
             $locale: '%locale%'
     _instanceof:
         App\Rest\Interfaces\ControllerInterface:

config/services.yaml

@@ -52,6 +52,8 @@ server {
     }
 
     location ~ \.php$ {
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass symfony:9000;

docker/dev/nginx.conf

@@ -52,6 +52,8 @@ server {
     }
 
     location ~ \.php$ {
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass symfony:9000;

docker/prod/nginx.conf

@@ -52,6 +52,8 @@ server {
     }
 
     location ~ \.php$ {
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_pass symfony:9000;

docker/test/nginx.conf

@@ -81,7 +81,7 @@ public function getAll(): IteratorAggregate
      */
     public function has(?string $className = null): bool
     {
-        return $className === null ? false : $this->getFilteredItem($className) !== null;
+        return $this->getFilteredItem($className ?? '') !== null;
     }
 
     /**

src/Collection/Traits/Collection.php

@@ -22,6 +22,9 @@ trait ExecuteMultipleCommand
     // Traits
     use GetApplication;
 
+    /**
+     * @var array<int|string, string>
+     */
     private array $choices = [];
     /**
      * @psalm-suppress PropertyNotSetInConstructor
@@ -31,14 +34,13 @@ trait ExecuteMultipleCommand
     /**
      * Setter method for choices to use.
      *
-     * @param array $choices
+     * @param array<int|string, string> $choices
      */
     protected function setChoices(array $choices): void
     {
         $this->choices = $choices;
     }
 
-    /** @noinspection PhpMissingParentCallCommonInspection */
     /**
      * Executes the current command.
      *
@@ -53,30 +55,31 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->io = new SymfonyStyle($input, $output);
         $this->io->write("\033\143");
+        $command = $this->ask();
 
-        /** @noinspection PhpAssignmentInConditionInspection */
-        while ($command = $this->ask()) {
+        while ($command !== null) {
             $arguments = [
                 'command' => $command,
             ];
             $input = new ArrayInput($arguments);
-            $cmd = $this->getApplication()->find((string)$command);
-            $cmd->run($input, $output);
+            $cmd = $this->getApplication()->find($command);
+            $outputValue = $cmd->run($input, $output);
+            $command = $this->ask();
         }
 
         if ($input->isInteractive()) {
             $this->io->success('Have a nice day');
         }
 
-        return 0;
+        return $outputValue ?? 0;
     }
 
     /**
      * Method to ask user to make choose one of defined choices.
      *
-     * @return string|bool
+     * @return string|null
      */
-    private function ask()
+    private function ask(): ?string
     {
         $index = array_search(
             $this->io->choice('What you want to do', array_values($this->choices)),
@@ -85,6 +88,6 @@ private function ask()
         );
         $choice = (string)array_values(array_flip($this->choices))[(int)$index];
 
-        return $choice === '0' ? false : $choice;
+        return $choice === '0' ? null : $choice;
     }
 }

src/Command/Traits/ExecuteMultipleCommand.php

@@ -25,7 +25,7 @@ trait GetApplication
     public function getApplication(): Application
     {
         if (!($this instanceof Command)) {
-            throw new \RuntimeException('This trait ' . __TRAIT__ . ' is only mentioned to use with console commands.');
+            throw new RuntimeException('This trait ' . __TRAIT__ . ' is only mentioned to use with console commands.');
         }
 
         /** @noinspection PhpUndefinedClassInspection */

src/Command/Traits/GetApplication.php

@@ -7,12 +7,12 @@
 namespace App\Command\Utils;
 
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Exception\RuntimeException;
 use App\Command\Traits\StyleSymfony;
 use LogicException;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use InvalidArgumentException;
-use RuntimeException;
 use SplFileInfo;
 use stdClass;
 use Symfony\Component\Console\Helper\ProgressBar;