Merge branch 'master' into patch-69

Author: erikn69

.github/release-drafter.yml

@@ -0,0 +1,4 @@
+template: |
+  ## What’s Changed
+
+  $CHANGES

.github/workflows/fix-cs.yml

@@ -0,0 +1,41 @@
+name: Release Drafter
+
+on:
+  push:
+    # branches to consider in the event; optional, defaults to all
+    branches:
+      - master
+  # pull_request event is required only for autolabeler
+  pull_request:
+    # Only following types are handled by the action, but one can default to all as well
+    types: [opened, reopened, synchronize]
+  # pull_request_target event is required for autolabeler to support PRs from forks
+  # pull_request_target:
+  #   types: [opened, reopened, synchronize]
+
+permissions:
+  contents: read
+
+jobs:
+  update_release_draft:
+    permissions:
+      # write permission is required to create a github release
+      contents: write
+      # write permission is required for autolabeler
+      # otherwise, read permission is required at least
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      # (Optional) GitHub Enterprise requires GHE_HOST variable set
+      #- name: Set GHE_HOST
+      #  run: |
+      #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
+
+      # Drafts your next Release notes as Pull Requests are merged into "master"
+      - uses: release-drafter/release-drafter@v6
+        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
+        # with:
+        #   config-name: my-config.yml
+        #   disable-autolabeler: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-drafter.yml

@@ -11,53 +11,6 @@ on:
         - cron: '0 0 * * *'
 
 jobs:
-    php-lumen-integration-tests:
-        runs-on: ubuntu-latest
-        timeout-minutes: 15
-        env:
-            COMPOSER_NO_INTERACTION: 1
-        strategy:
-            matrix:
-                php: [8.3, 8.2, 8.1, 8.0]
-                lumen: [10.*, 9.*]
-                exclude:
-                  - lumen: 10.*
-                    php: 8.0
-        name: P${{ matrix.php }} - Lumen${{ matrix.lumen }}
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v3
-              with:
-                  path: src
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php }}
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install dependencies
-              run: |
-                  composer create-project --prefer-dist laravel/lumen:${{ matrix.lumen }} --stability=dev --no-progress sample
-                  cd sample
-                  composer config minimum-stability dev
-                  composer update  --prefer-stable --prefer-dist --no-progress
-            - name: Add package from source
-              run: |
-                  cd sample
-                  sed -e 's|"type": "project",|&\n"repositories": [ { "type": "path", "url": "../src" } ],|' -i composer.json
-                  composer require --dev "barryvdh/laravel-debugbar:*"
-            - name: Insert service provider
-              run: sed -e 's|// \$app->register(App\\\Providers\\\EventServiceProvider::class);|&\n$app->register(\\Barryvdh\\Debugbar\\LumenServiceProvider::class);|' -i sample/bootstrap/app.php
-
-            - name: Execute clear run
-              run: |
-                  cd sample
-                  php artisan debugbar:clear
-            - name: Check file count in logs
-              run: |
-                if [ `ls -1q "sample/storage/logs/" | wc -l` -gt 0 ];then exit 1;fi
     php-laravel-integration-tests:
         runs-on: ubuntu-latest
         timeout-minutes: 15
@@ -66,19 +19,19 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                php: [8.3, 8.2, 8.1, 8.0]
-                laravel: [11.*, 10.*, 9.*]
+                php: [8.4, 8.3, 8.2, 8.1]
+                laravel: [12.*, 11.*, 10.*, 9.*]
                 exclude:
-                  - laravel: 10.*
-                    php: 8.0
-                  - laravel: 11.*
-                    php: 8.0
+                  - laravel: 12.*
+                    php: 8.1
                   - laravel: 11.*
                     php: 8.1
+                  - laravel: 9.*
+                    php: 8.4
         name: P${{ matrix.php }} - Laravel${{ matrix.laravel }}
         steps:
             - name: Checkout code
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   path: src
 
@@ -103,7 +56,8 @@ jobs:
             - name: Execute generate run
               run: |
                   cd sample
+                  mkdir -p "storage/debugbar/" && touch "storage/debugbar/foo.json"
                   php artisan debugbar:clear
             - name: Check file count in logs
               run: |
-                if [ `ls -1q "sample/storage/logs/" | wc -l` -gt 0 ];then exit 1;fi
+                if [ `ls -1q "sample/storage/debugbar/" | wc -l` -gt 0 ];then exit 1;fi

.github/workflows/run-integration-tests.yml

@@ -20,22 +20,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [8.3, 8.2, 8.1, 8.0]
-        laravel: [^11, ^10, ^9]
+        php: [8.4, 8.3, 8.2, 8.1]
+        laravel: [^12, ^11, ^10, ^9]
         dependency-version: [prefer-stable]
         exclude:
-          - laravel: ^10
-            php: 8.0
-          - laravel: ^11
-            php: 8.0
+          - laravel: ^12
+            php: 8.1
           - laravel: ^11
             php: 8.1
+          - laravel: ^9
+            php: 8.4
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -57,7 +57,7 @@ jobs:
       run: composer test
 
     - name: Upload Failed Screenshots
-      uses: actions/upload-artifact@v2-preview
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: screenshots

.github/workflows/run-tests.yml

@@ -0,0 +1,34 @@
+name: "Update Changelog"
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push the 
+      # updated CHANGELOG back to the repository.
+      # https://github.blog/changelog/2023-02-02-github-actions-updating-the-default-github_token-permissions-to-read-only/
+      contents: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.release.target_commitish }}
+
+      - name: Update Changelog
+        uses: stefanzweifel/changelog-updater-action@v1
+        with:
+          latest-version: ${{ github.event.release.tag_name }}
+          release-notes: ${{ github.event.release.body }}
+
+      - name: Commit updated CHANGELOG
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          branch: ${{ github.event.release.target_commitish }}
+          commit_message: Update CHANGELOG
+          file_pattern: CHANGELOG.md

.github/workflows/update-changelog.yaml

@@ -4,5 +4,5 @@
 composer.phar
 composer.lock
 .DS_Store
-.phpunit.result.cache
+.phpunit*
 /tests/Browser