Fixed tests

Author: voidgraphics

.gitignore

@@ -21,3 +21,4 @@ Homestead.yaml
 Homestead.json
 /.vagrant
 .phpunit.result.cache
+.phpunit.cache/test-results

src/Concerns/HasLayoutInstances.php

@@ -132,7 +132,7 @@ public function instancesValues() : array
      * @param null|string $key
      * @return int
      */
-    public function count(?string $key = null)
+    public function count(?string $key = null): int
     {
         if(! $this->instances) {
             return 0;

src/Concerns/HasLayouts.php

@@ -25,7 +25,7 @@ trait HasLayouts
      * @param null|int $limit
      * @return $this
      */
-    public function register($layout, int $limit = null) : Flexible
+    public function register(string|Layout|callable $layout, ?int $limit = null) : Flexible
     {
         if(is_string($layout) && is_a($layout, Layout::class, true)) {
             $layout = new $layout;

src/Contracts/Flexible.php

@@ -14,7 +14,7 @@ interface Flexible
      * @param null|int $limit
      * @return $this
      */
-    public function register($layout, int $limit = null) : Flexible;
+    public function register(string|Layout|callable $layout, ?int $limit = null) : Flexible;
 
     /**
      * Check if the Flexible container has a defined layout for given key.
@@ -94,5 +94,5 @@ public function instancesValues() : array;
      * @param null|string $key
      * @return int
      */
-    public function count(?string $key = null);
+    public function count(?string $key = null): int;
 }

src/Exceptions/InvalidLayoutKeyException.php

@@ -15,7 +15,7 @@ class InvalidLayoutKeyException extends InvalidArgumentException
      * @param bool $exists
      * @return \InvalidArgumentException
      */
-    static public function make(Layout $layout, string $key = null, $exists = false) : InvalidArgumentException
+    static public function make(Layout $layout, ?string $key = null, bool $exists = false) : InvalidArgumentException
     {
         $classname = get_class($layout);
 

src/Layout.php

@@ -17,6 +17,13 @@ class Layout implements LayoutInterface, ArrayAccess, JsonSerializable, Arrayabl
     use HasAttributes;
     use HidesAttributes;
 
+    /**
+     * Indicates if the model exists.
+     *
+     * @var bool
+     */
+    public $exists = false;
+
     /**
      * A short unique name for this Layout, usually used by front-end components
      *
@@ -331,6 +338,26 @@ public function toButtonArray() : array
         ];
     }
 
+    /**
+     * This method is called by the HasAttributes trait, and is usually
+     * defined on a model class. In this case, we don't need to handle
+     * it, but we do need to have the method to avoid errors.
+     */
+    public function relationResolver($classname, $key)
+    {
+        return false;
+    }
+
+    /**
+     * This method is called by the HasAttributes trait, and is usually
+     * defined on a model class. In this case, we don't need to handle
+     * it, but we do need to have the method to avoid errors.
+     */
+    public function preventsAccessingMissingAttributes()
+    {
+        return false;
+    }
+
     /**
      * Transform layout for front-end serialization (AJAX requests usage).
      *

tests/Unit/LayoutRegistrationTest.php

@@ -7,6 +7,7 @@
 use Whitecube\LaravelFlexibleContent\Exceptions\InvalidLayoutException;
 use Whitecube\LaravelFlexibleContent\Exceptions\InvalidLayoutKeyException;
 use Tests\Fixtures\CustomLayout;
+use TypeError;
 
 it('can register and configure a basic layout using a closure as argument', function() {
     $flexible = new Flexible();
@@ -57,7 +58,7 @@
     $flexible = new Flexible();
 
     $flexible->register(new Flexible());
-})->throws(InvalidLayoutException::class);
+})->throws(TypeError::class);
 
 it('cannot register a layout without defined key', function() {
     $flexible = new Flexible();