Refactor

Author: mnapoli

src/Cli/IO.php

@@ -98,6 +98,11 @@ public static function error(Throwable $e, bool $logStackTrace = true): void
         ]);
     }
 
+    public static function warning(string $message): void
+    {
+        self::writeln(Styles::bold(Styles::bgYellow(' ! ')) . ' ' . Styles::yellow($message));
+    }
+
     public static function enableVerbose(): void
     {
         if (self::$verboseMode) return;

src/Commands/Deploy.php

@@ -58,14 +58,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             sprintf("Deploying %s to environment %s", Styles::bold($appName), Styles::bold($environment)),
         ]);
 
-        // Analyze dependencies for optimization warnings
         $dependencyWarnings = DependencyAnalyzer::analyzeComposerDependencies();
         if (!empty($dependencyWarnings)) {
-            IO::writeln(['']);
+            IO::writeln('');
             foreach ($dependencyWarnings as $warning) {
-                IO::writeln(Styles::yellow('⚠ ' . $warning));
+                IO::warning($warning);
             }
-            IO::writeln(['']);
+            IO::writeln('');
         }
 
         IO::spin('creating deployment');

src/Helpers/DependencyAnalyzer.php

@@ -34,16 +34,22 @@ public static function analyzeComposerDependencies(string $composerJsonPath = 'c
                 return [];
             }
 
-            // Check for AWS SDK
-            if (isset($require['aws/aws-sdk-php'])) {
+            // Check for AWS SDK in composer.json or vendor directory
+            $hasAwsSdk = isset($require['aws/aws-sdk-php']) || 
+                         (is_dir('vendor/aws/aws-sdk-php') && file_exists('vendor/aws/aws-sdk-php/composer.json'));
+            
+            if ($hasAwsSdk) {
                 $isOptimized = self::isAwsSdkOptimized($composer);
                 if (!$isOptimized) {
                     $warnings[] = 'AWS SDK detected - optimize your deployment size: https://github.com/aws/aws-sdk-php/tree/master/src/Script/Composer';
                 }
             }
 
-            // Check for Google SDK
-            if (isset($require['google/apiclient']) || isset($require['google/cloud'])) {
+            // Check for Google SDK in composer.json or vendor directory
+            $hasGoogleSdk = isset($require['google/apiclient']) || 
+                           (is_dir('vendor/google/apiclient') && file_exists('vendor/google/apiclient/composer.json'));
+            
+            if ($hasGoogleSdk) {
                 $isOptimized = self::isGoogleSdkOptimized($composer);
                 if (!$isOptimized) {
                     $warnings[] = 'Google SDK detected - optimize your deployment size: https://github.com/googleapis/google-api-php-client#cleaning-up-unused-services';
@@ -68,18 +74,12 @@ private static function isAwsSdkOptimized(array $composer): bool
         if (is_array($scripts) && isset($scripts['pre-autoload-dump'])) {
             $preAutoloadDump = (array) $scripts['pre-autoload-dump'];
             foreach ($preAutoloadDump as $script) {
-                if (is_string($script) && str_contains($script, 'aws-sdk-php') && str_contains($script, 'remove-unused-services')) {
+                if (is_string($script) && str_contains($script, 'Aws\\Script\\Composer\\Composer::removeUnusedServices')) {
                     return true;
                 }
             }
         }
 
-        // Check for custom AWS SDK optimizations in extra section
-        $extra = $composer['extra'] ?? [];
-        if (is_array($extra) && isset($extra['aws']) && is_array($extra['aws']) && isset($extra['aws']['includes'])) {
-            return true;
-        }
-
         return false;
     }
 
@@ -94,18 +94,12 @@ private static function isGoogleSdkOptimized(array $composer): bool
         if (is_array($scripts) && isset($scripts['pre-autoload-dump'])) {
             $preAutoloadDump = (array) $scripts['pre-autoload-dump'];
             foreach ($preAutoloadDump as $script) {
-                if (is_string($script) && str_contains($script, 'google') && str_contains($script, 'remove-unused-services')) {
+                if (is_string($script) && str_contains($script, 'Google\\Task\\Composer::cleanup')) {
                     return true;
                 }
             }
         }
 
-        // Check for custom Google SDK optimizations in extra section
-        $extra = $composer['extra'] ?? [];
-        if (is_array($extra) && isset($extra['google']) && is_array($extra['google']) && isset($extra['google']['exclude_files'])) {
-            return true;
-        }
-
         return false;
     }
 }