From 7048dc2194310a09332fae4d5326c4944cda1931 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 20 Jul 2023 08:24:19 -0500 Subject: [PATCH 1/7] PHP 8.3 builds --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index eddfa0848878..55e1bfbc7f81 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 }} @@ -106,7 +106,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 From b61a03c7cbb2c0e22673332b8e450e7844d6219c Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 20 Jul 2023 08:47:19 -0500 Subject: [PATCH 2/7] wip --- .github/workflows/tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 55e1bfbc7f81..147603acf2b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -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 From 642d33ceb5959a89aa02db6008258d53e5746f52 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 20 Jul 2023 08:51:34 -0500 Subject: [PATCH 3/7] wip --- .github/workflows/tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 147603acf2b2..43e0189c7873 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -158,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 From 687badb256219d1971cd361c7adc19661a02c8f9 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 26 Jul 2023 17:32:05 +0200 Subject: [PATCH 4/7] wip --- tests/Http/HttpTestingFileFactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Http/HttpTestingFileFactoryTest.php b/tests/Http/HttpTestingFileFactoryTest.php index a3c9a561e1ba..ca2d45a7f6df 100644 --- a/tests/Http/HttpTestingFileFactoryTest.php +++ b/tests/Http/HttpTestingFileFactoryTest.php @@ -95,7 +95,7 @@ public function testImageBmp() $imagePath = $image->getRealPath(); - $this->assertSame('image/x-ms-bmp', mime_content_type($imagePath)); + $this->assertSame('image/bmp', mime_content_type($imagePath)); $this->assertSame('image/bmp', getimagesize($imagePath)['mime']); } From 4eb4b9fa6a8bf8abcc0bbbefa7386837bbdef381 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 26 Jul 2023 17:37:18 +0200 Subject: [PATCH 5/7] wip --- tests/Http/HttpTestingFileFactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Http/HttpTestingFileFactoryTest.php b/tests/Http/HttpTestingFileFactoryTest.php index ca2d45a7f6df..a3c9a561e1ba 100644 --- a/tests/Http/HttpTestingFileFactoryTest.php +++ b/tests/Http/HttpTestingFileFactoryTest.php @@ -95,7 +95,7 @@ public function testImageBmp() $imagePath = $image->getRealPath(); - $this->assertSame('image/bmp', mime_content_type($imagePath)); + $this->assertSame('image/x-ms-bmp', mime_content_type($imagePath)); $this->assertSame('image/bmp', getimagesize($imagePath)['mime']); } From ea25b9d6dd5c00959fef4259ed10ac92f50b875f Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Wed, 26 Jul 2023 17:38:15 +0200 Subject: [PATCH 6/7] wip --- tests/Http/HttpTestingFileFactoryTest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/Http/HttpTestingFileFactoryTest.php b/tests/Http/HttpTestingFileFactoryTest.php index a3c9a561e1ba..c2824b6fe327 100644 --- a/tests/Http/HttpTestingFileFactoryTest.php +++ b/tests/Http/HttpTestingFileFactoryTest.php @@ -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)); + } } public function testCreateWithMimeType() From 4c69d1c9dfe5cd6b15558a0de60017edba9024b9 Mon Sep 17 00:00:00 2001 From: Julius Kiekbusch Date: Thu, 27 Jul 2023 16:10:11 +0200 Subject: [PATCH 7/7] Bump nesbot/carbon for PHP 8.3 Combatibility (#47860) --- composer.json | 2 +- src/Illuminate/Support/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 65c979d5532e..55c44d9a5b5a 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index d7f861d80af7..57c92e366238 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -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": {