Merge branch '5.x' into 4.x

.gitattributes

@@ -9,6 +9,7 @@
 /.php_cs export-ignore
 /.scrutinizer.yml export-ignore
 /.travis.yml export-ignore
+/canvas.yaml export-ignore
 /phpunit.xml export-ignore
 /sync.sh export-ignore
 /CHANGELOG-*.md export-ignore

.github/FUNDING.yml

@@ -1,12 +1,12 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: crynobone
+patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
+liberapay: crynobone
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 custom: ["https://paypal.me/crynobone"]

.github/workflows/coveralls.yml

@@ -13,7 +13,7 @@ jobs:
         os:
           - "ubuntu-latest"
         php:
-          - "7.2"
+          - "7.3"
         dependencies:
           - "locked"
         laravel:
@@ -40,6 +40,9 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist"
 
+      - name: Prepare Testbench
+        run: composer run prepare
+
       - name: Execute tests
         run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 

.github/workflows/tests.yml

@@ -7,53 +7,6 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  tests-on-phpunit-7:
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      matrix:
-        os:
-          - "ubuntu-latest"
-          - "windows-latest"
-        php:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-        phpunit:
-          - "^7.5.15"
-        dependencies:
-          - "locked"
-          - "lowest"
-          - "highest"
-        experimental:
-          - false
-
-    name: PHP${{ matrix.php }} with PHPUnit${{ matrix.phpunit }} on ${{ matrix.os }} (${{ matrix.dependencies }})
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v1
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, intl, fileinfo
-          coverage: none
-
-      - name: Install PHPUnit ${{ matrix.phpunit }}
-        run: |
-          composer require "phpunit/phpunit:${{ matrix.phpunit }}" --no-interaction --no-update
-
-      - name: Install dependencies
-        uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: "${{ matrix.dependencies }}"
-          composer-options: "--prefer-dist --no-cache"
-
-      - name: Execute tests
-        run: vendor/bin/phpunit
-
   tests-on-phpunit-8:
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
@@ -63,7 +16,6 @@ jobs:
           - "ubuntu-latest"
           - "windows-latest"
         php:
-          - "7.2"
           - "7.3"
           - "7.4"
         phpunit:
@@ -98,6 +50,9 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"
 
+      - name: Prepare Testbench
+        run: composer run prepare
+
       - name: Execute tests
         run: vendor/bin/phpunit
 
@@ -145,5 +100,8 @@ jobs:
           dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"
 
+      - name: Prepare Testbench
+        run: composer run prepare
+
       - name: Execute tests
         run: vendor/bin/phpunit

CHANGELOG-4.x.md

@@ -1,4 +1,4 @@
-# Change for 4.x
+# Changes for 4.x
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
@@ -71,7 +71,7 @@ Released: 2020-12-09
     - `Orchestra\Testbench\Concerns\HandlesAnnotations`.
     - `Orchestra\Testbench\Concerns\HandlesDatabases`.
     - `Orchestra\Testbench\Concerns\HandlesRoutes`.
-* Use `defineRoutes()` to group dedicated tests routing.
+* Added `defineRoutes()` to group dedicated tests routing.
 
  ## 4.10.0