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.

Sign up for GitHub

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

[10.x] PHP 8.3 builds #47788

Merged
merged 7 commits into from
Jul 27, 2023
+27 −7
Merged

[10.x] PHP 8.3 builds #47788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7048dc2
PHP 8.3 builds
driesvints Jul 20, 2023
b61a03c
wip
driesvints Jul 20, 2023
642d33c
wip
driesvints Jul 20, 2023
687badb
wip
driesvints Jul 26, 2023
4eb4b9f
wip
driesvints Jul 26, 2023
ea25b9d
wip
driesvints Jul 26, 2023
4c69d1c
Bump nesbot/carbon for PHP 8.3 Combatibility (#47860)
Jubeki Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.2]
php: [8.1, 8.2, 8.3]
stability: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
Expand Down Expand Up @@ -81,6 +81,15 @@ jobs:
timeout_minutes: 5
max_attempts: 5
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
if: matrix.php <= 8.2

- name: Install dependencies
uses: nick-fields/retry@v2
with:
timeout_minutes: 5
max_attempts: 5
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --ignore-platform-req=php
if: matrix.php == 8.3

- name: Execute tests
run: vendor/bin/phpunit --display-deprecation
Expand All @@ -106,7 +115,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [8.1, 8.2]
php: [8.1, 8.2, 8.3]
stability: [prefer-lowest, prefer-stable]

name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
Expand Down Expand Up @@ -149,6 +158,15 @@ jobs:
timeout_minutes: 5
max_attempts: 5
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
if: matrix.php <= 8.2

- name: Install dependencies
uses: nick-fields/retry@v2
with:
timeout_minutes: 5
max_attempts: 5
command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --ignore-platform-req=php
if: matrix.php == 8.3

- name: Execute tests
run: vendor/bin/phpunit
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"league/commonmark": "^2.2.1",
"league/flysystem": "^3.8.0",
"monolog/monolog": "^3.0",
"nesbot/carbon": "^2.62.1",
"nesbot/carbon": "^2.67",
"nunomaduro/termwind": "^1.13",
"psr/container": "^1.1.1|^2.0.1",
"psr/log": "^1.0|^2.0|^3.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Illuminate/Support/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"illuminate/conditionable": "^10.0",
"illuminate/contracts": "^10.0",
"illuminate/macroable": "^10.0",
"nesbot/carbon": "^2.62.1",
"nesbot/carbon": "^2.67",
"voku/portable-ascii": "^2.0"
},
"conflict": {
Expand Down
8 changes: 5 additions & 3 deletions tests/Http/HttpTestingFileFactoryTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,11 @@ public function testImageBmp()

$imagePath = $image->getRealPath();

$this->assertSame('image/x-ms-bmp', mime_content_type($imagePath));

$this->assertSame('image/bmp', getimagesize($imagePath)['mime']);
if (version_compare(PHP_VERSION, '8.3.0-dev', '>=')) {
$this->assertSame('image/bmp', mime_content_type($imagePath));
} else {
$this->assertSame('image/x-ms-bmp', mime_content_type($imagePath));
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a behavioral change in PHP 8.3, I'm not sure if this is something the core team is aware of?

}

public function testCreateWithMimeType()
Expand Down