Merge pull request #195 from package-wizard/phoenix

andrey-helldar · web-flow · commit 965ea5f1f6de · 2025-07-12T14:09:45.000+03:00
Bump code styler
diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
@@ -23,7 +23,10 @@ jobs:
                     coverage: none
 
             -   name: Install dependency
-                run: composer global require dragon-code/codestyler
+                run: composer install
+
+            -   name: Styling
+                run: vendor/bin/pint --parallel --test
 
     fix:
         runs-on: ubuntu-latest
@@ -42,26 +45,11 @@ jobs:
                     extensions: curl, mbstring, zip, iconv, json, dom, fileinfo, tokenizer
                     coverage: none
 
-            -   name: Setup Composer
-                run: |
-                    composer global config --no-plugins allow-plugins.dragon-code/codestyler true
-                    composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true
-                    
-                    composer config --no-plugins allow-plugins.dragon-code/codestyler true
-                    composer config --no-plugins allow-plugins.ergebnis/composer-normalize true
-
-            -   name: Install dependencies
-                run: |
-                    composer global require dragon-code/codestyler
-                    composer global require ergebnis/composer-normalize
-
-            -   name: Fix the code-style
-                run: |
-                    codestyle editorconfig
-                    codestyle dependabot
-                    codestyle --parallel
+            -   name: Install dependency
+                run: composer install
 
-                    composer normalize
+            -   name: Styling
+                run: composer style
 
             -   name: Create a Pull Request
                 uses: peter-evans/create-pull-request@v7
diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -23,15 +23,13 @@ jobs:
                     coverage: none
 
             -   name: Install dependencies
-                run: |
-                    composer update --prefer-stable --prefer-dist --no-progress --no-interaction
-                    composer global require dragon-code/codestyler
+                run: composer install
 
             -   name: Download
                 run: php ./paw licenses
 
             -   name: Code-Style
-                run: codestyle
+                run: composer style
 
             -   name: Create a Pull Request
                 uses: peter-evans/create-pull-request@v7
diff --git a/app/Actions/QuestionsAction.php b/app/Actions/QuestionsAction.php
@@ -110,6 +110,6 @@ protected function forPath(ConditionData $condition): bool
 
     protected function comparator(): ComparatorService
     {
-        return $this->comparator ??= new ComparatorService();
+        return $this->comparator ??= new ComparatorService;
     }
 }
diff --git a/app/Actions/ValidateSchemaAction.php b/app/Actions/ValidateSchemaAction.php
@@ -57,6 +57,6 @@ protected function filename(): string
 
     protected function validator(): SchemaValidatorService
     {
-        return new SchemaValidatorService();
+        return new SchemaValidatorService;
     }
 }
diff --git a/app/Commands/NewCommand.php b/app/Commands/NewCommand.php
@@ -203,15 +203,13 @@ protected function projectDirectory(): string
                 DownloadProjectAction::Dev     => $isDev,
                 Action::Directory              => $directory,
             ]);
-        }
-        elseif (Directory::doesntExist($directory)) {
+        } elseif (Directory::doesntExist($directory)) {
             warning(__('validation.doesnt_exist.directory', ['path' => $directory]));
 
             $directory = $this->getInstallationDirectory(
                 DirectoryFiller::make(local: true)
             );
-        }
-        elseif (! is_readable($directory)) {
+        } elseif (! is_readable($directory)) {
             warning(__('validation.no_access', ['path' => $directory]));
 
             $directory = $this->getInstallationDirectory(
diff --git a/app/Integrations/GitHub.php b/app/Integrations/GitHub.php
@@ -14,10 +14,10 @@
 class GitHub
 {
     /**
+     * @return Collection<LicenseData>
+     *
      * @throws \Illuminate\Http\Client\ConnectionException
      * @throws \Illuminate\Http\Client\RequestException
-     *
-     * @return Collection<LicenseData>
      */
     public function licenses(): Collection
     {
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -17,9 +17,9 @@ class AppServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->app->singleton(Composer::class, function () {
-            return new Composer(new Filesystem(), getcwd() ?: realpath('.'));
+            return new Composer(new Filesystem, getcwd() ?: realpath('.'));
         });
 
-        $this->app->singleton(Console::class, fn () => new Console());
+        $this->app->singleton(Console::class, fn () => new Console);
     }
 }
diff --git a/app/Services/ProcessService.php b/app/Services/ProcessService.php
@@ -63,8 +63,7 @@ protected function tty(Process $process): void
         if ('\\' !== DIRECTORY_SEPARATOR && file_exists('/dev/tty') && is_readable('/dev/tty')) {
             try {
                 $process->setTty(true);
-            }
-            catch (RuntimeException $e) {
+            } catch (RuntimeException $e) {
                 warning($e->getMessage());
             }
         }
diff --git a/app/Services/SchemaValidatorService.php b/app/Services/SchemaValidatorService.php
@@ -13,7 +13,7 @@
 class SchemaValidatorService
 {
     public function __construct(
-        protected Validator $schema = new Validator()
+        protected Validator $schema = new Validator
     ) {}
 
     public function validate(stdClass $data): void
diff --git a/composer.json b/composer.json
@@ -38,6 +38,7 @@
     },
     "require-dev": {
         "archtechx/enums": "^1.1.2",
+        "dragon-code/codestyler": "^6.0",
         "dragon-code/support": "^6.16",
         "illuminate/http": "^12.20",
         "illuminate/translation": "^12.20",
@@ -80,7 +81,12 @@
         "sort-packages": true
     },
     "scripts": {
-        "style": "codestyle --parallel",
+        "post-update-cmd": [
+            "cp vendor/dragon-code/codestyler/presets/pint/8.4.json pint.json",
+            "cp vendor/dragon-code/codestyler/.editorconfig .editorconfig",
+            "composer normalize"
+        ],
+        "style": "vendor/bin/pint --parallel",
         "test": [
             "@test:coverage",
             "@test:types",
diff --git a/composer.lock b/composer.lock
diff --git a/pint.json b/pint.json
diff --git a/resources/licenses/list.json b/resources/licenses/list.json
diff --git a/resources/licenses/mpl-2.0 b/resources/licenses/mpl-2.0
diff --git a/tests/Helpers/validators.php b/tests/Helpers/validators.php

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,6 @@ protected function forPath(ConditionData $condition): bool`
`110`	`110`
`111`	`111`	`protected function comparator(): ComparatorService`
`112`	`112`	`{`
`113`		`- return $this->comparator ??= new ComparatorService();`
	`113`	`+ return $this->comparator ??= new ComparatorService;`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,6 @@ protected function filename(): string`
`57`	`57`
`58`	`58`	`protected function validator(): SchemaValidatorService`
`59`	`59`	`{`
`60`		`- return new SchemaValidatorService();`
	`60`	`+ return new SchemaValidatorService;`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@`
`14`	`14`	`class GitHub`
`15`	`15`	`{`
`16`	`16`	`/**`
	`17`	`+ * @return Collection<LicenseData>`
	`18`	`+ *`
`17`	`19`	`* @throws \Illuminate\Http\Client\ConnectionException`
`18`	`20`	`* @throws \Illuminate\Http\Client\RequestException`
`19`		`- *`
`20`		`- * @return Collection<LicenseData>`
`21`	`21`	`*/`
`22`	`22`	`public function licenses(): Collection`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@ class AppServiceProvider extends ServiceProvider`
`17`	`17`	`public function register(): void`
`18`	`18`	`{`
`19`	`19`	`$this->app->singleton(Composer::class, function () {`
`20`		`- return new Composer(new Filesystem(), getcwd() ?: realpath('.'));`
	`20`	`+ return new Composer(new Filesystem, getcwd() ?: realpath('.'));`
`21`	`21`	`});`
`22`	`22`
`23`		`- $this->app->singleton(Console::class, fn () => new Console());`
	`23`	`+ $this->app->singleton(Console::class, fn () => new Console);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ protected function tty(Process $process): void`
`63`	`63`	`if ('\\' !== DIRECTORY_SEPARATOR && file_exists('/dev/tty') && is_readable('/dev/tty')) {`
`64`	`64`	`try {`
`65`	`65`	`$process->setTty(true);`
`66`		`- }`
`67`		`- catch (RuntimeException $e) {`
	`66`	`+ } catch (RuntimeException $e) {`
`68`	`67`	`warning($e->getMessage());`
`69`	`68`	`}`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`class SchemaValidatorService`
`14`	`14`	`{`
`15`	`15`	`public function __construct(`
`16`		`- protected Validator $schema = new Validator()`
	`16`	`+ protected Validator $schema = new Validator`
`17`	`17`	`) {}`
`18`	`18`
`19`	`19`	`public function validate(stdClass $data): void`