Adding types to class properties, updating method signatures, and organizing use statements across multiple classes and packages.

rector.php

@@ -2,14 +2,21 @@
 
 declare(strict_types=1);
 
-use Rector\Config\RectorConfig;
+use Rector\TypeDeclaration\Rector\ClassMethod\StrictStringParamConcatRector;
 use Rector\Set\ValueObject\LevelSetList;
+use Rector\Set\ValueObject\SetList;
+use Rector\Config\RectorConfig;
 
 return RectorConfig::configure()
     ->withPaths([
         __DIR__ . '/src',
-        __DIR__ . '/tests',
     ])
     ->withSets([
         LevelSetList::UP_TO_PHP_80,
+        SetList::TYPE_DECLARATION,
+    ])
+    ->withSkip([
+        StrictStringParamConcatRector::class => [
+            __DIR__ . '/src/Database/Adapters/Idiorm/Statements/Criteria.php',
+        ],
     ]);

src/App/Adapters/AppAdapter.php

@@ -28,9 +28,6 @@ abstract class AppAdapter implements AppInterface
 {
     use AppTrait;
 
-    /**
-     * @var string
-     */
     private static string $baseDir;
 
     /**

src/App/Adapters/ConsoleAppAdapter.php

@@ -38,19 +38,10 @@ class ConsoleAppAdapter extends AppAdapter
 {
     use ConsoleAppTrait;
 
-    /**
-     * @var ArgvInput
-     */
     protected ArgvInput $input;
 
-    /**
-     * @var ConsoleOutput
-     */
     protected ConsoleOutput $output;
 
-    /**
-     * @var Application|null
-     */
     protected ?Application $application = null;
 
     public function __construct()
@@ -69,7 +60,6 @@ public function __construct()
     }
 
     /**
-     * @return int|null
      * @throws DiException
      * @throws EnvException
      * @throws BaseException

src/App/Adapters/WebAppAdapter.php

@@ -80,7 +80,6 @@ public function __construct()
 
     /**
      * Starts the web app
-     * @return int|null
      * @throws BaseException
      * @throws ConfigException
      * @throws CsrfException
@@ -147,7 +146,7 @@ public function start(): ?int
             }
 
             $dispatcher = new RouteDispatcher();
-            $dispatcher->dispatch($matchedRoute, $this->request, $this->response);
+            $dispatcher->dispatch($matchedRoute, $this->request);
             stop();
         } catch (StopExecutionException $exception) {
             $this->handleCors($this->response);

src/App/App.php

@@ -34,51 +34,31 @@ class App
      */
     public const CONSOLE = 'console';
 
-    /**
-     * @var string
-     */
-    private static $baseDir;
+    private static ?string $baseDir = null;
 
-    /**
-     * @var AppInterface
-     */
-    private $adapter;
+    private AppInterface $adapter;
 
-    /**
-     * @param AppInterface $adapter
-     */
     public function __construct(AppInterface $adapter)
     {
         $this->adapter = $adapter;
     }
 
-    /**
-     * @param string $baseDir
-     */
-    public static function setBaseDir(string $baseDir)
+    public static function setBaseDir(string $baseDir): void
     {
         self::$baseDir = $baseDir;
     }
 
-    /**
-     * @return string
-     */
     public static function getBaseDir(): string
     {
         return self::$baseDir;
     }
 
-    /**
-     * @return AppInterface
-     */
     public function getAdapter(): AppInterface
     {
         return $this->adapter;
     }
 
     /**
-     * @param string $method
-     * @param array|null $arguments
      * @return mixed
      * @throws BaseException
      */

src/App/Contracts/AppInterface.php

@@ -22,7 +22,6 @@ interface AppInterface
 {
     /**
      * Starts the app
-     * @return int|null
      */
     public function start(): ?int;
 }

src/App/Exceptions/AppException.php

@@ -24,9 +24,6 @@
  */
 class AppException extends BaseException
 {
-    /**
-     * @return AppException
-     */
     public static function missingAppKey(): self
     {
         return new self(

src/App/Exceptions/BaseException.php

@@ -25,18 +25,12 @@
  */
 abstract class BaseException extends Exception
 {
-    /**
-     * @param string $message
-     * @param int $code
-     */
     final public function __construct(string $message = '', int $code = 0)
     {
         parent::__construct($message, $code);
     }
 
     /**
-     * @param string $methodName
-     * @param string $className
      * @return static
      */
     public static function methodNotSupported(string $methodName, string $className)
@@ -48,7 +42,6 @@ public static function methodNotSupported(string $methodName, string $className)
     }
 
     /**
-     * @param string $name
      * @return static
      */
     public static function adapterNotSupported(string $name)
@@ -60,7 +53,6 @@ public static function adapterNotSupported(string $name)
     }
 
     /**
-     * @param string $name
      * @return static
      */
     public static function driverNotSupported(string $name)
@@ -72,7 +64,6 @@ public static function driverNotSupported(string $name)
     }
 
     /**
-     * @param string $name
      * @return static
      */
     public static function fileNotFound(string $name)
@@ -84,8 +75,6 @@ public static function fileNotFound(string $name)
     }
 
     /**
-     * @param string $subject
-     * @param string $name
      * @return static
      */
     public static function notFound(string $subject, string $name)
@@ -97,8 +86,6 @@ public static function notFound(string $subject, string $name)
     }
 
     /**
-     * @param string $instance
-     * @param string $name
      * @return static
      */
     public static function notInstanceOf(string $instance, string $name)
@@ -110,7 +97,6 @@ public static function notInstanceOf(string $instance, string $name)
     }
 
     /**
-     * @param string $name
      * @return static
      */
     public static function cantConnect(string $name)
@@ -122,10 +108,8 @@ public static function cantConnect(string $name)
     }
 
     /**
-     * @param string $name
      * @return static
      */
-
     public static function missingConfig(string $name)
     {
         return new static(
@@ -135,7 +119,6 @@ public static function missingConfig(string $name)
     }
 
     /**
-     * @param string $name
      * @return static
      */
     public static function requestMethodNotAvailable(string $name)

src/App/Exceptions/StopExecutionException.php

@@ -24,10 +24,6 @@
  */
 class StopExecutionException extends BaseException
 {
-    /**
-     * @param int|null $code
-     * @return StopExecutionException
-     */
     public static function executionTerminated(?int $code): self
     {
         return new self(

src/App/Factories/AppFactory.php

@@ -34,15 +34,9 @@ class AppFactory
         App::CONSOLE => ConsoleAppAdapter::class,
     ];
 
-    /**
-     * @var array
-     */
-    private static $instances = [];
+    private static array $instances = [];
 
     /**
-     * @param string $type
-     * @param string $baseDir
-     * @return App
      * @throws BaseException
      */
     public static function create(string $type, string $baseDir): App
@@ -55,19 +49,12 @@ public static function create(string $type, string $baseDir): App
         return self::$instances[$type];
     }
 
-    /**
-     * @param string $type
-     * @return void
-     */
-    public static function destroy(string $type)
+    public static function destroy(string $type): void
     {
         unset(self::$instances[$type]);
     }
 
     /**
-     * @param string $type
-     * @param string $baseDir
-     * @return App
      * @throws BaseException
      */
     private static function createInstance(string $type, string $baseDir): App

src/App/Helpers/app.php

@@ -16,14 +16,12 @@
 
 /**
  * Stops the app execution
- * @param Closure|null $closure
- * @param int|null $code
  * @return never
  * @throws StopExecutionException
  */
-function stop(?Closure $closure = null, ?int $code = 0)
+function stop(?Closure $closure = null, ?int $code = 0): void
 {
-    if ($closure instanceof \Closure) {
+    if ($closure instanceof Closure) {
         $closure();
     }
 

src/App/Helpers/dir.php

@@ -16,7 +16,6 @@
 
 /**
  * Gets base directory
- * @return string
  */
 function base_dir(): string
 {
@@ -25,7 +24,6 @@ function base_dir(): string
 
 /**
  * Gets the log directory
- * @return string
  */
 function logs_dir(): string
 {
@@ -34,7 +32,6 @@ function logs_dir(): string
 
 /**
  * Gets the framework directory
- * @return string
  */
 function framework_dir(): string
 {
@@ -43,8 +40,6 @@ function framework_dir(): string
 
 /**
  * Gets modules directory
- * @param string|null $moduleDir
- * @return string
  */
 function modules_dir(?string $moduleDir = null): string
 {
@@ -53,7 +48,6 @@ function modules_dir(?string $moduleDir = null): string
 
 /**
  * Gets public directory
- * @return string
  */
 function public_dir(): string
 {
@@ -62,7 +56,6 @@ function public_dir(): string
 
 /**
  * Gets uploads directory
- * @return string
  */
 function uploads_dir(): string
 {
@@ -71,7 +64,6 @@ function uploads_dir(): string
 
 /**
  * Gets assets directory
- * @return string
  */
 function assets_dir(): string
 {
@@ -80,7 +72,6 @@ function assets_dir(): string
 
 /**
  * Gets hooks directory
- * @return string
  */
 function hooks_dir(): string
 {
@@ -89,8 +80,6 @@ function hooks_dir(): string
 
 /**
  * Recursively deletes folder
- * @param string $dir
- * @return bool
  */
 function deleteDirectoryWithFiles(string $dir): bool
 {
@@ -110,8 +99,6 @@ function deleteDirectoryWithFiles(string $dir): bool
 
 /**
  * Gets directory classes
- * @param string $path
- * @return array
  */
 function get_directory_classes(string $path): array
 {