Merge remote-tracking branch 'upstream/develop' into develop

Signed-off-by: Mior Muhammad Zaki <[email protected]>

.gitattributes

@@ -13,5 +13,8 @@
 .gitignore export-ignore
 .styleci.yml export-ignore
 CHANGELOG.md export-ignore
+phpstan.neon.dist export-ignore
 phpunit.xml.dist export-ignore
+phpunit9.xml.dist export-ignore
+testbench.yaml export-ignore
 UPGRADE.md export-ignore

.github/ISSUE_TEMPLATE/1_Bug_report.yml

@@ -0,0 +1,54 @@
+name: Bug Report
+description: "Report a general library issue."
+body:
+  - type: markdown
+    attributes:
+      value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
+  - type: input
+    attributes:
+      label: Dusk Version
+      description: Provide the Dusk version that you are using.
+      placeholder: 7.1.0
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Laravel Version
+      description: Provide the Laravel version that you are using.
+      placeholder: 10.4.1
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: PHP Version
+      description: Provide the PHP version that you are using.
+      placeholder: 8.1.4
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: PHPUnit Version
+      description: Provide the PHPUnit version that you are using.
+      placeholder: 10.0.1
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Database Driver & Version
+      description: If applicable, provide the database driver and version you are using.
+      placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Description
+      description: Provide a detailed description of the issue you are facing.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
+    validations:
+      required: true
+

.github/workflows/browser-tests.yml

@@ -0,0 +1,71 @@
+name: browser-tests
+
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  browser-tests:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: ['8.0', 8.1, 8.2, 8.3]
+        laravel: [9, 10]
+        phpunit: [9, 10]
+        exclude:
+          - php: '8.0'
+            laravel: 10
+          - php: '8.0'
+            phpunit: 10
+          - php: 8.3
+            laravel: 9
+          - laravel: 9
+            phpunit: 10
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - PHPUnit ${{ matrix.phpunit }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          ini-values: error_reporting=E_ALL
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+           composer require "illuminate/contracts:^${{ matrix.laravel }}" "phpunit/phpunit:^${{ matrix.phpunit }}" --dev --no-update
+           composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Upgrade Chrome Driver
+        run: php vendor/bin/testbench dusk:chrome-driver --detect
+
+      - name: Start Chrome Driver
+        run: ./vendor/laravel/dusk/bin/chromedriver-linux &
+
+      - name: Run Laravel Server
+        run: php vendor/bin/testbench serve --no-reload &
+
+      - name: Execute tests
+        if: matrix.phpunit == '9'
+        run: php vendor/bin/phpunit --no-coverage --no-configuration --dont-report-useless-tests --bootstrap vendor/autoload.php --color tests/Browser
+        env:
+          APP_URL: http://127.0.0.1:8000
+
+      - name: Execute tests
+        run: php vendor/bin/phpunit -c phpunit.dusk.xml.dist
+        if: matrix.phpunit != '9'
+        env:
+          APP_URL: http://127.0.0.1:8000

.github/workflows/issues.yml

@@ -0,0 +1,12 @@
+name: issues
+
+on:
+  issues:
+    types: [labeled]
+
+permissions:
+  issues: write
+
+jobs:
+  help-wanted:
+    uses: laravel/.github/.github/workflows/issues.yml@main

.github/workflows/pull-requests.yml

@@ -0,0 +1,12 @@
+name: pull requests
+
+on:
+  pull_request_target:
+    types: [opened]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  uneditable:
+    uses: laravel/.github/.github/workflows/pull-requests.yml@main

.github/workflows/static-analysis.yml

@@ -0,0 +1,41 @@
+name: static analysis
+
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  tests:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: true
+
+    name: Static Analysis
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-fields/retry@v2
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+      - name: Execute type checking
+        run: vendor/bin/phpstan

.github/workflows/tests.yml

@@ -2,17 +2,21 @@ name: tests
 
 on:
   push:
+    branches:
+      - master
+      - '*.x'
   pull_request:
   schedule:
     - cron: '0 0 * * *'
 
 jobs:
   tests:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< HEAD
         php: [7.3, 7.4, 8.0]
         laravel: [^8.0, ^9.0]
         phpunit: [^9.0, ^10.0]
@@ -21,25 +25,96 @@ jobs:
             phpunit: ^10.0
           - php: 7.3
             laravel: ^9.0
+=======
+        php: ['8.0', 8.1, 8.2, 8.3]
+        laravel: [9, 10]
+        phpunit: [9, 10]
+        exclude:
+          - php: '8.0'
+            laravel: 10
+          - php: '8.0'
+            phpunit: 10
+          - php: 8.3
+            laravel: 9
+          - laravel: 9
+            phpunit: 10
+>>>>>>> upstream/develop
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - PHPUnit ${{ matrix.phpunit }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: dom, curl, libxml, mbstring, zip
+          ini-values: error_reporting=E_ALL
           tools: composer:v2
           coverage: none
 
       - name: Install dependencies
         run: |
-           composer require "illuminate/contracts:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-update
+           composer require "illuminate/contracts:^${{ matrix.laravel }}" "phpunit/phpunit:^${{ matrix.phpunit }}" --dev --no-update
            composer update --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
-        run: vendor/bin/phpunit --verbose
+        if: matrix.phpunit == '9'
+        run: vendor/bin/phpunit -c phpunit9.xml.dist --verbose
+
+      - name: Execute tests
+        if: matrix.phpunit != '9'
+        run: vendor/bin/phpunit -c phpunit.xml.dist
+
+  stub-tests:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [8.2]
+        laravel: [9, 10]
+
+    name: Test Stubs PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip
+          ini-values: error_reporting=E_ALL
+          tools: composer:v2
+          coverage: none
+
+      - name: Setup Laravel
+        run: |
+          composer create-project laravel/laravel:^${{ matrix.laravel }} .
+          composer require laravel/dusk:@dev --no-interaction --no-update
+          composer config repositories.dusk '{"type": "path", "url": "dusk"}' --file composer.json
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          path: 'dusk'
+
+      - name: Install Dusk
+        run: |
+          composer update "laravel/dusk" --prefer-dist --no-interaction --no-progress -W
+          php artisan dusk:install
+
+      - name: Update Chrome Driver
+        run: php artisan dusk:chrome-driver --detect
+
+      - name: Start Chrome Driver
+        run: ./vendor/laravel/dusk/bin/chromedriver-linux &
+
+      - name: Run Laravel Server
+        run: php artisan serve --no-reload &
+
+      - name: Run Dusk Tests
+        run: php artisan dusk --without-tty
+        env:
+          APP_URL: http://127.0.0.1:8000

.github/workflows/update-changelog.yml

@@ -0,0 +1,9 @@
+name: update changelog
+
+on:
+  release:
+    types: [released]
+
+jobs:
+  update:
+    uses: laravel/.github/.github/workflows/update-changelog.yml@main

.gitignore

@@ -1,4 +1,5 @@
 /vendor
 composer.lock
 /phpunit.xml
+.phpunit.cache/*
 .phpunit.result.cache