Don't use named parameters in code

opencultureconsulting · Oct 14, 2024 · 396f8dc · 396f8dc
1 parent 97fee92
commit 396f8dc
Show file tree

Hide file tree

Showing 36 changed files with 532 additions and 703 deletions.
diff --git a/composer.json b/composer.json
@@ -31,8 +31,8 @@
         "ext-dom": "*",
         "ext-libxml": "*",
         "ext-sqlite3": "*",
-        "doctrine/dbal": "^4.1",
-        "doctrine/orm": "^3.2",
+        "doctrine/dbal": "^4.2",
+        "doctrine/orm": "^3.3",
         "opencultureconsulting/basics": "^2.1",
         "opencultureconsulting/psr15": "^1.2",
         "symfony/cache": "^6.4",

diff --git a/composer.lock b/composer.lock
diff --git a/src/App.php b/src/App.php
@@ -43,7 +43,7 @@ final class App
      */
     public function __construct()
     {
-        $this->requestHandler = new QueueRequestHandler(middlewares: [new Dispatcher()]);
+        $this->requestHandler = new QueueRequestHandler([new Dispatcher()]);
     }
 
     /**

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -72,22 +72,20 @@ final class Configuration
      */
     private function __construct()
     {
-        $configPath = Path::canonicalize(path: self::CONFIG_FILE);
-        if (!is_readable(filename: $configPath)) {
+        $configPath = Path::canonicalize(self::CONFIG_FILE);
+        if (!is_readable($configPath)) {
             throw new FileNotFoundException(
-                message: 'Configuration file not found or not readable.',
-                code: 500,
-                path: $configPath
+                'Configuration file not found or not readable.',
+                500,
+                null,
+                $configPath
             );
         }
         /** @var array<TKey, TValue> */
-        $config = Yaml::parseFile(filename: $configPath);
-        $violations = ConfigurationValidator::validate(config: $config);
+        $config = Yaml::parseFile($configPath);
+        $violations = ConfigurationValidator::validate($config);
         if ($violations->count() > 0) {
-            throw new ValidationFailedException(
-                value: null,
-                violations: $violations
-            );
+            throw new ValidationFailedException(null, $violations);
         }
         $this->settings = $config;
     }

diff --git a/src/Console.php b/src/Console.php
@@ -91,13 +91,11 @@ protected function clearResultCache(): void
         /** @var Application */
         $app = $this->getApplication();
         $app->doRun(
-            input: new ArrayInput(
-                parameters: [
-                    'command' => 'orm:clear-cache:result',
-                    '--flush' => true
-                ]
-            ),
-            output: new NullOutput()
+            new ArrayInput([
+                'command' => 'orm:clear-cache:result',
+                '--flush' => true
+            ]),
+            new NullOutput()
         );
     }
 
@@ -109,7 +107,7 @@ protected function clearResultCache(): void
     protected function getPhpMemoryLimit(): int
     {
         if (!isset($this->memoryLimit)) {
-            $ini = trim(string: ini_get(option: 'memory_limit'));
+            $ini = trim(ini_get('memory_limit'));
             $limit = (int) $ini;
             if ($limit < 0) {
                 return -1;
@@ -146,47 +144,41 @@ protected function validateInput(InputInterface $input, OutputInterface $output)
 
         if (array_key_exists('format', $this->arguments)) {
             $formats = $this->em->getMetadataFormats();
-            if (!$formats->containsKey(key: $this->arguments['format'])) {
-                $output->writeln(
-                    messages: [
-                        '',
-                        sprintf(
-                            format: ' [ERROR] Metadata format "%s" is not supported. ',
-                            values: $this->arguments['format']
-                        ),
-                        ''
-                    ]
-                );
-                return false;
-            }
-        }
-        if (array_key_exists('file', $this->arguments) && !is_readable(filename: $this->arguments['file'])) {
-            $output->writeln(
-                messages: [
+            if (!$formats->containsKey($this->arguments['format'])) {
+                $output->writeln([
                     '',
                     sprintf(
-                        format: ' [ERROR] File "%s" not found or not readable. ',
-                        values: $this->arguments['file']
+                        ' [ERROR] Metadata format "%s" is not supported. ',
+                        $this->arguments['format']
                     ),
                     ''
-                ]
-            );
+                ]);
+                return false;
+            }
+        }
+        if (array_key_exists('file', $this->arguments) && !is_readable($this->arguments['file'])) {
+            $output->writeln([
+                '',
+                sprintf(
+                    ' [ERROR] File "%s" not found or not readable. ',
+                    $this->arguments['file']
+                ),
+                ''
+            ]);
             return false;
         }
         if (array_key_exists('sets', $this->arguments)) {
             $sets = $this->em->getSets();
             $invalidSets = array_diff($this->arguments['sets'], $sets->getKeys());
             if (count($invalidSets) !== 0) {
-                $output->writeln(
-                    messages: [
-                        '',
-                        sprintf(
-                            format: ' [ERROR] Sets "%s" are not supported. ',
-                            values: implode('", "', $invalidSets)
-                        ),
-                        ''
-                    ]
-                );
+                $output->writeln([
+                    '',
+                    sprintf(
+                        ' [ERROR] Sets "%s" are not supported. ',
+                        implode('", "', $invalidSets)
+                    ),
+                    ''
+                ]);
                 return false;
             }
         }

diff --git a/src/Console/AddRecordCommand.php b/src/Console/AddRecordCommand.php
@@ -84,30 +84,27 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if (!$this->validateInput(input: $input, output: $output)) {
+        if (!$this->validateInput($input, $output)) {
             return Command::INVALID;
         }
 
         /** @var Format */
-        $format = $this->em->getMetadataFormat(prefix: $this->arguments['format']);
-        $content = file_get_contents(filename: $this->arguments['file']) ?: '';
+        $format = $this->em->getMetadataFormat($this->arguments['format']);
+        $content = file_get_contents($this->arguments['file']) ?: '';
 
-        $record = new Record(
-            identifier: $this->arguments['identifier'],
-            format: $format
-        );
+        $record = new Record($this->arguments['identifier'], $format);
         if (trim($content) !== '') {
-            $record->setContent(data: $content);
+            $record->setContent($content);
         }
         if (array_key_exists('sets', $this->arguments)) {
             foreach ($this->arguments['sets'] as $set) {
                 /** @var Set */
-                $setSpec = $this->em->getSet(spec: $set);
-                $record->addSet(set: $setSpec);
+                $setSpec = $this->em->getSet($set);
+                $record->addSet($setSpec);
             }
         }
 
-        $this->em->addOrUpdate(entity: $record);
+        $this->em->addOrUpdate($record);
         $this->em->pruneOrphanedSets();
 
         $this->clearResultCache();

diff --git a/src/Console/AddSetCommand.php b/src/Console/AddSetCommand.php
@@ -81,20 +81,16 @@ function (): array {
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        if (!$this->validateInput(input: $input, output: $output)) {
+        if (!$this->validateInput($input, $output)) {
             return Command::INVALID;
         }
 
         if (array_key_exists('file', $this->arguments)) {
-            $description = file_get_contents(filename: $this->arguments['file']) ?: null;
+            $description = file_get_contents($this->arguments['file']) ?: null;
         }
 
-        $set = new Set(
-            spec: $this->arguments['setSpec'],
-            name: $this->arguments['setName'],
-            description: $description ?? null
-        );
-        $this->em->addOrUpdate(entity: $set);
+        $set = new Set($this->arguments['setSpec'], $this->arguments['setName'], $description ?? null);
+        $this->em->addOrUpdate($set);
 
         return Command::SUCCESS;
     }