wip

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Nov 21, 2024 · ed01f4b · ed01f4b
2 parents a1be14a + 2e47d11
commit ed01f4b
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 35 deletions.
diff --git a/.github/workflows/analyse.yaml b/.github/workflows/analyse.yaml
@@ -7,20 +7,15 @@ on:
 
 jobs:
   analyse:
-    runs-on: ${{ matrix.os }}
+    runs-on: "ubuntu-latest"
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        os:
-          - "ubuntu-latest"
-        php:
-          - 8.3
-        dependencies:
-          - "highest"
+        php: [8.3]
         experimental:
           - false
 
-    name: PHP${{ matrix.php }} PHPStan & Pint
+    name: PHP:${{ matrix.php }} Code Analysis
 
     steps:
       - name: Checkout code
@@ -36,23 +31,18 @@ jobs:
       - name: Install dependencies
         uses: "ramsey/composer-install@v3"
         with:
-          dependency-versions: "${{ matrix.dependencies }}"
+          dependency-versions: "highest"
           composer-options: "--prefer-dist --no-cache"
 
       - name: Execute Static Code Analysis
         run: vendor/bin/phpstan analyse
 
   lint:
-    runs-on: ${{ matrix.os }}
+    runs-on: "ubuntu-latest"
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        os:
-          - "ubuntu-latest"
-        php:
-          - 8.3
-        dependencies:
-          - "highest"
+        php: [8.3]
         experimental:
           - false
 
@@ -72,7 +62,7 @@ jobs:
       - name: Install dependencies
         uses: "ramsey/composer-install@v3"
         with:
-          dependency-versions: "${{ matrix.dependencies }}"
+          dependency-versions: "highest"
           composer-options: "--prefer-dist --no-cache"
 
       - name: PHP Lint

diff --git a/.github/workflows/audits.yaml b/.github/workflows/audits.yaml
@@ -6,20 +6,18 @@ on:
 
 jobs:
   audit-dependencies:
-    runs-on: ${{ matrix.os }}
+    runs-on: "ubuntu-latest"
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        os:
-          - "ubuntu-latest"
         php:
           - 8.2
           - 8.3
           - 8.4
         experimental:
           - true
 
-    name: PHP${{ matrix.php }} on ${{ matrix.os }}
+    name: PHP:${{ matrix.php }} Code Audit
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -6,20 +6,15 @@ on:
 
 jobs:
   tests:
-    runs-on: ${{ matrix.os }}
+    runs-on: "ubuntu-latest"
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        os:
-          - "ubuntu-latest"
-        php:
-          - 8.3
-        dependencies:
-          - "highest"
+        php: [8.3]
         experimental:
           - false
 
-    name: PHP${{ matrix.php }} on ${{ matrix.os }} (${{ matrix.dependencies }})
+    name: PHP:${{ matrix.php }} Code Coverage
 
     steps:
       - name: Checkout code
@@ -35,7 +30,7 @@ jobs:
       - name: Install dependencies
         uses: "ramsey/composer-install@v3"
         with:
-          dependency-versions: "${{ matrix.dependencies }}"
+          dependency-versions: "highest"
           composer-options: "--prefer-dist --no-cache"
 
       - name: Execute tests

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -26,7 +26,7 @@ jobs:
         experimental:
           - false
 
-    name: PHP${{ matrix.php }} on ${{ matrix.os }} (${{ matrix.dependencies }})
+    name: PHP:${{ matrix.php }} / OS:${{ matrix.os }} ${{ matrix.dependencies == 'highest' && '⬆️' || '⬇️' }}
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/update-stubs.yaml b/.github/workflows/update-stubs.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, intl, fileinfo, :php-psr
           coverage: none
 

diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "illuminate/support": "^11.31",
         "orchestra/canvas-core": "^9.0",
         "orchestra/testbench-core": "^9.2",
-        "symfony/polyfill-php83": "^1.30",
+        "symfony/polyfill-php83": "^1.31",
         "symfony/yaml": "^7.0.3"
     },
     "require-dev": {
@@ -76,7 +76,10 @@
             "@php vendor/bin/pint",
             "@php vendor/bin/phpstan analyse --verbose"
         ],
-        "test": "@php vendor/bin/phpunit --no-configuration --color ./tests ./workbench/tests",
+        "test": [
+            "@composer dump-autoload",
+            "@php vendor/bin/phpunit --no-coverage --no-configuration --bootstrap vendor/autoload.php --color ./tests ./workbench/tests"
+        ],
         "ci": [
             "@composer audit",
             "@prepare",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -10,6 +10,7 @@ parameters:
   level: 8
 
   ignoreErrors:
+    # - identifier: missingType.generics
     - identifier: missingType.iterableValue
 
   treatPhpDocTypesAsCertain: false
diff --git a/src/Console/PresetMakeCommand.php b/src/Console/PresetMakeCommand.php
@@ -17,6 +17,9 @@
 use function Laravel\Prompts\select;
 use function Orchestra\Testbench\package_path;
 
+/**
+ * @codeCoverageIgnore
+ */
 #[AsCommand(name: 'preset', description: 'Create canvas.yaml for the project')]
 class PresetMakeCommand extends GeneratorCommand
 {
@@ -78,6 +81,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
      *
      * @return string
      */
+    #[\Override]
     protected function getStub()
     {
         $name = Str::lower($this->getNameInput());

diff --git a/src/Console/TestMakeCommand.php b/src/Console/TestMakeCommand.php
@@ -3,6 +3,7 @@
 namespace Orchestra\Canvas\Console;
 
 use Illuminate\Support\Str;
+use Illuminate\Filesystem\Filesystem;
 use Orchestra\Canvas\Core\Concerns\CodeGenerator;
 use Orchestra\Canvas\Core\Concerns\UsesGeneratorOverrides;
 use Orchestra\Canvas\GeneratorPreset;
@@ -78,7 +79,7 @@ protected function replaceTestCase(string $stub, string $testCase): string
     {
         $namespaceTestCase = $testCase = str_replace('/', '\\', $testCase);
 
-        if (Str::startsWith($testCase, '\\')) {
+        if (str_starts_with($testCase, '\\')) {
             $stub = str_replace('NamespacedDummyTestCase', trim($testCase, '\\'), $stub);
         } else {
             $stub = str_replace('NamespacedDummyTestCase', $namespaceTestCase, $stub);
@@ -99,6 +100,7 @@ protected function replaceTestCase(string $stub, string $testCase): string
      * @param  string  $stub
      * @return string
      */
+    #[\Override]
     protected function resolveStubPath($stub)
     {
         $preset = $this->generatorPreset();
@@ -137,6 +139,7 @@ protected function getGeneratorSourcePath(): string
      * @param  string  $name
      * @return string
      */
+    #[\Override]
     protected function getPath($name)
     {
         return $this->getPathUsingCanvas($name);
@@ -147,6 +150,7 @@ protected function getPath($name)
      *
      * @return string
      */
+    #[\Override]
     protected function rootNamespace()
     {
         return $this->generatorPreset()->testingNamespace();

diff --git a/src/Console/UserFactoryMakeCommand.php b/src/Console/UserFactoryMakeCommand.php
@@ -26,6 +26,7 @@ class UserFactoryMakeCommand extends GeneratorCommand
      *
      * @return string
      */
+    #[\Override]
     protected function getStub()
     {
         return $this->resolveStubPath(join_paths('stubs', 'user-factory.stub'));

diff --git a/src/Console/UserModelMakeCommand.php b/src/Console/UserModelMakeCommand.php
@@ -51,6 +51,7 @@ protected function buildClass($name)
      *
      * @return string
      */
+    #[\Override]
     protected function getStub()
     {
         return $this->resolveStubPath(join_paths('stubs', 'user-model.stub'));