Merge branch '8.x'

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Nov 27, 2023 · 2c91f5c · 2c91f5c
2 parents ffeff4f + 466ed3d
commit 2c91f5c
Show file tree

Hide file tree

Showing 43 changed files with 277 additions and 15 deletions.
diff --git a/.github/workflows/analyse.yaml b/.github/workflows/analyse.yaml
@@ -3,6 +3,7 @@ name: analyse
 on:
   push:
   pull_request:
+  workflow_dispatch:
 
 jobs:
   analyse:
@@ -14,10 +15,12 @@ jobs:
           - "ubuntu-latest"
         php:
           - 8.2
+        dependencies:
+          - "highest"
         experimental:
           - false
 
-    name: PHP${{ matrix.php }} on ${{ matrix.os }}
+    name: PHP${{ matrix.php }} PHPStan & Pint
 
     steps:
       - name: Checkout code
@@ -27,20 +30,50 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, intl, fileinfo
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
           coverage: none
 
       - name: Install dependencies
         uses: "ramsey/composer-install@v2"
         with:
-          dependency-versions: "highest"
+          dependency-versions: "${{ matrix.dependencies }}"
           composer-options: "--prefer-dist --no-cache"
 
-      - name: Installed dependencies
-        run: composer show -D
-
-      - name: Execute Code Style Analysis
-        run: vendor/bin/pint --test
-
       - name: Execute Static Code Analysis
         run: vendor/bin/phpstan analyse
+
+  lint:
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      matrix:
+        os:
+          - "ubuntu-latest"
+        php:
+          - 8.3
+        dependencies:
+          - "highest"
+        experimental:
+          - false
+
+    name: PHP${{ matrix.php }} Code Lint
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, sqlite3, pdo_sqlite, bcmath, fileinfo
+          coverage: none
+
+      - name: Install dependencies
+        uses: "ramsey/composer-install@v2"
+        with:
+          dependency-versions: "${{ matrix.dependencies }}"
+          composer-options: "--prefer-dist --no-cache"
+
+      - name: PHP Lint
+        run: php -l ./src
diff --git a/.github/workflows/audits.yaml b/.github/workflows/audits.yaml
@@ -14,6 +14,7 @@ jobs:
           - "ubuntu-latest"
         php:
           - 8.2
+          - 8.3
         experimental:
           - true
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -3,6 +3,7 @@ name: tests
 on:
   push:
   pull_request:
+  workflow_dispatch:
   schedule:
     - cron: '0 0 * * 4'
 

diff --git a/composer.json b/composer.json
@@ -36,6 +36,7 @@
         "illuminate/support": "^11.0",
         "orchestra/canvas-core": "^9.0",
         "orchestra/testbench-core": "^9.0",
+        "symfony/polyfill-php83": "^1.28",
         "symfony/yaml": "^7.0"
     },
     "require-dev": {

diff --git a/src/Console/BatchesTableCommand.php b/src/Console/BatchesTableCommand.php
@@ -33,6 +33,7 @@ public function __construct(Filesystem $files)
      * @param  string  $table
      * @return string
      */
+    #[\Override]
     protected function createBaseMigration($table)
     {
         return $this->createBaseMigrationUsingCanvas($table);
@@ -44,6 +45,7 @@ protected function createBaseMigration($table)
      * @param  string  $table
      * @return bool
      */
+    #[\Override]
     protected function migrationExists($table)
     {
         return $this->migrationExistsUsingCanvas($table);

diff --git a/src/Console/CacheTableCommand.php b/src/Console/CacheTableCommand.php
@@ -33,6 +33,7 @@ public function __construct(Filesystem $files)
      * @param  string  $table
      * @return string
      */
+    #[\Override]
     protected function createBaseMigration($table)
     {
         return $this->createBaseMigrationUsingCanvas($table);
@@ -44,6 +45,7 @@ protected function createBaseMigration($table)
      * @param  string  $table
      * @return bool
      */
+    #[\Override]
     protected function migrationExists($table)
     {
         return $this->migrationExistsUsingCanvas($table);

diff --git a/src/Console/CastMakeCommand.php b/src/Console/CastMakeCommand.php
@@ -35,6 +35,7 @@ public function __construct(Filesystem $files)
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
+    #[\Override]
     public function handle()
     {
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
@@ -46,6 +47,7 @@ public function handle()
      * @param  string  $name
      * @return string
      */
+    #[\Override]
     protected function getPath($name)
     {
         return $this->getPathUsingCanvas($name);
@@ -56,6 +58,7 @@ protected function getPath($name)
      *
      * @return string
      */
+    #[\Override]
     protected function rootNamespace()
     {
         return $this->rootNamespaceUsingCanvas();

diff --git a/src/Console/ChannelMakeCommand.php b/src/Console/ChannelMakeCommand.php
@@ -37,6 +37,7 @@ public function __construct(Filesystem $files)
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
+    #[\Override]
     public function handle()
     {
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
@@ -48,6 +49,7 @@ public function handle()
      * @param  string  $name
      * @return string
      */
+    #[\Override]
     protected function getPath($name)
     {
         return $this->getPathUsingCanvas($name);
@@ -58,6 +60,7 @@ protected function getPath($name)
      *
      * @return string
      */
+    #[\Override]
     protected function rootNamespace()
     {
         return $this->rootNamespaceUsingCanvas();

diff --git a/src/Console/CodeMakeCommand.php b/src/Console/CodeMakeCommand.php
@@ -43,6 +43,7 @@ protected function resolveDefaultStubPath($stub)
      *
      * @return array<int, array>
      */
+    #[\Override]
     protected function getOptions()
     {
         return [

diff --git a/src/Console/Commander.php b/src/Console/Commander.php
@@ -6,7 +6,6 @@
 use Illuminate\Contracts\Console\Kernel as ConsoleKernel;
 use Illuminate\Foundation\Application as LaravelApplication;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;
 use Orchestra\Canvas\CanvasServiceProvider;
 use Orchestra\Canvas\LaravelServiceProvider;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
@@ -25,9 +24,10 @@ class Commander extends \Orchestra\Testbench\Console\Commander
      *
      * @return \Closure(\Illuminate\Foundation\Application):void
      */
+    #[\Override]
     protected function resolveApplicationCallback()
     {
-        return function ($app) {
+        return static function ($app) {
             $app->register(CanvasServiceProvider::class);
         };
     }
@@ -37,6 +37,7 @@ protected function resolveApplicationCallback()
      *
      * @return \Illuminate\Foundation\Application
      */
+    #[\Override]
     public function laravel()
     {
         if (! $this->app instanceof LaravelApplication) {
@@ -47,9 +48,9 @@ public function laravel()
             $app->register(LaravelServiceProvider::class);
 
             Collection::make($kernel->all())
-                ->reject(function (SymfonyCommand $command, string $name) {
-                    return Str::startsWith('make:', $name) || $command instanceof GeneratorCommand;
-                })->each(function (SymfonyCommand $command) {
+                ->reject(static function (SymfonyCommand $command, string $name) {
+                    return str_starts_with('make:', $name) || $command instanceof GeneratorCommand;
+                })->each(static function (SymfonyCommand $command) {
                     $command->setHidden(true);
                 });
         }

diff --git a/src/Console/ComponentMakeCommand.php b/src/Console/ComponentMakeCommand.php
@@ -37,6 +37,7 @@ public function __construct(Filesystem $files)
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
+    #[\Override]
     public function handle()
     {
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
@@ -60,6 +61,7 @@ public function afterCodeHasBeenGenerated(string $className, string $path): void
      * @param  string  $name
      * @return string
      */
+    #[\Override]
     protected function getPath($name)
     {
         return $this->getPathUsingCanvas($name);
@@ -70,6 +72,7 @@ protected function getPath($name)
      *
      * @return string
      */
+    #[\Override]
     protected function rootNamespace()
     {
         return $this->rootNamespaceUsingCanvas();
@@ -81,6 +84,7 @@ protected function rootNamespace()
      * @param  string  $path
      * @return string
      */
+    #[\Override]
     protected function viewPath($path = '')
     {
         return $this->viewPathUsingCanvas($path);

diff --git a/src/Console/ConsoleMakeCommand.php b/src/Console/ConsoleMakeCommand.php
@@ -37,6 +37,7 @@ public function __construct(Filesystem $files)
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
+    #[\Override]
     public function handle()
     {
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
@@ -48,6 +49,7 @@ public function handle()
      * @param  string  $name
      * @return string
      */
+    #[\Override]
     protected function getPath($name)
     {
         return $this->getPathUsingCanvas($name);
@@ -58,6 +60,7 @@ protected function getPath($name)
      *
      * @return string
      */
+    #[\Override]
     protected function rootNamespace()
     {
         return $this->rootNamespaceUsingCanvas();
@@ -69,6 +72,7 @@ protected function rootNamespace()
      * @param  string  $rootNamespace
      * @return string
      */
+    #[\Override]
     protected function getDefaultNamespace($rootNamespace)
     {
         return rtrim($this->generatorPreset()->commandNamespace(), '\\');

diff --git a/src/Console/ControllerMakeCommand.php b/src/Console/ControllerMakeCommand.php
@@ -37,6 +37,7 @@ public function __construct(Filesystem $files)
      *
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      */
+    #[\Override]
     public function handle()
     {
         return $this->generateCode() ? self::SUCCESS : self::FAILURE;
@@ -48,6 +49,7 @@ public function handle()
      * @param  string  $model
      * @return string
      */
+    #[\Override]
     protected function qualifyModel(string $model)
     {
         return $this->qualifyModelUsingCanvas($model);
@@ -58,6 +60,7 @@ protected function qualifyModel(string $model)
      *
      * @return array
      */
+    #[\Override]
     protected function buildParentReplacements()
     {
         $parentModelClass = $this->parseModel($this->option('parent'));
@@ -86,6 +89,7 @@ protected function buildParentReplacements()
      * @param  array  $replace
      * @return array
      */
+    #[\Override]
     protected function buildModelReplacements(array $replace)
     {
         $modelClass = $this->parseModel($this->option('model'));
@@ -96,6 +100,12 @@ protected function buildModelReplacements(array $replace)
 
         $replace = $this->buildFormRequestReplacements($replace, $modelClass);
 
+        if ($this->option('requests')) {
+            $namespace = $this->rootNamespace();
+            $replace['{{ namespacedRequests }}'] = str_replace('App\\', $namespace, $replace['{{ namespacedRequests }}']);
+            $replace['{{namespacedRequests}}'] = str_replace('App\\', $namespace, $replace['{{namespacedRequests}}']);
+        }
+
         return array_merge($replace, [
             'DummyFullModelClass' => $modelClass,
             '{{ namespacedModel }}' => $modelClass,
@@ -115,6 +125,7 @@ protected function buildModelReplacements(array $replace)
      * @param  string  $name
      * @return string
      */
+    #[\Override]
     protected function getPath($name)
     {
         return $this->getPathUsingCanvas($name);
@@ -125,6 +136,7 @@ protected function getPath($name)
      *
      * @return string
      */
+    #[\Override]
     protected function rootNamespace()
     {
         return $this->rootNamespaceUsingCanvas();
@@ -135,8 +147,37 @@ protected function rootNamespace()
      *
      * @return array<int, string>
      */
+    #[\Override]
     protected function possibleModels()
     {
         return $this->possibleModelsUsingCanvas();
     }
+
+    /**
+     * Generate the form requests for the given model and classes.
+     *
+     * @param  string  $modelClass
+     * @param  string  $storeRequestClass
+     * @param  string  $updateRequestClass
+     * @return array
+     */
+    #[\Override]
+    protected function generateFormRequests($modelClass, $storeRequestClass, $updateRequestClass)
+    {
+        $storeRequestClass = 'Store'.class_basename($modelClass).'Request';
+
+        $this->call('make:request', [
+            'name' => $storeRequestClass,
+            '--preset' => $this->option('preset'),
+        ]);
+
+        $updateRequestClass = 'Update'.class_basename($modelClass).'Request';
+
+        $this->call('make:request', [
+            'name' => $updateRequestClass,
+            '--preset' => $this->option('preset'),
+        ]);
+
+        return [$storeRequestClass, $updateRequestClass];
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ jobs: @@
               - "ubuntu-latest"
             php:
               - 8.2
+              - 8.3
             experimental:
               - true
@@ Expand Down @@