Support for Laravel 10 (#598)

Author: jasonmccreary

.github/workflows/build.yml

@@ -16,18 +16,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [8.0, 8.1]
-
+        php-version: ['8.1', '8.2']
         os: [ubuntu-latest, windows-latest, macos-latest]
-
         dependencies: [locked]
-
         experimental: [false]
 
     name: PHP ${{ matrix.php-version }} - ${{ matrix.os }}
-
     runs-on: ${{ matrix.os }}
-
     continue-on-error: ${{ matrix.experimental }}
 
     steps:

.github/workflows/demo.yml

@@ -14,7 +14,7 @@ jobs:
 
     services:
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ALLOW_EMPTY_PASSWORD: yes
           MYSQL_DATABASE: laravel
@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [8.0, 8.1]
-        laravel-version: [9]
+        php-version: ['8.1', '8.2']
+        laravel-version: [10]
         os: [ubuntu-latest]
 
     runs-on: ${{ matrix.os }}

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.1'
           tools: phplint, laravel/pint
       - name: Check syntax
         run: phplint .

UPGRADE.md

@@ -1,5 +1,12 @@
 # Upgrade Guide
 
+## Upgrading from 2.x to 2.6
+Version 2.6 was a minor release to add support for Laravel 10. This adopts the latest conventions from Laravel, most notably the addition of type-hints in code.
+
+The only other change is the removal of `use_return_types` configuration, as this is now Blueprint's default behavior.
+
+Inline with Blueprint's [Support Policy](https://github.com/laravel-shift/blueprint#support-policy), this release also drops support for Laravel 9. If you are still running Laravel 9, you may constrain your Blueprint version to `2.5.0`.
+
 ## Upgrading from 1.x to 2.x
 Version 2.x was a superficial major release to reflect Blueprint's new [Support Policy](https://github.com/laravel-shift/blueprint#support-policy). There were no changes to the underlying grammar. A few configuration options and methods were changed. Additional notes are below. You may view the full set of changes in [#496](https://github.com/laravel-shift/blueprint/pull/496).
 

composer.json

@@ -2,23 +2,20 @@
     "name": "laravel-shift/blueprint",
     "type": "library",
     "description": "An expressive, human readable code generation tool.",
-    "keywords": [
-        "framework",
-        "laravel"
-    ],
+    "keywords": ["framework", "laravel", "code generation"],
     "license": "MIT",
     "require": {
         "doctrine/dbal": "^3.3",
-        "illuminate/console": "^9.0|^10.0",
-        "illuminate/filesystem": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0",
+        "illuminate/console": "^10.0",
+        "illuminate/filesystem": "^10.0",
+        "illuminate/support": "^10.0",
         "laravel-shift/faker-registry": "^0.2.0",
-        "symfony/yaml": "^6.0"
+        "symfony/yaml": "^6.3"
     },
     "require-dev": {
         "laravel/pint": "^1.2",
         "mockery/mockery": "^1.4.4",
-        "orchestra/testbench": "^7.0|^8.0",
+        "orchestra/testbench": "^8.0",
         "phpunit/phpunit": "^9.5.10"
     },
     "suggest": {

config/blueprint.php

@@ -87,19 +87,6 @@
     */
     'fake_nullables' => true,
 
-    /*
-    |--------------------------------------------------------------------------
-    | Method Return Type Declarations
-    |--------------------------------------------------------------------------
-    |
-    | Enable or disable method return typehinting for blueprint generated
-    | methods. Enabling this will enforce code strictness which increases
-    | readability of code and will lower maintenance cost. This will only
-    | Work for projects running PHP v7.0 or higher.
-    |
-    */
-    'use_return_types' => false,
-
     /*
     |--------------------------------------------------------------------------
     | Use Guarded

src/Blueprint.php

@@ -30,11 +30,6 @@ public static function appPath()
         return str_replace('\\', '/', config('blueprint.app_path'));
     }
 
-    public static function useReturnTypeHints()
-    {
-        return boolval(config('blueprint.use_return_types'));
-    }
-
     public function parse($content, $strip_dashes = true)
     {
         $content = str_replace(["\r\n", "\r"], "\n", $content);

src/Commands/BuildCommand.php

@@ -36,10 +36,6 @@ class BuildCommand extends Command
     /** @var Builder */
     private $builder;
 
-    /**
-     * @param  Filesystem  $filesystem
-     * @param  Builder  $builder
-     */
     public function __construct(Filesystem $filesystem, Builder $builder)
     {
         parent::__construct();

src/Commands/NewCommand.php

@@ -27,9 +27,6 @@ class NewCommand extends Command
     /** @var Filesystem */
     protected $filesystem;
 
-    /**
-     * @param  Filesystem  $filesystem
-     */
     public function __construct(Filesystem $filesystem)
     {
         parent::__construct();

src/Commands/TraceCommand.php

@@ -32,10 +32,6 @@ class TraceCommand extends Command
     /** @var Tracer */
     private $tracer;
 
-    /**
-     * @param  Filesystem  $filesystem
-     * @param  Tracer  $tracer
-     */
     public function __construct(Filesystem $filesystem, Tracer $tracer)
     {
         parent::__construct();