Pagination Display Error Fix

Author: Fredrick Peter

README.md

@@ -108,7 +108,7 @@ Prior to installing `php-orm-database` get the [Composer](https://getcomposer.or
 **Step 1** — update your `composer.json`:
 ```composer.json
 "require": {
-    "peterson/php-orm-database": "^3.1.7" 
+    "peterson/php-orm-database": "^3.1.8"
 }
 ```
 
@@ -483,7 +483,6 @@ $db->tableExist('users');
 |  toArray()        |  `array` Convert items to array           |
 |  toObject()       |  `object` Convert items to object         |
 |  toJson()         |  `string` Convert items to json           |
-|  getQuery()       |  `object` Get Query information           |
 |  toSql()          |  `string` Sql Query String without execution |
 
 

composer.json

@@ -38,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "3.1.7-dev"
+            "dev-main": "3.1.8-dev"
         }
     },
     "minimum-stability": "stable",

src/Collections/Collection.php

@@ -125,10 +125,8 @@ public function has($key)
      */
     public function links(?array $options = [])
     {
-        if(self::$check_paginate){
-            if(self::$pagination){
-                self::$pagination->links($options);
-            }
+        if(self::$pagination){
+            self::$pagination->links($options);
         }
     }
 
@@ -140,10 +138,8 @@ public function links(?array $options = [])
      */
     public function showing(?array $options = [])
     {
-        if(self::$check_paginate){
-            if(self::$pagination){
-                self::$pagination->showing($options);
-            }
+        if(self::$pagination){
+            self::$pagination->showing($options);
         }
     }
 
@@ -155,8 +151,8 @@ public function showing(?array $options = [])
      */
     public function numbers(mixed $key = 0)
     {
-        $key = (int) $key + 1;
         if(self::$check_paginate){
+            $key        = (int) $key + 1;
             $pagination = $this->getPagination();
             return ($pagination->offset + $key);
         }

src/Collections/CollectionMapper.php

@@ -11,10 +11,28 @@
 
 class CollectionMapper implements IteratorAggregate, ArrayAccess
 {
+    /**
+     * Items attributes
+     * @var  mixed
+     */
     private $attributes;
-    private $getQuery;
+
+    /**
+     * Array index key
+     * @var  mixed
+     */
     private $key;
-    static private $check_paginate = false;
+
+    /**
+     * If pagination is true
+     * @var  bool
+     */
+    static private $is_paginate = false;
+
+    /**
+     * Pagination Instance
+     * @var  mixed
+     */
     static private $pagination;
 
     /**
@@ -24,14 +42,13 @@ class CollectionMapper implements IteratorAggregate, ArrayAccess
      */
     public function __construct($items = [], mixed $key = 0, ?bool $check_paginate = false, mixed $pagination = null)
     {
-        $this->attributes  = $this->convertOnInit($items);
-        $this->getQuery     = get_query();
+        $this->attributes   = $this->convertOnInit($items);
         $this->key          = ((int) $key + 1);
 
         // if pagination request is `true`
         if($check_paginate){
-            self::$check_paginate  = $check_paginate;
-            self::$pagination      = $pagination->pagination ?? null;
+            self::$is_paginate  = $check_paginate;
+            self::$pagination   = $pagination->pagination ?? null;
         }
     }
 
@@ -108,7 +125,7 @@ public function __isset($key)
      */
     public function getPagination()
     {
-        if(self::$check_paginate){
+        if(self::$is_paginate){
             $pagination = self::$pagination;
             return (object) [
                 'limit'         => (int) $pagination->limit,
@@ -128,7 +145,7 @@ public function getPagination()
      */
     public function numbers()
     {
-        if(self::$check_paginate){
+        if(self::$is_paginate){
             $pagination = $this->getPagination();
             return ($pagination->offset + $this->key);
         }
@@ -218,16 +235,6 @@ public function toJson()
         return json_encode( $this->attributes );
     }
 
-    /**
-     * Get database query
-     *
-     * @return array
-     */
-    public function getQuery()
-    {
-        return $this->getQuery;
-    }
-
     /**
      * Convert data to an array on Initializaiton
      * @param mixed $items

src/Collections/Traits/CollectionTrait.php

@@ -135,6 +135,13 @@ protected function wrapArrayIntoCollectionMappers(mixed $items)
 
         if (is_array($items) && count($items) > 0) {
             return array_map(function ($item, $key){
+                
+                // dd(
+                //     self::$pagination_data,
+                //     $this->items,
+                //     self::$pagination
+                // );
+
                 return new CollectionMapper($item, $key, self::$check_paginate, self::$pagination);
             }, $items, array_keys($items));
         }
@@ -266,16 +273,6 @@ public function toJson()
     {
         return json_encode($this->getItemsData());
     }
-
-    /**
-     * Get database query
-     *
-     * @return array
-     */
-    public function getQuery()
-    {
-        return get_query();
-    }
 
     /**
      * Check if items is an array