Merge pull request #11 from samsonasik/refactor-enable-rector-and-phpstan-level-6

refactor: enable Rector for code analyze and increase PHPStan to level 6

Author: yllumi

.gitattributes

@@ -2,3 +2,4 @@
 /.gitattributes export-ignore
 /.php-cs-fixer.dist.php export-ignore
 /phpstan.neon export-ignore
+/rector.php export-ignore

.github/workflows/tests_build.yaml

@@ -30,6 +30,8 @@ jobs:
       - name: "CS Check"
         run: "vendor/bin/php-cs-fixer fix --dry-run --diff"
       - name: "Code analyze"
-        run: "vendor/bin/phpstan"
+        run: |
+          vendor/bin/phpstan
+          vendor/bin/rector process --dry-run
       - name: "Run test suite"
         run: "vendor/bin/phpunit"

composer.json

@@ -27,6 +27,7 @@
     "require-dev": {
         "codeigniter/coding-standard": "^1.8",
         "phpunit/phpunit": "^10.5",
-        "phpstan/phpstan": "^2.1"
+        "phpstan/phpstan": "^2.1",
+        "rector/rector": "^2.0"
     }
 }

phpstan.neon

@@ -2,7 +2,7 @@ parameters:
     paths:
         - src
         - tests
-    level: 5
+    level: 6
     bootstrapFiles:
         - vendor/codeigniter4/framework/system/Test/bootstrap.php
 

rector.php

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withPaths([
+        __DIR__ . '/src',
+        __DIR__ . '/tests',
+    ])
+    ->withPhpSets()
+    ->withPreparedSets(deadCode: true, codeQuality: true)
+    ->withImportNames();

src/Commands/PageCreateCommand.php

@@ -20,9 +20,12 @@ class PageCreateCommand extends BaseCommand
     protected $name        = 'page:create'; // Nama command
     protected $description = 'Create a new page router';
 
+    /**
+     * @param list<string> $params
+     */
     public function run(array $params)
     {
-        if (empty($params)) {
+        if ($params === []) {
             CLI::error('Please specify the page name.');
 
             return;
@@ -67,6 +70,10 @@ public function run(array $params)
 
     /**
      * Create a file from a template, replacing placeholders.
+     *
+     * @param array<string, string> $replacements
+     *
+     * @return void
      */
     private function createFileFromTemplate(string $templateFile, string $targetFile, array $replacements)
     {

src/Config/Services.php

@@ -19,6 +19,9 @@
 
 class Services extends BaseService
 {
+    /**
+     * @return PageRouter
+     */
     public static function router(?RouteCollectionInterface $routes = null, ?Request $request = null, bool $getShared = true)
     {
         if ($getShared) {

src/Helpers/pageview_helper.php

@@ -13,6 +13,10 @@
 use Config\View;
 
 if (! function_exists('pageView')) {
+    /**
+     * @param array<string, mixed> $data
+     * @param array<string, mixed> $options
+     */
     function pageView(string $name, array $data = [], array $options = []): string
     {
         $config       = config(View::class);
@@ -45,13 +49,11 @@ function asset_url(string $filePath): string
         $fullFilePath = FCPATH . $filePath;
 
         // Check if file exists
-        if (file_exists($fullFilePath)) {
+        $version = file_exists($fullFilePath)
             // Add file modification time as version
-            $version = filemtime($fullFilePath);
-        } else {
+            ? filemtime($fullFilePath)
             // Fallback version (current timestamp if file doesn't exist)
-            $version = time();
-        }
+            : time();
 
         // Generate full URL with version
         return base_url($filePath) . '?v=' . $version;

src/PageRouter.php

@@ -17,16 +17,13 @@
 use CodeIgniter\Exceptions\PageNotFoundException;
 use CodeIgniter\HTTP\Exceptions\BadRequestException;
 use CodeIgniter\HTTP\ResponseInterface;
-use CodeIgniter\Router\RouteCollection;
 use CodeIgniter\Router\Router;
 
 /**
  * Page based router.
  *
  * This class extends the CodeIgniter's Router class
  * to handle page based routes.
- *
- * @property-read RouteCollection $collection
  */
 class PageRouter extends Router
 {
@@ -71,7 +68,7 @@ public function pageBasedRoute(string $uri)
         $uri       = trim($uri, '/');
 
         // Set default page for root uri
-        if (empty($uri)) {
+        if ($uri === '' || $uri === '0') {
             $uri = config('App')->defaultPage ?? 'home';
         }
 
@@ -83,7 +80,7 @@ public function pageBasedRoute(string $uri)
 
         $uriSegments = explode('/', $uri);
 
-        while (count($uriSegments) > 0) {
+        while ($uriSegments !== []) {
             $folderPath = $pagesPath . '/' . str_replace('/', DIRECTORY_SEPARATOR, implode('/', $uriSegments));
             if (is_dir($folderPath) && file_exists($folderPath . '/' . $controllerName . '.php')) {
                 $uri                 = implode('/', $uriSegments);

tests/Helpers/PageViewTest.php

@@ -17,7 +17,7 @@
 
 final class PageViewTest extends TestCase
 {
-    public function testPageView()
+    public function testPageView(): void
     {
         helper('Yllumi\Ci4Pages\Helpers\pageview');