diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index da9500c98394..4559e4bc8fd7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.2, 7.3, 7.4] + php: [7.2, 7.3, 7.4, 8.0] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} @@ -47,8 +47,15 @@ jobs: - name: Setup Memcached uses: niden/actions-memcached@v7 + - name: Setup problem matchers + run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + uses: nick-invision/retry@v1 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Execute tests run: vendor/bin/phpunit --verbose @@ -62,14 +69,8 @@ jobs: strategy: fail-fast: true matrix: - php: [7.2, 7.3, 7.4] - include: - - php: 7.2 - stability: prefer-lowest - - php: 7.3 - stability: prefer-stable - - php: 7.4 - stability: prefer-stable + php: [7.2, 7.3, 7.4, 8.0] + stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows @@ -89,10 +90,16 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp tools: composer:v2 coverage: none - ini-values: memory_limit=512M + + - name: Setup problem matchers + run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + uses: nick-invision/retry@v1 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Execute tests run: vendor/bin/phpunit --verbose diff --git a/composer.json b/composer.json index 570b055dca6d..8a164cf352b1 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", @@ -84,7 +84,7 @@ "league/flysystem-cached-adapter": "^1.0", "mockery/mockery": "~1.3.3|^1.4.2", "moontoast/math": "^1.1", - "orchestra/testbench-core": "^4.0", + "orchestra/testbench-core": "^4.8", "pda/pheanstalk": "^4.0", "phpunit/phpunit": "^7.5.15|^8.4|^9.3.3", "predis/predis": "^1.1.1", @@ -122,7 +122,7 @@ "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "filp/whoops": "Required for friendly error pages in development (^2.8).", - "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).", + "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0.1).", "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", diff --git a/src/Illuminate/Auth/composer.json b/src/Illuminate/Auth/composer.json index 1221b8d3c7ce..dacafaaac9ec 100644 --- a/src/Illuminate/Auth/composer.json +++ b/src/Illuminate/Auth/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/http": "^6.0", "illuminate/queue": "^6.0", diff --git a/src/Illuminate/Broadcasting/composer.json b/src/Illuminate/Broadcasting/composer.json index d0d5f8f2e872..9dbf39485991 100644 --- a/src/Illuminate/Broadcasting/composer.json +++ b/src/Illuminate/Broadcasting/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "psr/log": "^1.0", "illuminate/bus": "^6.0", diff --git a/src/Illuminate/Bus/composer.json b/src/Illuminate/Bus/composer.json index 6cbbfb076ce7..e133ae3304c1 100644 --- a/src/Illuminate/Bus/composer.json +++ b/src/Illuminate/Bus/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/pipeline": "^6.0", "illuminate/support": "^6.0" diff --git a/src/Illuminate/Cache/composer.json b/src/Illuminate/Cache/composer.json index c11e7bf80488..01331f1b0f2a 100755 --- a/src/Illuminate/Cache/composer.json +++ b/src/Illuminate/Cache/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0" }, diff --git a/src/Illuminate/Config/composer.json b/src/Illuminate/Config/composer.json index ea0196e68172..3704ba14fd7e 100755 --- a/src/Illuminate/Config/composer.json +++ b/src/Illuminate/Config/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0" }, diff --git a/src/Illuminate/Console/composer.json b/src/Illuminate/Console/composer.json index 1f4d546c6e88..8183ff829ad1 100755 --- a/src/Illuminate/Console/composer.json +++ b/src/Illuminate/Console/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0", "symfony/console": "^4.3.4", diff --git a/src/Illuminate/Container/composer.json b/src/Illuminate/Container/composer.json index 2842c33525dc..bb1a7e397abf 100755 --- a/src/Illuminate/Container/composer.json +++ b/src/Illuminate/Container/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "psr/container": "^1.0" }, diff --git a/src/Illuminate/Contracts/composer.json b/src/Illuminate/Contracts/composer.json index 807085275739..c62efd954f5d 100644 --- a/src/Illuminate/Contracts/composer.json +++ b/src/Illuminate/Contracts/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "psr/container": "^1.0", "psr/simple-cache": "^1.0" }, diff --git a/src/Illuminate/Cookie/composer.json b/src/Illuminate/Cookie/composer.json index f76d145b1243..920d7fff18fc 100755 --- a/src/Illuminate/Cookie/composer.json +++ b/src/Illuminate/Cookie/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0", "symfony/http-foundation": "^4.3.4", diff --git a/src/Illuminate/Database/composer.json b/src/Illuminate/Database/composer.json index 99380b080968..2d658fb0f5e8 100644 --- a/src/Illuminate/Database/composer.json +++ b/src/Illuminate/Database/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/container": "^6.0", "illuminate/contracts": "^6.0", @@ -33,7 +33,7 @@ }, "suggest": { "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", - "fzaninotto/faker": "Required to use the eloquent factory builder (^1.9.1).", + "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "illuminate/console": "Required to use the database commands (^6.0).", "illuminate/events": "Required to use the observers with Eloquent (^6.0).", "illuminate/filesystem": "Required to use the migrations (^6.0).", diff --git a/src/Illuminate/Encryption/composer.json b/src/Illuminate/Encryption/composer.json index 7ea4768eac3e..cc0b3e3494f0 100644 --- a/src/Illuminate/Encryption/composer.json +++ b/src/Illuminate/Encryption/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", diff --git a/src/Illuminate/Events/composer.json b/src/Illuminate/Events/composer.json index aab0b9fbdcca..9dd481dc0eb1 100755 --- a/src/Illuminate/Events/composer.json +++ b/src/Illuminate/Events/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/container": "^6.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0" diff --git a/src/Illuminate/Filesystem/composer.json b/src/Illuminate/Filesystem/composer.json index b6529e1dd102..b9c23cea1f62 100644 --- a/src/Illuminate/Filesystem/composer.json +++ b/src/Illuminate/Filesystem/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0", "symfony/finder": "^4.3.4" diff --git a/src/Illuminate/Hashing/composer.json b/src/Illuminate/Hashing/composer.json index f2f2cea01393..80d47dde6a03 100755 --- a/src/Illuminate/Hashing/composer.json +++ b/src/Illuminate/Hashing/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0" }, diff --git a/src/Illuminate/Http/composer.json b/src/Illuminate/Http/composer.json index 423ffb8a2e13..c53a73b94dfb 100755 --- a/src/Illuminate/Http/composer.json +++ b/src/Illuminate/Http/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/session": "^6.0", "illuminate/support": "^6.0", diff --git a/src/Illuminate/Log/composer.json b/src/Illuminate/Log/composer.json index 63670f05fdfd..3bd21d0a91b1 100755 --- a/src/Illuminate/Log/composer.json +++ b/src/Illuminate/Log/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0", "monolog/monolog": "^1.12|^2.0" diff --git a/src/Illuminate/Mail/composer.json b/src/Illuminate/Mail/composer.json index 8b9dd46bb47e..7bff13f3beb9 100755 --- a/src/Illuminate/Mail/composer.json +++ b/src/Illuminate/Mail/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/container": "^6.0", "illuminate/contracts": "^6.0", diff --git a/src/Illuminate/Notifications/composer.json b/src/Illuminate/Notifications/composer.json index 1411ec9b50ab..8a96b664690e 100644 --- a/src/Illuminate/Notifications/composer.json +++ b/src/Illuminate/Notifications/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/broadcasting": "^6.0", "illuminate/bus": "^6.0", "illuminate/container": "^6.0", diff --git a/src/Illuminate/Pagination/composer.json b/src/Illuminate/Pagination/composer.json index 098b7ca1c5cc..c8f966516656 100755 --- a/src/Illuminate/Pagination/composer.json +++ b/src/Illuminate/Pagination/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0" diff --git a/src/Illuminate/Pipeline/composer.json b/src/Illuminate/Pipeline/composer.json index c5577e7236da..1d6a6b931d50 100644 --- a/src/Illuminate/Pipeline/composer.json +++ b/src/Illuminate/Pipeline/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0", "symfony/debug": "^4.3.4" diff --git a/src/Illuminate/Queue/composer.json b/src/Illuminate/Queue/composer.json index e2c166f84eb3..b6e9238c3c0a 100644 --- a/src/Illuminate/Queue/composer.json +++ b/src/Illuminate/Queue/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/console": "^6.0", "illuminate/container": "^6.0", diff --git a/src/Illuminate/Redis/composer.json b/src/Illuminate/Redis/composer.json index ec09a66e22e9..efb357a093e0 100755 --- a/src/Illuminate/Redis/composer.json +++ b/src/Illuminate/Redis/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "illuminate/contracts": "^6.0", "illuminate/support": "^6.0" }, diff --git a/src/Illuminate/Routing/composer.json b/src/Illuminate/Routing/composer.json index af7ca941adcb..026fc96518cb 100644 --- a/src/Illuminate/Routing/composer.json +++ b/src/Illuminate/Routing/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/container": "^6.0", "illuminate/contracts": "^6.0", diff --git a/src/Illuminate/Session/composer.json b/src/Illuminate/Session/composer.json index d30397efc661..5707e43836c2 100755 --- a/src/Illuminate/Session/composer.json +++ b/src/Illuminate/Session/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/contracts": "^6.0", "illuminate/filesystem": "^6.0", diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 28831ef4bf10..850963e52f58 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "ext-mbstring": "*", "doctrine/inflector": "^1.4|^2.0", diff --git a/src/Illuminate/Translation/composer.json b/src/Illuminate/Translation/composer.json index fdf284eb563d..598fdde394fa 100755 --- a/src/Illuminate/Translation/composer.json +++ b/src/Illuminate/Translation/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/contracts": "^6.0", "illuminate/filesystem": "^6.0", diff --git a/src/Illuminate/Validation/composer.json b/src/Illuminate/Validation/composer.json index 3eb468a9dc92..a879fd6817a5 100755 --- a/src/Illuminate/Validation/composer.json +++ b/src/Illuminate/Validation/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "egulias/email-validator": "^2.1.10", "illuminate/container": "^6.0", diff --git a/src/Illuminate/View/composer.json b/src/Illuminate/View/composer.json index 04d291b96a2c..2ec1e83219b8 100644 --- a/src/Illuminate/View/composer.json +++ b/src/Illuminate/View/composer.json @@ -14,7 +14,7 @@ } ], "require": { - "php": "^7.2.5", + "php": "^7.2.5|^8.0", "ext-json": "*", "illuminate/container": "^6.0", "illuminate/contracts": "^6.0",