Fix styling

Author: Kim-the-Diamond

packages/monorepo/src/Commands/CreateRelease.php

@@ -5,8 +5,8 @@
 use App\Models\User;
 use Illuminate\Console\Command;
 use Moox\Monorepo\Services\GitHubService;
-use Moox\Monorepo\Services\ReleaseService;
 use Moox\Monorepo\Services\PackageComparisonService;
+use Moox\Monorepo\Services\ReleaseService;
 
 class CreateRelease extends Command
 {
@@ -15,40 +15,43 @@ class CreateRelease extends Command
     protected $description = 'Create a release for the monorepo';
 
     protected PackageComparisonService $packageComparisonService;
+
     protected GitHubService $githubService;
 
-    //TODO 
-        // 1. Check the current version of this monorepo from GitHub API ✓
-        // 2. Ask the user for the new version, e.g. 4.2.11 ✓
-        // 3. Read directory of all packages (also private) ✓
-        // 4. If repos do not exist, create them (2nd iteration)
-        // 5. For each new repo, add it to devlink.php (2nd iteration)
-        // 6. Read the DEVLOG.md file ✓
-        // 7. Suggest contents from the DEVLOG.md file ✓
-        // 8. New packages without DEVLOG-entry are "Initial release"
-        // 9. Otherwise, "Compatibility release" for all other packages
-        // 10. Split all packages
-        // Core version in composer schreiben!
-        // 11. Create a new tag and release in all repos
-        // 12. Create a new Packagist.org package or Satis (3rd iteration)
-        // 13. Update the packages in the packages table (3rd iteration)
-        // 14. Webplate für translation release! And look at the translation commit from webplate (3rd iteration)
+    // TODO
+    // 1. Check the current version of this monorepo from GitHub API ✓
+    // 2. Ask the user for the new version, e.g. 4.2.11 ✓
+    // 3. Read directory of all packages (also private) ✓
+    // 4. If repos do not exist, create them (2nd iteration)
+    // 5. For each new repo, add it to devlink.php (2nd iteration)
+    // 6. Read the DEVLOG.md file ✓
+    // 7. Suggest contents from the DEVLOG.md file ✓
+    // 8. New packages without DEVLOG-entry are "Initial release"
+    // 9. Otherwise, "Compatibility release" for all other packages
+    // 10. Split all packages
+    // Core version in composer schreiben!
+    // 11. Create a new tag and release in all repos
+    // 12. Create a new Packagist.org package or Satis (3rd iteration)
+    // 13. Update the packages in the packages table (3rd iteration)
+    // 14. Webplate für translation release! And look at the translation commit from webplate (3rd iteration)
 
     protected $devlog;
-    public function __construct(){
+
+    public function __construct()
+    {
         parent::__construct();
         $this->githubService = new GitHubService(User::first()?->github_token);
         $this->packageComparisonService = new PackageComparisonService($this->githubService, config('monorepo.organization', 'mooxphp'));
     }
+
     public function handle(): int
     {
-        
         $token = User::first()?->github_token;
-            if (! $token) {
-                $this->error('No GitHub token found. Please link your GitHub account.');
-                return 1;
-            }
-                
+        if (! $token) {
+            $this->error('No GitHub token found. Please link your GitHub account.');
+
+            return 1;
+        }
 
         switch (true) {
             case $this->option('versions'):
@@ -63,7 +66,7 @@ public function handle(): int
 
         $devlog = $this->parseDevlog($newVersion);
 
-        //TODO es soll nur erkennen, dass es neu ist
+        // TODO es soll nur erkennen, dass es neu ist
         foreach ($devlog as $package => $messages) {
             if ($this->packageComparisonService->isNewPackage($package)) {
                 $this->info("New package: {$package}");
@@ -75,7 +78,6 @@ public function handle(): int
 
     protected function showVersions(GitHubService $github): int
     {
-     
         $mainRepo = config('monorepo.public_repo', 'mooxphp/moox');
         $org = 'mooxphp';
 
@@ -106,27 +108,27 @@ protected function comparePackages(GitHubService $github): int
         $localPackages = collect(array_merge(
             \Illuminate\Support\Facades\File::directories(base_path($publicBasePath)),
             $privateBasePath !== 'disabled' ? \Illuminate\Support\Facades\File::directories(base_path($privateBasePath)) : []
-        ))->map(fn($dir) => basename($dir))
-          ->toArray();
+        ))->map(fn ($dir) => basename($dir))
+            ->toArray();
 
         $devlogCommits = $this->parseDevlog();
 
         $commitMessages = collect($localPackages)->mapWithKeys(function ($package) use ($devlogCommits) {
             if (isset($devlogCommits[$package])) {
                 return [$package => $devlogCommits[$package]];
             }
+
             return [$package => ['Compatibility release']];
         });
 
-       
-
         $this->packageComparisonService = new PackageComparisonService($github, config('monorepo.organization', 'mooxphp'));
         $devlinkPackages = $this->packageComparisonService->extractDevlinkPackages();
         $comparison = $this->packageComparisonService->comparePackagesWithRepositories($localPackages, $devlinkPackages);
         $this->table(
-            ['Org. Package', 'Has single Repo'  , 'Is in Devlink Config', 'Commit Messages'], 
-            $comparison->map(function($exists, $package) use ($devlinkPackages, $commitMessages) {
+            ['Org. Package', 'Has single Repo', 'Is in Devlink Config', 'Commit Messages'],
+            $comparison->map(function ($exists, $package) use ($devlinkPackages, $commitMessages) {
                 $messages = $commitMessages[strtolower($package)] ?? ['Not in Monorepo'];
+
                 return [
                     $package,
                     $exists ? '✅' : '❌',
@@ -145,31 +147,30 @@ public function askForNewVersion(string $currentVersion): string
             $this->info('No existing release found. Starting with version 0.0.1.');
             $currentVersion = '0.0.1';
             $suggestedVersion = $currentVersion;
-       
         } else {
             $this->info("Current version: {$currentVersion}");
             [$major, $minor, $patch] = explode('.', $currentVersion);
-            $suggestedVersion = "$major.$minor." . ((int)$patch + 1);
+            $suggestedVersion = "$major.$minor.".((int) $patch + 1);
         }
 
-       
-        $version = $this->ask("Enter the new version:", $suggestedVersion);
-        
+        $version = $this->ask('Enter the new version:', $suggestedVersion);
+
         if (! $this->validateVersionFormat($version)) {
             $this->error('Invalid version format. Please use X.X.X format.');
+
             return $this->askForNewVersion($currentVersion);
         }
-        
+
         if (! $this->validateVersionOrder($version, $currentVersion)) {
             $this->error('New version cannot be smaller than the current version.');
+
             return $this->askForNewVersion($currentVersion);
         }
-        
+
         return $version;
-    
     }
-    
-    //Helper methods
+
+    // Helper methods
     private function validateVersionFormat(string $version): bool
     {
         return preg_match('/^\\d+\\.\\d+\\.\\d+$/', $version);
@@ -192,7 +193,7 @@ protected function parseDevlog(): array
         foreach ($lines as $line) {
             if (preg_match('/^##\s+(.*)$/', $line, $matches)) {
                 $currentPackage = trim($matches[1]);
-                if (!isset($commits[strtolower($currentPackage)])) {
+                if (! isset($commits[strtolower($currentPackage)])) {
                     $commits[strtolower($currentPackage)] = [];
                 }
             } elseif ($currentPackage && preg_match('/^-\s+(.*)$/', $line, $matches)) {

packages/monorepo/src/Services/PackageComparisonService.php

@@ -7,6 +7,7 @@
 class PackageComparisonService
 {
     protected GitHubService $githubService;
+
     protected string $organization;
 
     public function __construct(GitHubService $githubService, string $organization)
@@ -27,33 +28,30 @@ public function comparePackagesWithRepositories(array $localPackages, array $dev
 
         return $comparison;
     }
-    
 
     public function extractNotPublishedPackages(Collection $comparison): Collection
     {
-        return $comparison->filter(fn($exists) => !$exists);
+        return $comparison->filter(fn ($exists) => ! $exists);
     }
 
     public function extractDevlinkPackages(): array
     {
         $devlinkConfig = config('devlink.packages');
+
         return array_keys($devlinkConfig);
     }
 
     public function isNewPackage(string $package): bool
     {
         $publicBasePath = config('devlink.public_base_path', '../moox/packages');
         $privateBasePath = config('devlink.private_base_path', 'disabled');
-        
+
         $localPackages = collect(array_merge(
             \Illuminate\Support\Facades\File::directories(base_path($publicBasePath)),
             $privateBasePath !== 'disabled' ? \Illuminate\Support\Facades\File::directories(base_path($privateBasePath)) : []
-        ))->map(fn($dir) => basename($dir))
-          ->toArray();
-          
-        return !in_array(strtolower($package), array_map('strtolower', $localPackages));
-            
-    }
-
+        ))->map(fn ($dir) => basename($dir))
+            ->toArray();
 
-} 
+        return ! in_array(strtolower($package), array_map('strtolower', $localPackages));
+    }
+}