Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.x] Full PHP 8.0 Support #33388

Merged
merged 3 commits into from Oct 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 19 additions & 12 deletions .github/workflows/tests.yml
Expand Up @@ -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 }}
Expand All @@ -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
driesvints marked this conversation as resolved.
Show resolved Hide resolved
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress

- name: Execute tests
run: vendor/bin/phpunit --verbose
Expand All @@ -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

Expand All @@ -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
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -15,7 +15,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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).",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Auth/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Broadcasting/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Bus/composer.json
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cache/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Config/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Console/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Container/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"illuminate/contracts": "^6.0",
"psr/container": "^1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Contracts/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"psr/container": "^1.0",
"psr/simple-cache": "^1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Cookie/composer.json
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Database/composer.json
Expand Up @@ -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",
Expand All @@ -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).",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Encryption/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Events/composer.json
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Filesystem/composer.json
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Hashing/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Http/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Log/composer.json
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Mail/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Notifications/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pagination/composer.json
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Pipeline/composer.json
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Queue/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Redis/composer.json
Expand Up @@ -14,7 +14,7 @@
}
],
"require": {
"php": "^7.2.5",
"php": "^7.2.5|^8.0",
"illuminate/contracts": "^6.0",
"illuminate/support": "^6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Routing/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Session/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Translation/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/composer.json
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/View/composer.json
Expand Up @@ -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",
Expand Down