Merge branch 'main' into bump-auth-dep

Author: bshaffer

.github/workflows/asset-release.yml

@@ -3,6 +3,7 @@ name: Add Release Assets
 on:
     release:
         types: [published]
+    workflow_dispatch:
 
 jobs:
     asset:

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.18.3](https://github.com/googleapis/google-api-php-client/compare/v2.18.2...v2.18.3) (2025-04-08)
+
+
+### Bug Fixes
+
+* Convert Finder lazy iterator to array before deletion ([#2663](https://github.com/googleapis/google-api-php-client/issues/2663)) ([c699405](https://github.com/googleapis/google-api-php-client/commit/c6994051af1568359c97d267d9ef34ccbda31387))
+
 ## [2.18.2](https://github.com/googleapis/google-api-php-client/compare/v2.18.1...v2.18.2) (2024-12-16)
 
 

README.md

@@ -44,7 +44,7 @@ composer installed.
 Once composer is installed, execute the following command in your project root to install this library:
 
 ```sh
-composer require google/apiclient:^2.15.0
+composer require google/apiclient
 ```
 
 If you're facing a timeout error then either increase the timeout for composer by adding the env flag as `COMPOSER_PROCESS_TIMEOUT=600 composer install` or you can put this in the `config` section of the composer schema:

examples/README.md

@@ -10,10 +10,3 @@
     ```
 
 1. Point your browser to the host and port you specified, i.e `http://localhost:8000`.
-
-## G Suite OAuth Samples
-
-G Suite APIs such as Slides, Sheets, and Drive use 3-legged OAuth authentification.
-Samples using OAuth can be found here:
-
-https://github.com/gsuitedevs/php-samples

src/Task/Composer.php

@@ -34,35 +34,37 @@ public static function cleanup(
     ) {
         $composer = $event->getComposer();
         $extra = $composer->getPackage()->getExtra();
-        $servicesToKeep = isset($extra['google/apiclient-services'])
-            ? $extra['google/apiclient-services']
-            : [];
-        if ($servicesToKeep) {
-            $vendorDir = $composer->getConfig()->get('vendor-dir');
+        $servicesToKeep = $extra['google/apiclient-services'] ?? [];
+        if (empty($servicesToKeep)) {
+            return;
+        }
+        $vendorDir = $composer->getConfig()->get('vendor-dir');
+        $serviceDir = sprintf(
+            '%s/google/apiclient-services/src/Google/Service',
+            $vendorDir
+        );
+        if (!is_dir($serviceDir)) {
+            // path for google/apiclient-services >= 0.200.0
             $serviceDir = sprintf(
-                '%s/google/apiclient-services/src/Google/Service',
+                '%s/google/apiclient-services/src',
                 $vendorDir
             );
-            if (!is_dir($serviceDir)) {
-                // path for google/apiclient-services >= 0.200.0
-                $serviceDir = sprintf(
-                    '%s/google/apiclient-services/src',
-                    $vendorDir
-                );
-            }
-            self::verifyServicesToKeep($serviceDir, $servicesToKeep);
-            $finder = self::getServicesToRemove($serviceDir, $servicesToKeep);
-            $filesystem = $filesystem ?: new Filesystem();
-            if (0 !== $count = count($finder)) {
-                $event->getIO()->write(
-                    sprintf('Removing %s google services', $count)
-                );
-                foreach ($finder as $file) {
-                    $realpath = $file->getRealPath();
-                    $filesystem->remove($realpath);
-                    $filesystem->remove($realpath . '.php');
-                }
-            }
+        }
+        self::verifyServicesToKeep($serviceDir, $servicesToKeep);
+        $finder = self::getServicesToRemove($serviceDir, $servicesToKeep);
+        $filesystem = $filesystem ?: new Filesystem();
+        $servicesToRemoveCount = $finder->count();
+        if (0 === $servicesToRemoveCount) {
+            return;
+        }
+        $event->getIO()->write(
+            sprintf('Removing %d google services', $servicesToRemoveCount)
+        );
+        $pathsToRemove = iterator_to_array($finder);
+        foreach ($pathsToRemove as $pathToRemove) {
+            $realpath = $pathToRemove->getRealPath();
+            $filesystem->remove($realpath);
+            $filesystem->remove($realpath . '.php');
         }
     }