Pint fixes

Author: joepdooper

.github/workflows/ci.yml

@@ -56,3 +56,7 @@ jobs:
 
       - name: Run PHPStan
         run: phpstan analyse src/ --level=8
+
+      # Run Pint
+      - name: Run Pint
+        run: vendor/bin/pint

qodana.yaml

@@ -0,0 +1,49 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+
+#################################################################################
+#              WARNING: Do not store sensitive information in this file,        #
+#               as its contents will be included in the Qodana report.          #
+#################################################################################
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+php:
+  version: 8.5 #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+# Quality gate. Will fail the CI/CD pipeline if any condition is not met
+# severityThresholds - configures maximum thresholds for different problem severities
+# testCoverageThresholds - configures minimum code coverage on a whole project and newly added code
+# Code Coverage is available in Ultimate and Ultimate Plus plans
+#failureConditions:
+#  severityThresholds:
+#    any: 15
+#    critical: 5
+#  testCoverageThresholds:
+#    fresh: 70
+#    total: 50
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-php:2026.1

src/Plugin/Application/Contracts/PluginInterface.php

@@ -4,8 +4,11 @@
 
 use Ivy\User\Application\Service\AuthService;
 
-interface PluginInterface {
+interface PluginInterface
+{
     public function register(AuthService $auth): void;
+
     public function install(): void;
+
     public function uninstall(): void;
 }

src/Plugin/Domain/Entity/Plugin.php

@@ -20,7 +20,7 @@
 class Plugin extends Entity
 {
     use HasPolicies;
-    
+
     protected $fillable = [
         'parent_id',
         'name',

src/Plugin/Domain/Exception/PluginException.php

@@ -18,4 +18,4 @@ public function __construct(
 
         parent::__construct($message, 0, $previous);
     }
-}
+}

src/Plugin/Infrastructure/Manager/PluginManager.php

@@ -4,15 +4,14 @@
 
 use Exception;
 use Illuminate\Database\Capsule\Manager as Capsule;
+use Ivy\Plugin\Application\Contracts\PluginInterface;
+use Ivy\Plugin\Domain\Entity\Plugin;
 use Ivy\Plugin\Domain\Exception\PluginException;
+use Ivy\Plugin\Infrastructure\Metadata\PluginInfoLoader;
 use Ivy\Plugin\Infrastructure\Service\PluginService;
+use Ivy\Plugin\Presentation\Form\PluginInfoForm;
 use Ivy\Setting\Domain\Entity\Setting;
 use Ivy\Template\Application\Asset\AssetPublisher;
-use Ivy\Plugin\Domain\Entity\Plugin;
-use Ivy\Plugin\Application\Contracts\PluginInterface;
-use Ivy\Shared\Core\Language;
-use Ivy\Plugin\Presentation\Form\PluginInfoForm;
-use Ivy\Plugin\Infrastructure\Metadata\PluginInfoLoader;
 
 class PluginManager
 {
@@ -27,32 +26,32 @@ private function resolvePluginInterface(): PluginInterface
     {
         $class = $this->plugin->interface;
 
-        if (!class_exists($class)) {
+        if (! class_exists($class)) {
             throw new PluginException("class {$class} not found", $this->plugin->name);
         }
 
-        $instance = new $class();
+        $instance = new $class;
 
-        if (!$instance instanceof PluginInterface) {
+        if (! $instance instanceof PluginInterface) {
             throw new PluginException("must implement {$class}", $this->plugin->name);
         }
 
         return $instance;
     }
 
-    public function install():void
+    public function install(): void
     {
         $this->plugin->authorize('install');
 
         $info = (new PluginInfoLoader)->load($this->plugin->url);
 
-        if (!$info) {
+        if (! $info) {
             throw new PluginException(message: 'contains no info.json', plugin: $this->plugin->url);
         }
 
         $result = (new PluginInfoForm)->validate($info);
 
-        if (!$result->valid) {
+        if (! $result->valid) {
             $errors = [];
 
             foreach ($result->errors as $error) {
@@ -61,15 +60,15 @@ public function install():void
                 }
             }
 
-            throw new PluginException(message: 'contains an invalid info.json file: ' . implode(' ', $errors), plugin: $this->plugin->url);
+            throw new PluginException(message: 'contains an invalid info.json file: '.implode(' ', $errors), plugin: $this->plugin->url);
         }
 
         $this->plugin->fill($result->data);
 
         if (isset($info['dependencies'])) {
             $missing = PluginService::getMissingDependencies($info['dependencies']);
-            if (!empty($missing)) {
-                throw new PluginException(message: 'is missing dependencies ' . implode(', ', $missing), plugin: $this->plugin->name);
+            if (! empty($missing)) {
+                throw new PluginException(message: 'is missing dependencies '.implode(', ', $missing), plugin: $this->plugin->name);
             }
         }
 
@@ -91,9 +90,9 @@ public function install():void
 
                 new AssetPublisher()->publishPlugin($this->plugin->url);
 
-                if (!empty($info['collection'])) {
+                if (! empty($info['collection'])) {
 
-                    $paths = glob(PluginService::getCollectionDirectory($this->plugin->url) . '[a-zA-Z0-9_-]*');
+                    $paths = glob(PluginService::getCollectionDirectory($this->plugin->url).'[a-zA-Z0-9_-]*');
 
                     if ($paths === false) {
                         throw new PluginException(message: 'cannot read plugin collection directory', plugin: $this->plugin->name);
@@ -103,20 +102,20 @@ public function install():void
 
                     foreach ($subfolders as $subfolder) {
                         try {
-                            $plugin = new Plugin();
+                            $plugin = new Plugin;
                             $pluginManager = new PluginManager($plugin->fill([
-                                'url' => PluginService::getRelativePath($subfolder)
+                                'url' => PluginService::getRelativePath($subfolder),
                             ]));
                             $pluginManager->install();
                         } catch (PluginException $e) {
-                            throw new PluginException(message: 'cannot install plugin from its collection because ' . $e->getMessage(), plugin: $this->plugin->name, previous: $e);
+                            throw new PluginException(message: 'cannot install plugin from its collection because '.$e->getMessage(), plugin: $this->plugin->name, previous: $e);
                         }
                     }
                 }
             });
         } catch (PluginException $e) {
             $this->resolvePluginInterface()->uninstall();
-            throw new PluginException(message: 'installation failed. ' . $e->getMessage(), plugin: $this->plugin->name, previous: $e);
+            throw new PluginException(message: 'installation failed. '.$e->getMessage(), plugin: $this->plugin->name, previous: $e);
         }
     }
 
@@ -126,15 +125,15 @@ public function uninstall(): void
 
         $info = (new PluginInfoLoader)->load($this->plugin->url);
 
-        if (!$info) {
+        if (! $info) {
             throw new PluginException(message: 'has no info.json', plugin: $this->plugin->url);
         }
 
         try {
             Capsule::connection()->transaction(function () use ($info) {
-                if (!empty($info['collection'])) {
+                if (! empty($info['collection'])) {
 
-                    $paths = glob(PluginService::getCollectionDirectory($this->plugin->url) . '[a-zA-Z0-9_-]*');
+                    $paths = glob(PluginService::getCollectionDirectory($this->plugin->url).'[a-zA-Z0-9_-]*');
 
                     if ($paths === false) {
                         throw new PluginException(message: 'cannot read plugin collection directory', plugin: $this->plugin->name);
@@ -150,7 +149,7 @@ public function uninstall(): void
                             $pluginManager = new PluginManager($plugin);
                             $pluginManager->uninstall();
                         } catch (PluginException $e) {
-                            throw new PluginException(message: 'cannot uninstall plugin from its collection because ' . $e->getMessage(), plugin: $this->plugin->name, previous: $e);
+                            throw new PluginException(message: 'cannot uninstall plugin from its collection because '.$e->getMessage(), plugin: $this->plugin->name, previous: $e);
                         }
                     }
                 }
@@ -159,7 +158,7 @@ public function uninstall(): void
                 $this->plugin->delete();
             });
         } catch (PluginException $e) {
-            throw new PluginException(message: 'cannot uninstall plugin because ' . $e->getMessage(), plugin: $this->plugin->name, previous: $e);
+            throw new PluginException(message: 'cannot uninstall plugin because '.$e->getMessage(), plugin: $this->plugin->name, previous: $e);
         }
 
         $this->resolvePluginInterface()->uninstall();

src/Plugin/Infrastructure/Metadata/PluginInfo.php

@@ -5,22 +5,22 @@
 final readonly class PluginInfo
 {
     /**
-     * @param array<string> $collection
-     * @param array<string, mixed> $settings
-     * @param array<string, mixed> $actions
-     * @param array<string> $dependencies
+     * @param  array<string>  $collection
+     * @param  array<string, mixed>  $settings
+     * @param  array<string, mixed>  $actions
+     * @param  array<string>  $dependencies
      */
     public function __construct(
-        public string  $name,
-        public string  $interface,
+        public string $name,
+        public string $interface,
         public ?string $version,
         public ?string $description,
-        public string  $url,
+        public string $url,
         public ?string $type,
-        public array   $collection = [],
-        public array   $settings = [],
-        public array   $actions = [],
-        public array   $dependencies = [],
+        public array $collection = [],
+        public array $settings = [],
+        public array $actions = [],
+        public array $dependencies = [],
     ) {}
 
     public function hasCollection(): bool

src/Plugin/Infrastructure/Metadata/PluginInfoFactory.php

@@ -5,8 +5,7 @@
 class PluginInfoFactory
 {
     /**
-     * @param mixed[] $data
-      * @return PluginInfo
+     * @param  mixed[]  $data
      */
     public function make(array $data): PluginInfo
     {

src/Plugin/Infrastructure/Metadata/PluginInfoLoader.php

@@ -8,13 +8,12 @@
 class PluginInfoLoader
 {
     /**
-     * @param string $url
      * @return array<string, mixed>|null
      *
      * @throws Exception
      */
-    public function load(string $url): array|null
+    public function load(string $url): ?array
     {
-        return PluginService::parseJson($url . DIRECTORY_SEPARATOR . 'info.json');
+        return PluginService::parseJson($url.DIRECTORY_SEPARATOR.'info.json');
     }
 }

src/Plugin/Infrastructure/Registry/PluginRegistry.php

@@ -10,7 +10,7 @@ class PluginRegistry
     private static array $active = [];
 
     /**
-     * @param array<string, mixed> $active
+     * @param  array<string, mixed>  $active
      */
     public static function setActive(array $active): void
     {