Merge pull request #18 from YuriiDorosh/fixes/hot_fixes

Fixes/hot fixes

.github/workflows/code-format-check.yml

@@ -28,9 +28,5 @@ jobs:
       - name: Run PHP_CodeSniffer
         run: php ./vendor/bin/phpcs --standard=./configs/phpcs.xml ./app
 
-      - name: Update Psalm Configuration for GitHub Actions
-        run: |
-          sed -i 's|../psalm/stubs.php|/home/runner/work/CodeIgniter4-template/CodeIgniter4-template/psalm/stubs.php|' ./configs/psalm.xml
-
       - name: Run Psalm
         run: php ./vendor/bin/psalm --config=./configs/psalm.xml

Makefile

@@ -105,4 +105,10 @@ check_format_from_composer:
 	composer run check_format
 
 psalm:
-	vendor/bin/psalm --config=./configs/psalm.xml
+	vendor/bin/psalm --config=./configs/psalm.xml
+
+psalm_clear_cache:
+	vendor/bin/psalm --clear-cache --config=./configs/psalm.xml
+
+psalm_forced_start:
+	make -B psalm

configs/psalm.xml

@@ -17,6 +17,6 @@
     </projectFiles>
 
     <stubs>
-        <file name="../psalm/stubs.php" />
+        <file name="../psalm/psalm.php" />
     </stubs>
 </psalm>

psalm/psalm.php

@@ -1,28 +1,20 @@
 <?php
 
 /**
- * Stub file for Psalm to recognize CodeIgniter framework functions and classes.
+ * Stub file for Psalm to recognize CodeIgniter framework functions and classes, including the global view function.
  */
 
-namespace Psalm\Internal\Codebase;
+// Remove the namespace declaration to declare the `view` function in the global namespace.
+// Remove the namespace Psalm\Internal\Codebase;
 
-class InternalCodebase
-{
-    /**
-     * Initializes framework functions for Psalm to recognize.
-     */
-    public function initFunctions(): void
-    {
-        // Fully qualify the namespace when checking for the function's existence
-        if (!function_exists(__NAMESPACE__ . '\\view')) {
-            /**
-             * Declare the stub function within the current namespace.
-             * @psalm-suppress UndefinedFunction
-             */
-            function view(string $view, array $options = []): string
-            {
-                return '';
-            }
-        }
-    }
+/**
+ * A stub for the global `view` function provided by CodeIgniter.
+ *
+ * @param string $view Name of the view file to load.
+ * @param array $options Data to pass to the view.
+ * @return string Rendered view content as a string.
+ */
+function view(string $view, array $options = []): string {
+    // Mock implementation for Psalm's benefit.
+    return '';
 }