From 7052b4f7080b3a6fb520c0c0d424c288a57b744c Mon Sep 17 00:00:00 2001 From: Markus Podar Date: Sun, 23 Jan 2022 17:38:31 +0100 Subject: [PATCH 1/3] Prepare 2.12 release ### Added - Add support for custom casts that using `Castable` [#1287 / binotaliu](https://github.com/barryvdh/laravel-ide-helper/pull/1287) - Added Laravel 9 support [#1297 / rcerljenko](https://github.com/barryvdh/laravel-ide-helper/pull/1297) --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 780da2b..6c6fe70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ All notable changes to this project will be documented in this file. -[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.11.0...master) +[Next release](https://github.com/barryvdh/laravel-ide-helper/compare/v2.12.0...master) -------------- + +2022-01-23, 2.12.0 +------------------ ### Added - Add support for custom casts that using `Castable` [#1287 / binotaliu](https://github.com/barryvdh/laravel-ide-helper/pull/1287) - Added Laravel 9 support [#1297 / rcerljenko](https://github.com/barryvdh/laravel-ide-helper/pull/1297) From acb2df9dfb0645f4605d19c2217596735b441665 Mon Sep 17 00:00:00 2001 From: mfn Date: Sun, 23 Jan 2022 16:39:03 +0000 Subject: [PATCH 2/3] normalize composer.json --- composer.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 2dd8d39..e7c7081 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "name": "barryvdh/laravel-ide-helper", "description": "Laravel IDE Helper, generates correct PHPDocs for all Facade classes, to improve auto-completion.", + "license": "MIT", "keywords": [ "laravel", "autocomplete", @@ -12,7 +13,6 @@ "codeintel", "phpdoc" ], - "license": "MIT", "authors": [ { "name": "Barry vd. Heuvel", @@ -25,19 +25,19 @@ "barryvdh/reflection-docblock": "^2.0.6", "composer/composer": "^1.10.23 || ^2.1.9", "doctrine/dbal": "^2.6 || ^3", - "illuminate/console": "^8|^9", - "illuminate/filesystem": "^8|^9", - "illuminate/support": "^8|^9", + "illuminate/console": "^8 || ^9", + "illuminate/filesystem": "^8 || ^9", + "illuminate/support": "^8 || ^9", "nikic/php-parser": "^4.7", "phpdocumentor/type-resolver": "^1.1.0" }, "require-dev": { "ext-pdo_sqlite": "*", "friendsofphp/php-cs-fixer": "^2", - "illuminate/config": "^8|^9", - "illuminate/view": "^8|^9", + "illuminate/config": "^8 || ^9", + "illuminate/view": "^8 || ^9", "mockery/mockery": "^1.4", - "orchestra/testbench": "^6|^7", + "orchestra/testbench": "^6 || ^7", "phpunit/phpunit": "^8.5 || ^9", "spatie/phpunit-snapshot-assertions": "^3 || ^4", "vimeo/psalm": "^3.12" @@ -45,6 +45,18 @@ "suggest": { "illuminate/events": "Required for automatic helper generation (^6|^7|^8|^9)." }, + "minimum-stability": "dev", + "prefer-stable": true, + "autoload": { + "psr-4": { + "Barryvdh\\LaravelIdeHelper\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "Barryvdh\\LaravelIdeHelper\\Tests\\": "tests" + } + }, "config": { "sort-packages": true }, @@ -58,18 +70,6 @@ ] } }, - "autoload": { - "psr-4": { - "Barryvdh\\LaravelIdeHelper\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "Barryvdh\\LaravelIdeHelper\\Tests\\": "tests" - } - }, - "minimum-stability": "dev", - "prefer-stable": true, "scripts": { "analyze": "psalm", "check-style": [ From 88353535f299f2ef0ab908b57a98af13ac58b673 Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Sun, 23 Jan 2022 17:46:42 +0100 Subject: [PATCH 3/3] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e7c7081..43e1937 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.9-dev" + "dev-master": "2.12-dev" }, "laravel": { "providers": [