Merge branch '5.1' into 5.2

.github/workflows/Build.yml

@@ -22,7 +22,7 @@ jobs:
     name: PHPUnit Tests - ${{ matrix.php_versions }} - ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup PHP, with composer and extensions
       uses: shivammathur/setup-php@v2
@@ -53,7 +53,7 @@ jobs:
 
     - name: Upload coverage to Codecov
       if: github.event_name != 'schedule'
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./_meta/coverage.xml

.github/workflows/PHPStan.yml

@@ -19,7 +19,7 @@ jobs:
     name: PHPStan - ${{ matrix.php_versions }}
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Setup PHP, with composer and extensions
       uses: shivammathur/setup-php@v2
@@ -30,4 +30,4 @@ jobs:
       run: composer install --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
     - name: Run PHPStan
-      run: vendor/bin/phpstan analyse src/ tests/
+      run: vendor/bin/phpstan analyse

.gitignore

@@ -6,10 +6,8 @@ _meta
 .phpunit.cache
 .phpdoc
 
-# OS & Editors
+# OS
 .DS_Store
-*.komodoproject
-.vscode
 
 # Testing artifacts
 tests/Cache/store

.vscode/extensions.json

@@ -0,0 +1,9 @@
+{
+    "recommendations": [
+        "junstyle.php-cs-fixer",
+        "xdebug.php-debug",
+        "neilbrayfield.php-docblocker",
+        "bmewburn.vscode-intelephense-client",
+        "sanderronde.phpstan-vscode"
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,14 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Listen for XDebug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "cSpell.words": [
+        "undot"
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,36 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "PHPUnit",
+            "type": "shell",
+            "options": {
+                "env": {
+                    "XDEBUG_CONFIG": "idekey=VSCODE"
+                }
+            },
+            "command": "printf '\\33c\\e[3J' && vendor/bin/phpunit --stop-on-failure  --stop-on-error",
+            // "command": "printf '\\33c\\e[3J' && vendor/bin/phpunit --filter FormValidationArrayAdapterTest --stop-on-failure --stop-on-error --display-warnings",
+
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        },
+        {
+            "label": "PHP CS Fixer",
+            "type": "shell",
+            "command": "vendor/bin/php-cs-fixer fix",
+            "problemMatcher": []
+        },
+        {
+            "label": "PHPStan",
+            "type": "shell",
+            "command": "vendor/bin/phpstan analyse",
+            "problemMatcher": []
+        }
+    ]
+}

CHANGELOG.md

@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [5.2.0](https://github.com/userfrosting/framework/compare/5.0.1...5.2.0)
 
+## [5.1.2](https://github.com/userfrosting/framework/compare/5.1.1...5.1.2)
+- Add Slim [type hinting](https://github.com/slimphp/Slim/releases/tag/4.14.0) & bump minimum slim version
+
+## [5.1.1](https://github.com/userfrosting/framework/compare/5.1.0...5.1.1)
+- Fix InputArray in Fortress (See https://github.com/userfrosting/UserFrosting/issues/1251)
+- Update PHPStan config
+- Add VSCode config
+
 ## [5.1.0](https://github.com/userfrosting/framework/compare/5.0.0...5.1.0)
 - Removed Assets
 - Drop PHP 8.1 support, add PHP 8.3 support

README.md

@@ -32,6 +32,6 @@ See main [UserFrosting Documentation](https://learn.userfrosting.com) and docume
 
 ## [License](LICENSE.md)
 
-## [Style Guide](STYLE-GUIDE.md)
+## [Style Guide](https://github.com/userfrosting/.github/blob/main/.github/STYLE-GUIDE.md)
 
 ## [Testing](RUNNING_TESTS.md)

composer.json

@@ -36,7 +36,7 @@
         "vlucas/valitron": "^1.2.3",
         "predis/predis": "^2.2",
         "twig/twig": "^3.3",
-        "slim/slim": "^4.7",
+        "slim/slim": "^4.14",
         "slim/psr7": "^1.4",
         "php-di/php-di": "^7.0",
         "php-di/slim-bridge": "^3.2",

phpstan.neon

@@ -1,5 +1,8 @@
 parameters:
   level: 8
+  paths:
+    - src
+    - tests
   reportUnmatchedIgnoredErrors: false
   ignoreErrors:
     - '#Dynamic call to static method PHPUnit\\Framework\\.*#'

src/Cache/Driver/TaggableFileStore.php

@@ -74,7 +74,7 @@ public function path($key)
             $hash = $key;
             $parts = [];
         } else {
-            $parts = array_slice(str_split($hash = sha1((string) $key), 2), 0, 2);
+            $parts = array_slice(str_split($hash = sha1($key), 2), 0, 2);
         }
 
         return $this->directory . $this->ds . $folder . (count($parts) > 0 ? implode($this->ds, $parts) . $this->ds : '') . $hash;