Skip to content

Commit 95a4387

Browse files
authored
Merge pull request #2141 from hydephp/laravel-11
[2.x] Upgrade to Laravel 11
2 parents 4e68451 + a0c9cad commit 95a4387

File tree

22 files changed

+2645
-1371
lines changed

22 files changed

+2645
-1371
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: shivammathur/setup-php@v2
1414
with:
15-
php-version: "8.1"
15+
php-version: "8.2"
1616
extensions: fileinfo
1717

1818
- uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
os: [ubuntu-latest, macos-latest, windows-latest]
77-
php: [8.1, 8.2, 8.3]
77+
php: [8.2, 8.3, 8.4]
7878
runs-on: ${{ matrix.os }}
7979

8080
steps:
@@ -161,7 +161,7 @@ jobs:
161161
steps:
162162
- uses: shivammathur/setup-php@v2
163163
with:
164-
php-version: "8.1"
164+
php-version: "8.2"
165165
coverage: xdebug
166166
extensions: fileinfo
167167
- uses: actions/checkout@v4
@@ -255,7 +255,7 @@ jobs:
255255
- uses: actions/checkout@v4
256256
- uses: shivammathur/setup-php@v2
257257
with:
258-
php-version: "8.1"
258+
php-version: "8.2"
259259

260260
- name: Cache Composer packages
261261
id: composer-cache
@@ -297,7 +297,7 @@ jobs:
297297
- uses: actions/checkout@v4
298298
- uses: shivammathur/setup-php@v2
299299
with:
300-
php-version: "8.1"
300+
php-version: "8.2"
301301

302302
- name: Cache Composer packages
303303
id: composer-cache
@@ -342,7 +342,7 @@ jobs:
342342
- uses: actions/checkout@v4
343343
- uses: shivammathur/setup-php@v2
344344
with:
345-
php-version: "8.1"
345+
php-version: "8.2"
346346

347347
- name: Cache Composer packages
348348
id: composer-cache
@@ -509,7 +509,7 @@ jobs:
509509
steps:
510510
- uses: shivammathur/setup-php@v2
511511
with:
512-
php-version: "8.1"
512+
php-version: "8.2"
513513
- uses: actions/checkout@v4
514514

515515
- name: Download static analysis tools
@@ -529,7 +529,7 @@ jobs:
529529
steps:
530530
- uses: shivammathur/setup-php@v2
531531
with:
532-
php-version: "8.1"
532+
php-version: "8.2"
533533
- uses: actions/checkout@v4
534534

535535
- name: Install Composer Dependencies
@@ -547,7 +547,7 @@ jobs:
547547
steps:
548548
- uses: shivammathur/setup-php@v2
549549
with:
550-
php-version: "8.1"
550+
php-version: "8.2"
551551
- uses: actions/checkout@v4
552552

553553
- name: Install Composer Dependencies

.github/workflows/coverage-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: shivammathur/setup-php@v2
1111
with:
12-
php-version: "8.1"
12+
php-version: "8.2"
1313
coverage: xdebug
1414
extensions: fileinfo
1515
- uses: actions/checkout@v4

.github/workflows/matrix-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [ubuntu-latest, windows-latest, macos-latest]
22-
php: [8.1, 8.2, 8.3]
22+
php: [8.2, 8.3, 8.4]
2323
runs-on: ${{ matrix.os }}
2424

2525
steps:

.idea/develop.iml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/php.xml

Lines changed: 20 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/phpunit.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

RELEASE_NOTES.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ This serves two purposes:
1111

1212
### Added
1313

14+
- Added support for PHP 8.4.
1415
- You can now specify sidebar item priorities by adding a numeric prefix to doc umentation page source file names in https://github.com/hydephp/develop/pull/1709
1516
- Added support for resolving dynamic links to source files in Markdown documents in https://github.com/hydephp/develop/pull/1590
1617
- Added a new `\Hyde\Framework\Actions\PreBuildTasks\TransferMediaAssets` build task handle media assets transfers for site builds.
@@ -40,6 +41,7 @@ This serves two purposes:
4041

4142
### Changed
4243

44+
- **Breaking:** The minimum PHP version is now 8.2 instead of 8.1, but we now support PHP 8.3.
4345
- **Breaking:** The internals of the navigation system has been rewritten into a new Navigation API. This change is breaking for custom navigation implementations. For more information, see below.
4446
- **Breaking:** The `hyde.features` configuration format has changed to use Enums instead of static method calls. For more information, see below.
4547
- **Breaking:** Renamed class `DataCollections` to `DataCollection`. For more information, see below.
@@ -49,6 +51,11 @@ This serves two purposes:
4951
- **Breaking:** The custom navigation item configuration now uses array inputs instead of the previous format. For more information, see the upgrade guide below.
5052
- **Breaking:** Renamed the `hyde.navigation.subdirectories` configuration option to `hyde.navigation.subdirectory_display`.
5153
- **Breaking:** Renamed the `hyde.enable_cache_busting` configuration option to `hyde.cache_busting` in https://github.com/hydephp/develop/pull/1980
54+
- Dependency: Upgraded from Laravel 10 to Laravel 11
55+
- Dependency: Updated minimum PHP requirement to 8.2
56+
- Dependency: Updated Symfony/yaml to ^7.0
57+
- Dependency: Updated illuminate/support and illuminate/view to ^11.0
58+
- Dependency: Switched to forked version of the Torchlight client
5259
- Medium: The `route` function will now throw a `RouteNotFoundException` if the route does not exist in https://github.com/hydephp/develop/pull/1741
5360
- Minor: Navigation menu items are now no longer filtered by duplicates (meaning two items with the same label can now exist in the same menu) in https://github.com/hydephp/develop/pull/1573
5461
- Minor: Due to changes in the navigation system, it is possible that existing configuration files will need to be adjusted in order for menus to look the same (in terms of ordering etc.)
@@ -116,6 +123,7 @@ This serves two purposes:
116123

117124
### Removed
118125

126+
- Breaking: Removed support for PHP 8.1.
119127
- Breaking: Removed the build task `\Hyde\Framework\Actions\PostBuildTasks\GenerateSearch` (see upgrade guide below)
120128
- Breaking: Removed the deprecated `\Hyde\Framework\Services\BuildService::transferMediaAssets()` method (see upgrade guide below)
121129
- Breaking: Removed the `DocumentationPage::getTableOfContents()` method as we now use Blade to generate the table of contents in https://github.com/hydephp/develop/pull/2045

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
}
1616
],
1717
"require": {
18-
"php": "^8.1",
18+
"php": "^8.2",
1919
"hyde/framework": "*",
2020
"hyde/publications": "*",
2121
"hyde/ui-kit": "*",
22-
"laravel-zero/framework": "^10.0"
22+
"laravel-zero/framework": "^11.0"
2323
},
2424
"require-dev": {
2525
"desilva/psalm-coverage": "dev-master",

0 commit comments

Comments
 (0)