Devs

.php-cs-fixer.dist.php

@@ -44,5 +44,5 @@
     'Blitz PHP framework',
     'Dimitri Sitchet Tomkeu',
     'devcode.dst@gmail.com',
-    2022
+    2022,
 );

composer.json

@@ -23,8 +23,9 @@
         "blitz-php/annotations": "^1.0",
         "blitz-php/autoloader": "^1.1",
         "blitz-php/cache": "^1.3 <1.4",
+		"blitz-php/contracts": "^1.13 <1.14",
         "blitz-php/filesystem": "^1.0",
-        "blitz-php/session": "^1.0",
+        "blitz-php/session": "^1.4 <1.5",
         "blitz-php/traits": "^1.6 <1.7",
         "blitz-php/translator": "^0.1",
         "dflydev/dot-access-data": "^3.0.1",

rector.php

@@ -62,7 +62,7 @@
     ->withCache(
         // Github action cache or local
         is_dir('/tmp') ? '/tmp/rector' : null,
-        FileCacheStorage::class
+        FileCacheStorage::class,
     )
     // paths to refactor; solid alternative to CLI arguments
     ->withPaths([

src/Cli/Commands/Generators/Command.php

@@ -99,7 +99,7 @@ protected function prepare(string $class): string
             $class,
             ['{group}', '{command}'],
             [$group, $command],
-            ['type' => $type]
+            ['type' => $type],
         );
     }
 }

src/Cli/Commands/Generators/Component.php

@@ -81,7 +81,7 @@ public function execute(array $params)
         $viewName = preg_replace(
             '/([a-z][a-z0-9_\/\\\\]+)(-component)$/i',
             '$1',
-            $viewName
+            $viewName,
         ) ?? $viewName;
         $namespace = substr($className, 0, strrpos($className, '\\') + 1);
 

src/Cli/Commands/Generators/Controller.php

@@ -121,7 +121,7 @@ protected function prepare(string $class): string
             [
                 'type'      => $rest,
                 'invokable' => $this->option('invokable'),
-            ]
+            ],
         );
     }
 }

src/Cli/Commands/Generators/Middleware.php

@@ -89,7 +89,7 @@ protected function prepare(string $class): string
             $class,
             [],
             [],
-            ['standard' => $standard]
+            ['standard' => $standard],
         );
     }
 }

src/Cli/Commands/Routes/AutoRouteCollector.php

@@ -29,7 +29,7 @@ public function __construct(
         private readonly string $defaultMethod,
         private readonly array $httpMethods,
         private readonly array $protectedControllers,
-        private readonly string $prefix = ''
+        private readonly string $prefix = '',
     ) {
     }
 
@@ -53,7 +53,7 @@ public function get(): array
             $routes = $reader->read(
                 $class,
                 $this->defaultController,
-                $this->defaultMethod
+                $this->defaultMethod,
             );
 
             if ($routes === []) {

src/Cli/Commands/Routes/ControllerMethodReader.php

@@ -63,7 +63,7 @@ public function read(string $class, string $defaultController = 'Home', string $
                             $classname,
                             $methodName,
                             $httpVerb,
-                            $method
+                            $method,
                         );
 
                         if ($routeForDefaultController !== []) {
@@ -170,7 +170,7 @@ private function getRouteForDefaultController(
         string $classname,
         string $methodName,
         string $httpVerb,
-        ReflectionMethod $method
+        ReflectionMethod $method,
     ): array {
         $output = [];
 

src/Cli/Commands/Routes/Routes.php

@@ -136,7 +136,7 @@ protected function collectRoutes(RouteCollection $collection): array
                 $collection->getDefaultController(),
                 $collection->getDefaultMethod(),
                 $methods,
-                $collection->getRegisteredControllers('*')
+                $collection->getRegisteredControllers('*'),
             );
 
             $autoRoutes = $autoRouteCollector->get();
@@ -150,7 +150,7 @@ protected function collectRoutes(RouteCollection $collection): array
                         $collection->getDefaultMethod(),
                         $methods,
                         $collection->getRegisteredControllers('*'),
-                        $uri
+                        $uri,
                     );
 
                     $autoRoutes = [...$autoRoutes, ...$autoRouteCollector->get()];
@@ -340,8 +340,8 @@ protected function displayRoutes(array $routes, int $total): void
                     $this->write(
                         $this->color->line(
                             sprintf('%s⇂ %s', str_repeat(' ', $maxMethodLength), $middleware),
-                            ['fg' => Color::fg256(60)]
-                        )
+                            ['fg' => Color::fg256(60)],
+                        ),
                     )->eol();
                 }
             }
@@ -370,7 +370,7 @@ protected function displayStats(Collection $routes, int $total): void
                 $this->justify(
                     $method,
                     (string) $routes->where('method', $method)->count(),
-                    $options
+                    $options,
                 );
             }
         }

src/Cli/Commands/Server/rewrite.php

@@ -25,7 +25,7 @@
 }
 
 $uri = urldecode(
-    parse_url('https://blitz-php.com' . $_SERVER['REQUEST_URI'], PHP_URL_PATH) ?? ''
+    parse_url('https://blitz-php.com' . $_SERVER['REQUEST_URI'], PHP_URL_PATH) ?? '',
 );
 
 // Toutes les requêtes sont gérées par index.php fichier.

src/Cli/Commands/Translation/TranslationsFinder.php

@@ -68,7 +68,7 @@
             if (! in_array($optionLocale, config('app.supported_locales'), true)) {
                 $this->error(
                     $this->color->error('"' . $optionLocale . '" n\'est pas supporté. Les langues supportées sont: '
-                    . implode(', ', config('app.supported_locales')))
+                    . implode(', ', config('app.supported_locales'))),
                 );
 
                 return EXIT_USER_INPUT;
@@ -114,7 +114,7 @@
         [
             'foundLanguageKeys' => $foundLanguageKeys,
             'badLanguageKeys'   => $badLanguageKeys,
-            'countFiles'        => $countFiles
+            'countFiles'        => $countFiles,
         ] = $this->findLanguageKeysInFiles($files);
 
         ksort($foundLanguageKeys);
@@ -134,8 +134,8 @@
                 @mkdir($dir, 0777, true);
             }
 
             $languageDiff = Arr::diffRecursive($foundLanguageKeys[$langFileName], $languageStoredKeys);
             $countNewKeys += Arr::countRecursive($languageDiff);
 
             if ($this->showNew) {
                 $tableRows = array_merge($this->arrayToTableRows($langFileName, $languageDiff), $tableRows);

src/Cli/Commands/Utilities/About.php

@@ -92,7 +92,7 @@ public function execute(array $params)
                             ->map(static fn ($value, $key) => [$key, $value])
                             ->values()
                             ->all();
-                    })->flatten(1)
+                    })->flatten(1),
             )
             ->sortBy(static function ($data, $key): int {
                 $index = array_search($key, ['Environnement', 'Cache', 'Gestionnaires'], true);

src/Cli/Commands/Utilities/ConfigCheck.php

@@ -115,7 +115,7 @@ public function execute(array $params)
                 $this->write($this->getKintDump($others));
             } else {
                 $this->write(
-                    $this->color->line($this->getVarDump($others), ['fg' => Color::CYAN])
+                    $this->color->line($this->getVarDump($others), ['fg' => Color::CYAN]),
                 );
             }
         }
@@ -153,7 +153,7 @@ private function getVarDump(array $config): string
         return preg_replace(
             '!.*Commands/Utilities/ConfigCheck.php.*\n!u',
             '',
-            $output
+            $output,
         );
     }
 }

src/Cli/Commands/Utilities/Optimize.php

@@ -97,7 +97,7 @@ private function enableCaching(): void
             [
                 "'config_cache_enabled' => false,"  => "'config_cache_enabled' => true,",
                 "'locator_cache_enabled' => false," => "'locator_cache_enabled' => true,",
-            ]
+            ],
         );
 
         if ($result) {

src/Cli/Console/Console.php

@@ -182,7 +182,7 @@ protected function files(LocatorInterface $locator): array
     {
         $files = array_merge(
             $locator->listFiles('Commands/'), // Commandes de l'application ou des fournisseurs
-            $locator->listFiles('Cli/Commands/') // Commandes internes du framework
+            $locator->listFiles('Cli/Commands/'), // Commandes internes du framework
         );
 
         return array_unique($files);
@@ -244,7 +244,7 @@ private function addCommand(string $className, ?Logger $logger = null)
             $instance->name,
             $instance->description,
             false,
-            $this
+            $this,
         );
 
         // Defini le groupe auquel appartient la commande

src/Config/Config.php

@@ -297,7 +297,7 @@ private function loadRegistrar()
             throw new ConfigException(
                 'Pendant la découverte automatique des Registrars,'
                 . ' "' . static::class . '" a été re-éxecuté.'
-                . ' "' . clean_path(static::$registrarFile) . '" doit avoir un mauvais code.'
+                . ' "' . clean_path(static::$registrarFile) . '" doit avoir un mauvais code.',
             );
         }
 

src/Container/Services.php

@@ -205,7 +205,7 @@ public static function cookie(bool $shared = true): CookieManagerInterface
             $config->domain ?: '',
             $config->secure ?: false,
             $config->httponly ?: true,
-            $config->samesite ?: 'Lax'
+            $config->samesite ?: 'Lax',
         );
     }
 

src/Debug/Logger.php

@@ -197,7 +197,7 @@ private function pushFileHandler(stdClass $options): void
         }
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, ['json', 'line', 'scalar', 'normalizer'], $options->format)
+            $this->setFormatter($handler, ['json', 'line', 'scalar', 'normalizer'], $options->format),
         );
     }
 
@@ -211,7 +211,7 @@ private function pushErrorHandler(stdClass $options): void
         $handler = new ErrorLogHandler($options->type ?: ErrorLogHandler::OPERATING_SYSTEM, $options->level ?: LogLevel::DEBUG);
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, ['json', 'line'], $options->format)
+            $this->setFormatter($handler, ['json', 'line'], $options->format),
         );
     }
 
@@ -225,7 +225,7 @@ private function pushEmailHandler(stdClass $options): void
         $handler = new NativeMailerHandler($options->to, $options->subject, $options->from, $options->level ?: LogLevel::ERROR);
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, ['html', 'json', 'line'], $options->format)
+            $this->setFormatter($handler, ['html', 'json', 'line'], $options->format),
         );
     }
 
@@ -234,7 +234,7 @@ private function pushTelegramHandler(stdClass $options): void
         $handler = new TelegramBotHandler($options->api_key, $options->channel, $options->level ?: LogLevel::DEBUG);
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, [], $options->format)
+            $this->setFormatter($handler, [], $options->format),
         );
     }
 
@@ -248,7 +248,7 @@ private function pushChromeHandler(stdClass $options): void
         $handler = new ChromePHPHandler($options->level ?: LogLevel::DEBUG);
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, [], $options->format)
+            $this->setFormatter($handler, [], $options->format),
         );
     }
 
@@ -262,7 +262,7 @@ private function pushFirebugHandler(stdClass $options): void
         $handler = new FirePHPHandler();
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, [], $options->format)
+            $this->setFormatter($handler, [], $options->format),
         );
     }
 
@@ -276,7 +276,7 @@ private function pushBrowserHandler(stdClass $options): void
         $handler = new BrowserConsoleHandler();
 
         $this->monolog->pushHandler(
-            $this->setFormatter($handler, [], $options->format)
+            $this->setFormatter($handler, [], $options->format),
         );
     }
 

src/Debug/Toolbar.php

@@ -67,7 +67,7 @@ public function __construct(?stdClass $config = null)
             if (! class_exists($collector)) {
                 logger()->critical(
                     'Le collecteur de la barre d\'outils n\'existe pas (' . $collector . ').'
-                    . ' Veuillez vérifier $collectors dans le fichier app/Config/toolbar.php.'
+                    . ' Veuillez vérifier $collectors dans le fichier app/Config/toolbar.php.',
                 );
 
                 continue;
@@ -402,7 +402,7 @@ public function prepare(array $stats, ?ServerRequestInterface $request = null, ?
             $stats['startTime'],
             $stats['totalTime'],
             $request,
-            $response
+            $response,
         );
 
         // Mise à jour vers microtime() pour que nous puissions obtenir l'historique
@@ -515,7 +515,7 @@ protected function format($debugbar_time, string $data, string $format = 'html')
             $history = new HistoryCollector();
             $history->setFiles(
                 $debugbarTime[0],
-                $this->config->max_history
+                $this->config->max_history,
             );
 
             $data['collectors'][] = $history->getAsArray();

src/Debug/Toolbar/Collectors/RoutesCollector.php

@@ -102,7 +102,7 @@ public function display(): array
                     ' <empty> | default: '
                     . var_export(
                         $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null,
-                        true
+                        true,
                     ),
             ];
         }

src/Debug/Toolbar/Views/toolbar.tpl.php

@@ -1,21 +1,25 @@
 <?php
+
+use BlitzPHP\Debug\Toolbar;
+use BlitzPHP\View\Parser;
+
 /**
- * @var BlitzPHP\Debug\Toolbar $this
- * @var int                    $totalTime
- * @var int                    $totalMemory
- * @var string                 $url
- * @var string                 $method
- * @var bool                   $isAJAX
- * @var int                    $startTime
- * @var int                    $totalTime
- * @var int                    $totalMemory
- * @var float                  $segmentDuration
- * @var int                    $segmentCount
- * @var string                 $blitzVersion
- * @var array                  $collectors
- * @var array                  $vars
- * @var array                  $styles
- * @var BlitzPHP\View\Parser   $parser
+ * @var Toolbar $this
+ * @var int     $totalTime
+ * @var int     $totalMemory
+ * @var string  $url
+ * @var string  $method
+ * @var bool    $isAJAX
+ * @var int     $startTime
+ * @var int     $totalTime
+ * @var int     $totalMemory
+ * @var float   $segmentDuration
+ * @var int     $segmentCount
+ * @var string  $blitzVersion
+ * @var array   $collectors
+ * @var array   $vars
+ * @var array   $styles
+ * @var Parser  $parser
  */
 ?>
 <style type="text/css">/* BlitzPHP - Debug bar ======== Credit: CodeIgniter - https://codeigniter.com */<?= preg_replace('#[\r\n\t ]+#', ' ', file_get_contents(__DIR__ . '/toolbar.css')) ?></style>

src/Enums/Method.php

@@ -111,7 +111,7 @@ public static function fromName(string $name): string
             'post'    => self::POST,
             'put'     => self::PUT,
             'trace'   => self::TRACE,
-            default   => throw new InvalidArgumentException('Nom de methode inconnu')
+            default   => throw new InvalidArgumentException('Nom de methode inconnu'),
         };
     }
 

src/Event/EventDiscover.php

@@ -31,7 +31,7 @@ public function discove()
     {
         $files = array_merge(
             $this->locator->listFiles('Events/'), // @deprecated just use for compatibility
-            $this->locator->listFiles('Listeners/')
+            $this->locator->listFiles('Listeners/'),
         );
 
         foreach ($files as $file) {