Merge pull request #1106 from hydephp/remove-internal-readyToBoot-handler

emmadesilva · web-flow · commit 594b4b0b03e2 · 2023-02-23T17:27:39.000+01:00
Remove internal readyToBoot handler
diff --git a/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php b/packages/framework/src/Foundation/Concerns/BootsHydeKernel.php
@@ -15,7 +15,6 @@
  */
 trait BootsHydeKernel
 {
-    private bool $readyToBoot = false;
     private bool $booting = false;
 
     /** @var array<callable> */
@@ -29,7 +28,7 @@ trait BootsHydeKernel
      */
     public function boot(): void
     {
-        if (! $this->readyToBoot || $this->booting) {
+        if ($this->booting) {
             return;
         }
 
@@ -82,13 +81,4 @@ public function booted(callable $callback): void
     {
         $this->bootedCallbacks[] = $callback;
     }
-
-    /** @internal */
-    public function readyToBoot(): void
-    {
-        // To give package developers ample time to register their services,
-        // don't want to boot the kernel until all providers have been registered.
-
-        $this->readyToBoot = true;
-    }
 }
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -56,6 +56,6 @@ public function register(): void
 
     public function boot(): void
     {
-        $this->kernel->readyToBoot();
+        //
     }
 }
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -414,7 +414,6 @@ public function test_can_register_booting_callback_closure()
             $this->assertTrue(true);
         });
 
-        $kernel->readyToBoot();
         $kernel->boot();
     }
 
@@ -426,7 +425,6 @@ public function test_can_register_booted_callback_closure()
             $this->assertTrue(true);
         });
 
-        $kernel->readyToBoot();
         $kernel->boot();
     }
 
@@ -436,7 +434,6 @@ public function test_can_register_booting_callback_callable()
 
         $kernel->booting(new CallableClass($this));
 
-        $kernel->readyToBoot();
         $kernel->boot();
     }
 
@@ -446,7 +443,6 @@ public function test_can_register_booted_callback_callable()
 
         $kernel->booted(new CallableClass($this));
 
-        $kernel->readyToBoot();
         $kernel->boot();
     }
 
@@ -458,7 +454,6 @@ public function test_booting_callback_receives_kernel_instance()
             $this->assertSame($kernel, $_kernel);
         });
 
-        $kernel->readyToBoot();
         $kernel->boot();
     }
 
@@ -470,7 +465,6 @@ public function test_booted_callback_receives_kernel_instance()
             $this->assertSame($kernel, $_kernel);
         });
 
-        $kernel->readyToBoot();
         $kernel->boot();
     }
 
@@ -483,7 +477,6 @@ public function test_can_use_booting_callbacks_to_inject_custom_pages()
             $kernel->pages()->addPage($page);
         });
 
-        $kernel->readyToBoot();
         $kernel->boot();
 
         $this->assertSame($page, $kernel->pages()->getPage('foo'));

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`trait BootsHydeKernel`
`17`	`17`	`{`
`18`		`- private bool $readyToBoot = false;`
`19`	`18`	`private bool $booting = false;`
`20`	`19`
`21`	`20`	`/** @var array<callable> */`
`@@ -29,7 +28,7 @@ trait BootsHydeKernel`
`29`	`28`	`*/`
`30`	`29`	`public function boot(): void`
`31`	`30`	`{`
`32`		`- if (! $this->readyToBoot \|\| $this->booting) {`
	`31`	`+ if ($this->booting) {`
`33`	`32`	`return;`
`34`	`33`	`}`
`35`	`34`
`@@ -82,13 +81,4 @@ public function booted(callable $callback): void`
`82`	`81`	`{`
`83`	`82`	`$this->bootedCallbacks[] = $callback;`
`84`	`83`	`}`
`85`		`-`
`86`		`- /** @internal */`
`87`		`- public function readyToBoot(): void`
`88`		`- {`
`89`		`- // To give package developers ample time to register their services,`
`90`		`- // don't want to boot the kernel until all providers have been registered.`
`91`		`-`
`92`		`- $this->readyToBoot = true;`
`93`		`- }`
`94`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ public function register(): void`
`56`	`56`
`57`	`57`	`public function boot(): void`
`58`	`58`	`{`
`59`		`- $this->kernel->readyToBoot();`
	`59`	`+ //`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,6 @@ public function test_can_register_booting_callback_closure()`
`414`	`414`	`$this->assertTrue(true);`
`415`	`415`	`});`
`416`	`416`
`417`		`- $kernel->readyToBoot();`
`418`	`417`	`$kernel->boot();`
`419`	`418`	`}`
`420`	`419`
`@@ -426,7 +425,6 @@ public function test_can_register_booted_callback_closure()`
`426`	`425`	`$this->assertTrue(true);`
`427`	`426`	`});`
`428`	`427`
`429`		`- $kernel->readyToBoot();`
`430`	`428`	`$kernel->boot();`
`431`	`429`	`}`
`432`	`430`
`@@ -436,7 +434,6 @@ public function test_can_register_booting_callback_callable()`
`436`	`434`
`437`	`435`	`$kernel->booting(new CallableClass($this));`
`438`	`436`
`439`		`- $kernel->readyToBoot();`
`440`	`437`	`$kernel->boot();`
`441`	`438`	`}`
`442`	`439`
`@@ -446,7 +443,6 @@ public function test_can_register_booted_callback_callable()`
`446`	`443`
`447`	`444`	`$kernel->booted(new CallableClass($this));`
`448`	`445`
`449`		`- $kernel->readyToBoot();`
`450`	`446`	`$kernel->boot();`
`451`	`447`	`}`
`452`	`448`
`@@ -458,7 +454,6 @@ public function test_booting_callback_receives_kernel_instance()`
`458`	`454`	`$this->assertSame($kernel, $_kernel);`
`459`	`455`	`});`
`460`	`456`
`461`		`- $kernel->readyToBoot();`
`462`	`457`	`$kernel->boot();`
`463`	`458`	`}`
`464`	`459`
`@@ -470,7 +465,6 @@ public function test_booted_callback_receives_kernel_instance()`
`470`	`465`	`$this->assertSame($kernel, $_kernel);`
`471`	`466`	`});`
`472`	`467`
`473`		`- $kernel->readyToBoot();`
`474`	`468`	`$kernel->boot();`
`475`	`469`	`}`
`476`	`470`
`@@ -483,7 +477,6 @@ public function test_can_use_booting_callbacks_to_inject_custom_pages()`
`483`	`477`	`$kernel->pages()->addPage($page);`
`484`	`478`	`});`
`485`	`479`
`486`		`- $kernel->readyToBoot();`
`487`	`480`	`$kernel->boot();`
`488`	`481`
`489`	`482`	`$this->assertSame($page, $kernel->pages()->getPage('foo'));`