Replace while loop with array_walk

laravel · Jun 14, 2024 · afc5300 · afc5300
1 parent 741560f
commit afc5300
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 28 deletions.
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -1151,13 +1151,9 @@ public function booted($callback)
      */
     protected function fireAppCallbacks(array &$callbacks)
     {
-        $index = 0;
-
-        while ($index < count($callbacks)) {
-            $callbacks[$index]($this);
-
-            $index++;
-        }
+        array_walk(
+            $callbacks, fn($callback) => $callback($this)
+        );
     }
 
     /**
@@ -1409,13 +1405,9 @@ public function terminating($callback)
      */
     public function terminate()
     {
-        $index = 0;
-
-        while ($index < count($this->terminatingCallbacks)) {
-            $this->call($this->terminatingCallbacks[$index]);
-
-            $index++;
-        }
+        array_walk(
+            $this->terminatingCallbacks, fn ($callback) => $this->call($callback)
+        );
     }
 
     /**

diff --git a/src/Illuminate/Support/ServiceProvider.php b/src/Illuminate/Support/ServiceProvider.php
@@ -104,13 +104,9 @@ public function booted(Closure $callback)
      */
     public function callBootingCallbacks()
     {
-        $index = 0;
-
-        while ($index < count($this->bootingCallbacks)) {
-            $this->app->call($this->bootingCallbacks[$index]);
-
-            $index++;
-        }
+        array_walk(
+            $this->bootingCallbacks, fn ($callback) => $this->app->call($callback)
+        );
     }
 
     /**
@@ -120,13 +116,9 @@ public function callBootingCallbacks()
      */
     public function callBootedCallbacks()
     {
-        $index = 0;
-
-        while ($index < count($this->bootedCallbacks)) {
-            $this->app->call($this->bootedCallbacks[$index]);
-
-            $index++;
-        }
+        array_walk(
+            $this->bootedCallbacks, fn($callback) => $this->app->call($callback)
+        );
     }
 
     /**

diff --git a/tests/Support/ServiceProviderTest.php b/tests/Support/ServiceProviderTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Illuminate\Tests\Support;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Support\ServiceProvider;
+use PHPUnit\Framework\TestCase;
+
+class ServiceProviderTest extends TestCase
+{
+    public function testItFiresBootingCallbacksSequentially ()
+    {
+        $provider = new StuffServiceProvider(
+            new Application()
+        );
+
+        $values = [];
+
+        $provider->booting(function () use (&$values) {
+            $values[] = 1;
+        });
+
+        $provider->booting(function () use (&$values) {
+            $values[] = 2;
+        });
+
+        $provider->booting(function () use (&$values) {
+            $values[] = 3;
+        });
+
+        $provider->callBootingCallbacks();
+
+        $this->assertSame([1, 2, 3], $values);
+    }
+
+    public function testItFiresBootedCallbacksSequentially ()
+    {
+        $provider = new StuffServiceProvider(
+            new Application()
+        );
+
+        $values = [];
+
+        $provider->booted(function () use (&$values) {
+            $values[] = 1;
+        });
+
+        $provider->booted(function () use (&$values) {
+            $values[] = 2;
+        });
+
+        $provider->booted(function () use (&$values) {
+            $values[] = 3;
+        });
+
+        $provider->callBootedCallbacks();
+
+        $this->assertSame([1, 2, 3], $values);
+    }
+}
+
+class StuffServiceProvider extends ServiceProvider
+{
+    //
+}