From 64f3d149cb847ece61bbc67f3b4da3b528b74bd2 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 14 Feb 2023 16:50:55 +0100 Subject: [PATCH] Prepare v11 --- .github/workflows/tests.yml | 2 +- CHANGELOG.md | 60 ++----------------------------------- composer.json | 7 +++-- 3 files changed, 9 insertions(+), 60 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8e6e9cd5b..8d0f112cf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: true matrix: - php: [8.1, 8.2] + php: [8.2] name: PHP ${{ matrix.php }} diff --git a/CHANGELOG.md b/CHANGELOG.md index ede5c685a..c0a6a19b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,61 +1,7 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v10.2.2...10.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v11.0.0...master) -## [v10.2.2](https://github.com/laravel/laravel/compare/v10.2.1...v10.2.2) - 2023-05-23 +## [v11.0.0 (2023-02-17)](https://github.com/laravel/laravel/compare/v10.0.2...v11.0.0) -- Add lock path by @taylorotwell in https://github.com/laravel/laravel/commit/a6bfbc7f90e33fd6cae3cb23f106c9689858c3b5 - -## [v10.2.1](https://github.com/laravel/laravel/compare/v10.2.0...v10.2.1) - 2023-05-12 - -- Add hashed cast to user password by @emargareten in https://github.com/laravel/laravel/pull/6171 -- Bring back pusher cluster config option by @jesseleite in https://github.com/laravel/laravel/pull/6174 - -## [v10.2.0](https://github.com/laravel/laravel/compare/v10.1.1...v10.2.0) - 2023-05-05 - -- Update welcome.blade.php by @aymanatmeh in https://github.com/laravel/laravel/pull/6163 -- Sets package.json type to module by @timacdonald in https://github.com/laravel/laravel/pull/6090 -- Add url support for mail config by @chu121su12 in https://github.com/laravel/laravel/pull/6170 - -## [v10.1.1](https://github.com/laravel/laravel/compare/v10.0.7...v10.1.1) - 2023-04-18 - -- Fix laravel/framework constraints for Default Service Providers by @Jubeki in https://github.com/laravel/laravel/pull/6160 - -## [v10.0.7](https://github.com/laravel/laravel/compare/v10.1.0...v10.0.7) - 2023-04-14 - -- Adds `phpunit/phpunit@10.1` support by @nunomaduro in https://github.com/laravel/laravel/pull/6155 - -## [v10.1.0](https://github.com/laravel/laravel/compare/v10.0.6...v10.1.0) - 2023-04-15 - -- Minor skeleton slimming by @taylorotwell in https://github.com/laravel/laravel/pull/6159 - -## [v10.0.6](https://github.com/laravel/laravel/compare/v10.0.5...v10.0.6) - 2023-04-05 - -- Add job batching options to Queue configuration file by @AnOlsen in https://github.com/laravel/laravel/pull/6149 - -## [v10.0.5](https://github.com/laravel/laravel/compare/v10.0.4...v10.0.5) - 2023-03-08 - -- Add replace_placeholders to log channels by @alanpoulain in https://github.com/laravel/laravel/pull/6139 - -## [v10.0.4](https://github.com/laravel/laravel/compare/v10.0.3...v10.0.4) - 2023-02-27 - -- Fix typo by @izzudin96 in https://github.com/laravel/laravel/pull/6128 -- Specify facility in the syslog driver config by @nicolus in https://github.com/laravel/laravel/pull/6130 - -## [v10.0.3](https://github.com/laravel/laravel/compare/v10.0.2...v10.0.3) - 2023-02-21 - -- Remove redundant `@return` docblock in UserFactory by @datlechin in https://github.com/laravel/laravel/pull/6119 -- Reverts change in asset helper by @timacdonald in https://github.com/laravel/laravel/pull/6122 - -## [v10.0.2](https://github.com/laravel/laravel/compare/v10.0.1...v10.0.2) - 2023-02-16 - -- Remove unneeded call by @taylorotwell in https://github.com/laravel/laravel/commit/3986d4c54041fd27af36f96cf11bd79ce7b1ee4e - -## [v10.0.1](https://github.com/laravel/laravel/compare/v10.0.0...v10.0.1) - 2023-02-15 - -- Add PHPUnit result cache to gitignore by @itxshakil in https://github.com/laravel/laravel/pull/6105 -- Allow php-http/discovery as a composer plugin by @nicolas-grekas in https://github.com/laravel/laravel/pull/6106 - -## [v10.0.0 (2022-02-14)](https://github.com/laravel/laravel/compare/v9.5.2...v10.0.0) - -Laravel 10 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. +Laravel 11 includes a variety of changes to the application skeleton. Please consult the diff to see what's new. diff --git a/composer.json b/composer.json index e1fb4493d..6fb6d7c38 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "keywords": ["laravel", "framework"], "license": "MIT", "require": { - "php": "^8.1", + "php": "^8.2", "guzzlehttp/guzzle": "^7.2", - "laravel/framework": "^10.10", + "laravel/framework": "^11.0", "laravel/sanctum": "^3.2", "laravel/tinker": "^2.8" }, @@ -48,6 +48,9 @@ ] }, "extra": { + "branch-alias": { + "dev-master": "11.x-dev" + }, "laravel": { "dont-discover": [] }