Collection Updates On Global use

Author: Fredrick Peter

src/Collections/Collection.php

@@ -25,7 +25,7 @@
 class Collection extends CollectionProperty implements IteratorAggregate, ArrayAccess
 {
     use CollectionTrait, RelatedTrait;
-    
+
     /**
      * Create a new collection.
      *
@@ -40,7 +40,6 @@ public function __construct(mixed $items = [], mixed $database = null)
         $this->database         = $database;
         $this->isProxyAllowed   = self::checkProxiesType();
         $this->items            = $this->convertOnInit($items);
-        
         // if pagination request is `true`
         if($this->isPaginate){
             $this->pagination = $this->database;
@@ -54,11 +53,16 @@ public function __construct(mixed $items = [], mixed $database = null)
      */
     public function getIterator() : Traversable
     {
-        // On interation (foreach) 
+        // On interation of (foreach) 
         // Wrap items into instance of CollectionMapper
-        return new ArrayIterator(
-            $this->wrapArrayIntoNewCollections()
-        );
+        if(!$this->isProxyAllowed){
+            return new ArrayIterator(
+                $this->wrapArrayIntoNewCollections()
+            );
+        } else{
+            // disallow loop through Proxies items collections
+            return new ArrayIterator([]);
+        }
     }
 
     /**

src/Collections/CollectionMapper.php

@@ -29,7 +29,7 @@ class CollectionMapper extends CollectionProperty implements IteratorAggregate,
      * @param  object\builder\Database\Collections\Collection
      * - Instance of Collection
      */
-    public function __construct($items = [], mixed $key = 0, object $collection)
+    public function __construct(mixed $items = [], mixed $key = 0, object $collection = null)
     {
         $this->key              = ((int) $key + 1);
         $this->database         = $collection->database;

src/Collections/Traits/RelatedTrait.php

@@ -42,7 +42,7 @@ public function getPagination()
     public function toSql()
     {
         if($this->isDBInstance){
-            dd( $this->database->dbQuery()->stmt->queryString );
+            dump( $this->database->dbQuery()->stmt->queryString );
         }
     }
 
@@ -251,16 +251,37 @@ private function isArray()
      */ 
     private function convertOnInit(mixed $items = null)
     {
-        // For ORM Database Proxies Data
-        if ($this->isProxyAllowed || $this->isPaginate || is_array($items)) {
+        // For ORM Database Proxies and Paginate Data
+        // Convert to an array
+        if($this->isDBInstance){
             return json_decode(json_encode($items), true);
         } elseif($this->isValidJson($items)) {
             return json_decode($items, true);
-        }
+        } elseif($this->isNotValidArray($items)){
+            return json_decode(json_encode($items), true);
+        } 
 
         return $items;
     }
 
+    /**
+     * Check if data is not a valid array
+     *
+     * @param mixed $data
+     * @return bool
+     */
+    private function isNotValidArray(mixed $data = null)
+    {
+        if (!is_array($data)) {
+            return true;
+        }
+
+        // array filter
+        $filteredArray = array_filter($data, 'is_array');
+    
+        return count($filteredArray) === count($data);
+    }
+
     /**
      * Check if a string is valid JSON.
      *

src/Pagination/Yidas/PaginationLoader.php

@@ -127,16 +127,16 @@ function __construct($options=[])
         // Page fetching
         if ($this->page===null) {
 
-            $this->page = isset($_GET[$this->pageParam]) ? $_GET[$this->pageParam] : 1;
+            $this->page = isset($_GET[$this->pageParam]) ? (int) $_GET[$this->pageParam] : 1;
         }
 
         // PrePage fetching
         if (!isset($options[$this->perPageParam]) && $this->perPageParam && isset($_GET[$this->perPageParam])) {
 
             // Limit check
             $input = (int) $_GET[$this->perPageParam];
-            list($min, $max) = $this->perPageLimit;
-            $this->perPage = ($input <= $max && $input >= $min) ? $input : $this->perPage;
+            list($min, $max) = (int) $this->perPageLimit;
+            $this->perPage = ($input <= $max && $input >= $min) ? (int) $input : (int) $this->perPage;
         }
 
         $this->_init();
@@ -200,14 +200,12 @@ public function createUrl($page, $perPage=null)
      */
     protected function _init()
     {
-        $this->convertToIntegers();
-        
         // Format
-        $this->totalCount = ($this->totalCount > 0) ? floor($this->totalCount) : 0;
-        $this->perPage = ($this->perPage >= 1) ? floor($this->perPage) : 20;
-        $this->page = ($this->page >= 1) ? floor($this->page) : 1;
-        $this->pageCount = ceil($this->totalCount / $this->perPage);
-        $this->pageCount = ($this->pageCount > 0) ? $this->pageCount : 1;
+        $this->totalCount   = ($this->totalCount > 0) ? floor($this->totalCount) : 0;
+        $this->perPage      = ($this->perPage >= 1) ? floor($this->perPage) : 20;
+        $this->page         = ($this->page >= 1) ? floor($this->page) : 1;
+        $this->pageCount    = ceil($this->totalCount / $this->perPage);
+        $this->pageCount    = ($this->pageCount > 0) ? $this->pageCount : 1;
 
         // Validate page
         if ($this->validatePage) {
@@ -217,6 +215,8 @@ protected function _init()
         $this->offset = $this->perPage * ($this->page - 1);
         // Limit ignores (total - offset)
         $this->limit = $this->perPage;
+
+        $this->convertToIntegers();
     }
 
     /**
@@ -227,6 +227,8 @@ protected function _init()
     protected function convertToIntegers()
     {
         // Format
+        $this->limit        = (int) $this->limit;
+        $this->offset       = (int) $this->offset;
         $this->page         = (int) $this->page;
         $this->perPage      = (int) $this->perPage;
         $this->pageCount    = (int) $this->pageCount;

src/Traits/ServerTrait.php

@@ -242,7 +242,7 @@ static private function getDirectRootPath()
         if (strpos($currentScript, $documentRoot) === 0) {
             $projectRootPath = substr($currentScript, strlen($documentRoot));
             $projectRootPath = trim($projectRootPath, '/');
-            $projectRootPath = substr($projectRootPath, 0, strpos($projectRootPath, '/'));
+            $projectRootPath = substr($projectRootPath, 0, (int) strpos($projectRootPath, '/'));
             $projectRootPath = $documentRoot . '/' . $projectRootPath;
 
             // if not directory then get the directory of the path link