Merge pull request #62 from laravel-shift/l12-compatibility

Laravel 12.x Compatibility

Author: tonysm

.github/workflows/cs.yml

@@ -1,35 +1,25 @@
-name: Check & Fix Styling
+name: Fix PHP code style issues
 
-on: [push]
+on:
+  push:
+    paths:
+      - '**.php'
+
+permissions:
+  contents: write
 
 jobs:
-  php-cs-fixer:
+  php-code-styling:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php: [ '8.2' ]
-        dependency-version: [ prefer-stable ]
-
-    name: PHP ${{ matrix.php }} - ${{ matrix.dependency-version }} - ${{ matrix.parallel }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.head_ref }}
 
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          tools: composer:v2
-          coverage: none
-
-      - name: Install PHP dependencies
-        run: composer update --${{ matrix.dependency-version }} --no-interaction --no-progress
-
-      - name: Run Pint
-        run: php vendor/bin/pint -v
+      - name: Fix PHP code style issues
+        uses: aglipanci/[email protected]
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.github/workflows/run-tests.yml

@@ -12,16 +12,22 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest]
-        php: [8.2]
-        laravel: ['10.*', '11.*']
+        php: [8.2, 8.3, 8.4]
+        laravel: [10.*, 11.*, 12.*]
         stability: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
-            testbench: 8.*
-            workbench: 8.*
+            testbench: '^8.34'
+            workbench: '^8.17'
           - laravel: 11.*
             testbench: 9.*
             workbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
+            workbench: 10.*
+        exclude:
+          - php: 8.4
+            laravel: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -16,17 +16,17 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/contracts": "^10.0|^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.9.2",
         "tonysm/globalid-laravel": "^1.1"
     },
     "require-dev": {
         "laravel/pint": "^1.10",
         "livewire/livewire": "^3.4",
         "nunomaduro/collision": "^6.0|^8.0",
-        "orchestra/testbench": "^8.21|^9.0",
-        "orchestra/workbench": "^8.0|^9.0",
-        "phpunit/phpunit": "^10.5",
+        "orchestra/testbench": "^8.21|^9.0|^10.0",
+        "orchestra/workbench": "^8.0|^9.0|^10.0",
+        "phpunit/phpunit": "^10.5|^11.5.3",
         "symfony/html-sanitizer": "^7.0"
     },
     "autoload": {
@@ -63,8 +63,7 @@
             "@php vendor/bin/testbench serve"
         ],
         "lint": [
-            "@php vendor/bin/pint",
-            "@php vendor/bin/phpstan analyse"
+            "@php vendor/bin/pint"
         ]
     },
     "config": {

tests/ContentTest.php

@@ -14,7 +14,7 @@
 
 class ContentTest extends TestCase
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
 

tests/RemoteFileTest.php

@@ -33,7 +33,7 @@ public static function filesizesProvider()
      *
      * @dataProvider filesizesProvider
      */
-    public function converts_file_size_to_human_readable($bytes, $humanReadable)
+    public function converts_file_size_to_human_readable($bytes, $human)
     {
         $file = new RemoteFile([
             'url' => 'not-relevant',
@@ -43,6 +43,6 @@ public function converts_file_size_to_human_readable($bytes, $humanReadable)
             'filesize' => $bytes,
         ]);
 
-        $this->assertEquals($humanReadable, $file->filesizeForHumans());
+        $this->assertEquals($human, $file->filesizeForHumans());
     }
 }

tests/TestCase.php

@@ -13,7 +13,7 @@ class TestCase extends Orchestra
     use RefreshDatabase;
     use WithWorkbench;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();