More test (#7)

* WIP: More test * [ci skip] Fix styling * WIP: Skip test fix later * WIP: Fix deprecated: Return type * WIP: fix deprecated: Return type * WIP: Fix deprecated: Return type * WIP: Fix deprecated: Return type * WIP: Fix getDictionaryKey attribute * WIP: Fix deprecated: Return type Co-authored-by: agungsugiarto <[email protected]>
agungsugiarto · Mar 6, 2022 · a7e1b61 · a7e1b61
1 parent 0e98af6
commit a7e1b61
Show file tree

Hide file tree

Showing 19 changed files with 1,689 additions and 1 deletion.
diff --git a/src/Casts/ArrayObject.php b/src/Casts/ArrayObject.php
@@ -33,6 +33,7 @@ public function toArray()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->getArrayCopy();

diff --git a/src/Factory.php b/src/Factory.php
@@ -234,6 +234,7 @@ public function load($path)
      * @param  string  $offset
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return isset($this->definitions[$offset]);
@@ -245,6 +246,7 @@ public function offsetExists($offset)
      * @param  string  $offset
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->make($offset);
@@ -257,6 +259,7 @@ public function offsetGet($offset)
      * @param  callable  $value
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->define($offset, $value);
@@ -268,6 +271,7 @@ public function offsetSet($offset, $value)
      * @param  string  $offset
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->definitions[$offset]);

diff --git a/src/Model.php b/src/Model.php
@@ -1394,6 +1394,7 @@ public function toJson($options = 0)
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();
@@ -1851,6 +1852,7 @@ public function __set($key, $value)
      * @param  mixed  $offset
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return ! is_null($this->getAttribute($offset));
@@ -1862,6 +1864,7 @@ public function offsetExists($offset)
      * @param  mixed  $offset
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->getAttribute($offset);
@@ -1874,6 +1877,7 @@ public function offsetGet($offset)
      * @param  mixed  $value
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->setAttribute($offset, $value);
@@ -1885,6 +1889,7 @@ public function offsetSet($offset, $value)
      * @param  mixed  $offset
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         unset($this->attributes[$offset], $this->relations[$offset]);

diff --git a/src/Pagination/AbstractCursorPaginator.php b/src/Pagination/AbstractCursorPaginator.php
@@ -465,6 +465,7 @@ public static function viewFactory()
      *
      * @return \ArrayIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return $this->items->getIterator();
@@ -495,6 +496,7 @@ public function isNotEmpty()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->items->count();
@@ -539,6 +541,7 @@ public function getOptions()
      * @param  mixed  $key
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($key)
     {
         return $this->items->has($key);
@@ -550,6 +553,7 @@ public function offsetExists($key)
      * @param  mixed  $key
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($key)
     {
         return $this->items->get($key);
@@ -562,6 +566,7 @@ public function offsetGet($key)
      * @param  mixed  $value
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         $this->items->put($key, $value);
@@ -573,6 +578,7 @@ public function offsetSet($key, $value)
      * @param  mixed  $key
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         $this->items->forget($key);

diff --git a/src/Pagination/AbstractPaginator.php b/src/Pagination/AbstractPaginator.php
@@ -617,6 +617,7 @@ public static function useBootstrapThree()
      *
      * @return \ArrayIterator
      */
+    #[\ReturnTypeWillChange]
     public function getIterator()
     {
         return $this->items->getIterator();
@@ -647,6 +648,7 @@ public function isNotEmpty()
      *
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return $this->items->count();
@@ -691,6 +693,7 @@ public function getOptions()
      * @param  mixed  $key
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($key)
     {
         return $this->items->has($key);
@@ -702,6 +705,7 @@ public function offsetExists($key)
      * @param  mixed  $key
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($key)
     {
         return $this->items->get($key);
@@ -714,6 +718,7 @@ public function offsetGet($key)
      * @param  mixed  $value
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($key, $value)
     {
         $this->items->put($key, $value);
@@ -725,6 +730,7 @@ public function offsetSet($key, $value)
      * @param  mixed  $key
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($key)
     {
         $this->items->forget($key);

diff --git a/src/Pagination/CursorPaginator.php b/src/Pagination/CursorPaginator.php
@@ -142,6 +142,7 @@ public function toArray()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();

diff --git a/src/Pagination/LengthAwarePaginator.php b/src/Pagination/LengthAwarePaginator.php
@@ -213,6 +213,7 @@ public function toArray()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();

diff --git a/src/Pagination/Paginator.php b/src/Pagination/Paginator.php
@@ -158,6 +158,7 @@ public function toArray()
      *
      * @return array
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->toArray();

diff --git a/src/Relations/Concerns/InteractsWithDictionary.php b/src/Relations/Concerns/InteractsWithDictionary.php
@@ -2,6 +2,7 @@
 
 namespace Fluent\Orm\Relations\Concerns;
 
+use BackedEnum;
 use Doctrine\Instantiator\Exception\InvalidArgumentException;
 
 trait InteractsWithDictionary
@@ -21,6 +22,11 @@ protected function getDictionaryKey($attribute)
                 return $attribute->__toString();
             }
 
+            if (function_exists('enum_exists') &&
+                $attribute instanceof BackedEnum) {
+                return $attribute->value;
+            }
+
             throw new InvalidArgumentException('Model attribute value is an object but does not have a __toString method.');
         }
 

diff --git a/src/Relations/MorphTo.php b/src/Relations/MorphTo.php
@@ -3,6 +3,7 @@
 namespace Fluent\Orm\Relations;
 
 use BadMethodCallException;
+use CodeIgniter\Database\Config;
 use Fluent\Orm\Builder;
 use Fluent\Orm\Collection;
 use Fluent\Orm\Model;
@@ -186,7 +187,7 @@ public function createModelByType($type)
 
         return tap(new $class(), function ($instance) {
             if (! $instance->getConnectionName()) {
-                $instance->setConnection($this->getConnection()->getName());
+                $instance->setConnection(array_keys(Config::getConnections())[0]);
             }
         });
     }

diff --git a/src/Support/Stringable.php b/src/Support/Stringable.php
@@ -826,6 +826,7 @@ public function dd()
      *
      * @return string
      */
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return $this->__toString();