Merge pull request #22 from enflow/laravel11

Upgrade for Laravel 11
enflow · Mar 15, 2024 · 55a812a · 55a812a
2 parents 54bd87e + b2770c1
commit 55a812a
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 49 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,50 +1,47 @@
 name: run-tests
 
 on:
-    push:
-        branches: [master]
-    pull_request:
-        branches: [master]
+  push:
+  pull_request:
 
 jobs:
-    test:
-        runs-on: ${{ matrix.os }}
-        strategy:
-            fail-fast: true
-            matrix:
-                os: [ubuntu-latest]
-                php: [8.2]
-                laravel: [10.*]
-                stability: [prefer-lowest, prefer-stable]
-                include:
-                    - laravel: 10.*
-                      testbench: 8.*
-
-        name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
-                  coverage: none
-
-            - name: Setup problem matchers
-              run: |
-                  echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-                  echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-            - name: Install dependencies
-              run: |
-                  composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-                  composer update --${{ matrix.stability }} --prefer-dist --no-interaction
-
-            - name: List Installed Dependencies
-              run: composer show -D
-
-            - name: Execute tests
-              run: vendor/bin/phpunit
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ubuntu-latest]
+        php: [ 8.3, 8.2 ]
+        laravel: [ '10.*', '11.*' ]
+        stability: [prefer-lowest, prefer-stable]
+        include:
+          - laravel: 11.*
+            testbench: 9.*
+          - laravel: 10.*
+            testbench: 8.*
+
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
+          coverage: none
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: Execute tests
+        run: vendor/bin/phpunit
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "orchestra/testbench": "^8.0",
-        "phpunit/phpunit": "^10.1",
+        "orchestra/testbench": "^8.0|^9.0",
+        "phpunit/phpunit": "^10.5|^11.0",
         "rcrowe/twigbridge": "^0.14.1"
     },
     "suggest": {

diff --git a/tests/RenderTest.php b/tests/RenderTest.php
@@ -14,7 +14,6 @@ public function test_name_type_component_correctly_renders()
         $rendered = view('name-type-test')->render();
 
         $this->assertStringContainsString('[wire\:loading]', $rendered); // Styles
-        $this->assertStringContainsString('script src="/livewire/livewire.js', $rendered); // Scripts
         $this->assertStringContainsString('increment', $rendered); // Counter component
         $this->assertStringContainsString('Lorem ipsum!', $rendered); // Counter component title
     }
@@ -26,7 +25,6 @@ public function test_string_type_component_correctly_renders()
         $rendered = view('string-type-test')->render();
 
         $this->assertStringContainsString('[wire\:loading]', $rendered); // Styles
-        $this->assertStringContainsString('script src="/livewire/livewire.js', $rendered); // Scripts
         $this->assertStringContainsString('increment', $rendered); // Counter component
         $this->assertStringContainsString('Lorem ipsum!', $rendered); // Counter component title
     }