🎨 Fix discrepancies introduced in #298

Log1x · Jan 18, 2025 · b3c2cfd · b3c2cfd
1 parent 2ec29a7
commit b3c2cfd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/AcfComposer.php b/src/AcfComposer.php
@@ -67,7 +67,7 @@ class AcfComposer
     /**
      * Create a new Composer instance.
      */
-    public function __construct(protected Application $app)
+    public function __construct(public Application $app)
     {
         $this->manifest = Manifest::make($this);
     }

diff --git a/src/Composer.php b/src/Composer.php
@@ -15,11 +15,6 @@ abstract class Composer implements ComposerContract
 {
     use HasCollection, InteractsWithPartial;
 
-    /**
-     * The ACF Composer instance.
-     */
-    protected AcfComposer $composer;
-
     /**
      * The application instance.
      */
@@ -43,10 +38,9 @@ abstract class Composer implements ComposerContract
     /**
      * Create a new Composer instance.
      */
-    public function __construct(AcfComposer $composer)
+    public function __construct(protected AcfComposer $composer)
     {
-        $this->composer = $composer;
-        $this->app = $composer->app;
+        $this->app = $this->composer->app;
 
         $this->defaults = $this->collect($this->app->config->get('acf.defaults'))
             ->merge($this->defaults)
@@ -83,7 +77,7 @@ public function handle(): self
     protected function call(string $hook): mixed
     {
         if (! method_exists($this, $hook)) {
-            return;
+            return null;
         }
 
         return $this->app->call([$this, $hook]);