Collections Upgrade... Most stable of all versions

Author: Fredrick Peter

README.md

@@ -54,7 +54,7 @@ was pretty tough. So i decided to create a much more easier way of communicating
     * [Pagination Links Config](#pagination-links-config)
     * [Pagination Showing](#pagination-showing)
     * [Pagination Showing Config](#pagination-showing-config)
-    * [Pagination Numbers](#pagination-numbers)
+    * [Pagination Foreach Numbers](#pagination-foreach-numbers)
     * [Get Pagination](#get-pagination)
 * [Clause](#clause)
   * [Raw](#raw)
@@ -116,7 +116,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": "^4.2.0"
+    "peterson/php-orm-database": "^4.2.1"
 }
 ```
 
@@ -390,15 +390,16 @@ $db->table('post')
 
 ## Fetching Data
 
-| object name   |  Returns           |
-|---------------|--------------------|
-| get()         |  array of objects  |
-| first()       |  object            |
-| firstOrFail() |  object or exit with 404 status   |
-| count()       |  int               |
-| paginate()    |  array of objects  |
-| exists()      |  boolean `true` \| `false` |
-| tableExists() |  boolean `true` \| `false` |
+| object name       |  Returns                          |
+|-------------------|-----------------------------------|
+| get()             |  array of objects                 |
+| first()           |  object                           |
+| FirstOrCreate()   |  object or exit with 404 status   |
+| firstOrFail()     |  object or exit with 404 status   |
+| count()           |  int                              |
+| paginate()        |  array of objects                 |
+| exists()          |  boolean `true` \| `false`        |
+| tableExists()     |  boolean `true` \| `false`        |
 
 ### GET
 ```
@@ -563,17 +564,18 @@ http://domain.com/storage/[asset_file]?v=111111111
 
 
 ### Collection Methods
-|    Methods        |          Description                      |
-|-------------------|-------------------------------------------|
-|  getAttributes()  |  `array` Returns an array of data         |
-|  getOriginal()    |  `object` Returns an object of data       |
-|  isEmpty()        |  `boolean` `true \| false` If data is empty |
-|  isNotEmpty()     |  `opposite` of `->isEmpty()`              |
-|  count()          |  `int` count data in items collection     |
-|  toArray()        |  `array` Convert items to array           |
-|  toObject()       |  `object` Convert items to object         |
-|  toJson()         |  `string` Convert items to json           |
-|  toSql()          |  `string` Sql Query String without execution |
+|    Methods        |          Description                          |
+|-------------------|-----------------------------------------------|
+|  getAttributes()  |  `array` Returns an array of data             |
+|  getOriginal()    |  `object` Returns an object of data           |
+|  isEmpty()        |  `boolean` `true \| false` If data is empty   |
+|  isNotEmpty()     |  `opposite` of `->isEmpty()`                  |
+|  count()          |  `int` count data in items collection         |
+|  toArray()        |  `array` Convert items to array               |
+|  toObject()       |  `object` Convert items to object             |
+|  toJson()         |  `string` Convert items to json               |
+|  toSql()          |  `string` Sql Query String without execution  |
+|  dd()             |  `object` Returns dbQuery and exit the script |
 
 
 ### Collection Usage
@@ -731,9 +733,10 @@ $users->showing([
 ```
 </details>
 
-### Pagination Numbers
+### Pagination Foreach Numbers
 - Page numbering `starts counting from 1`
-    - This will format each numbers of data according to it's possition
+    - This will format all pagination items collections
+    - On each page, it starts counting from last pagination item number
 
 ```
 $users = $db->table('users')->paginate(20);

composer.json

@@ -19,9 +19,12 @@
         "php": ">=7.2.5",
         "vlucas/phpdotenv": "^5.3",
         "ezyang/htmlpurifier": "^4.16.0",
-        "symfony/var-dumper": "^4.4",
+        "symfony/var-dumper": "4.4.*",
         "filp/whoops": "^2.15",
-        "psr/log": "^1.1.4"
+        "psr/log": "^1.0"
+    },
+    "conflict": {
+        "symfony/var-dumper": "^6.0"
     },
     "autoload": {
         "files": [
@@ -39,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.2.0-dev"
+            "dev-main": "4.2.1-dev"
         }
     },
     "minimum-stability": "stable",

src/Collections/Collection.php

@@ -25,30 +25,25 @@
 class Collection extends CollectionProperty implements IteratorAggregate, ArrayAccess
 {
     use CollectionTrait, RelatedTrait;
-
-    /**
-     * The items contained in the collection.
-     *
-     * @var array
-     */
-    protected $items = [];
-    
 
     /**
      * Create a new collection.
      *
-     * @param  array $items
+     * @param  mixed $items
+     * @param  mixed $database Instance of ORM Database \builder\Database\DB
+     * - [optional] Used on ORM Database Only
+     * Meant for easy manupulation of collection instance
+     * This doesn't have affect on using this the Collection class on other projects
      */
-    public function __construct($items = [])
+    public function __construct(mixed $items = [], mixed $database = null)
     {
-        $this->unescapeIsObjectWithoutArray = self::checkProxiesType();
-        $this->items = $this->convertOnInit($items);
-
+        $this->database         = $database;
+        $this->isProxyAllowed   = self::checkProxiesType();
+        $this->items            = $this->convertOnInit($items);
+        
         // if pagination request is `true`
-        if(self::$is_paginate){
-            $tempItems          = $this->items;
-            $this->items        = $tempItems['data'] ?? [];
-            self::$pagination   = $tempItems['pagination'] ?? false;
+        if($this->isPaginate){
+            $this->pagination = $this->database;
         }
     }
 
@@ -62,7 +57,7 @@ public function getIterator() : Traversable
         // On interation (foreach) 
         // Wrap items into instance of CollectionMapper
         return new ArrayIterator(
-            $this->wrapArrayIntoCollectionMappers($this->items)
+            $this->wrapArrayIntoNewCollections()
         );
     }
 
@@ -74,8 +69,8 @@ public function getIterator() : Traversable
      */
     public function links(?array $options = [])
     {
-        if(self::$pagination){
-            self::$pagination->links($options);
+        if($this->pagination){
+            $this->pagination->links($options);
         }
     }
 
@@ -87,26 +82,9 @@ public function links(?array $options = [])
      */
     public function showing(?array $options = [])
     {
-        if(self::$pagination){
-            self::$pagination->showing($options);
-        }
-    }
-
-    /**
-     * Get Pagination Numbers
-     * @param mixed $key
-     *
-     * @return string
-     */
-    public function numbers(mixed $key = 0)
-    {
-        if(self::$is_paginate){
-            $key        = (int) $key + 1;
-            $pagination = $this->getPagination();
-            return ($pagination->offset + $key);
+        if($this->pagination){
+            $this->pagination->showing($options);
         }
-
-        return $key;
     }
 
 }

src/Collections/CollectionMapper.php

@@ -14,13 +14,6 @@
 class CollectionMapper extends CollectionProperty implements IteratorAggregate, ArrayAccess
 {
     use RelatedTrait;
-    
-    /**
-     * The items contained in the collection.
-     *
-     * @var array
-     */
-    protected $items = [];
 
     /**
      * Array index key
@@ -33,11 +26,18 @@ class CollectionMapper extends CollectionProperty implements IteratorAggregate,
      *
      * @param  mixed $items
      * @param  mixed $key
+     * @param  object\builder\Database\Collections\Collection
+     * - Instance of Collection
      */
-    public function __construct($items = [], mixed $key = 0)
+    public function __construct($items = [], mixed $key = 0, object $collection)
     {
-        $this->key    = ((int) $key + 1);
-        $this->items  = $this->convertMapperOnInit($items);
+        $this->key              = ((int) $key + 1);
+        $this->database         = $collection->database;
+        $this->isDBInstance     = $collection->isDBInstance;
+        $this->isPaginate       = $collection->isPaginate;
+        $this->pagination       = $collection->pagination;
+        $this->isProxyAllowed   = $collection->isProxyAllowed;
+        $this->items            = $this->convertOnInit($items, true);
     }
 
     /**
@@ -57,7 +57,7 @@ public function getIterator() : Traversable
      */
     public function numbers()
     {
-        if(self::$is_paginate){
+        if($this->isPaginate){
             $pagination = $this->getPagination();
             return ($pagination->offset + $this->key);
         }

src/Collections/CollectionProperty.php

@@ -16,50 +16,56 @@
 class CollectionProperty
 {
     /**
-     * Instance of Database fetch request method
+     * The items contained in the collection.
      *
      * @var mixed
      */
-    static protected $instance;
+    protected $items = [];
 
     /**
-     * Get pagination items
+     * Check if is object without array
      *
-     * @var mixed\builder\Database\DB
+     * @var bool
      */
-    static protected $pagination;
+    protected $isProxyAllowed = false;
 
     /**
      * If Instance of Database Pagination Method is true
      * @var mixed
      */
-    static protected $is_paginate = false;
+    protected $isPaginate = false;
 
     /**
-     * The methods that can be proxied.
+     * If Instance of \builder\Database\DB is true
+     * @var bool
+     */
+    protected $isDBInstance = false;
+
+    /**
+     * Get pagination items
      *
-     * @var array
+     * @var mixed\builder\Database\DB
      */
-    static protected $proxies = [
-        'get'       => ['get'],
-        'first'     => ['first', 'firstorcreate', 'firstorfail'],
-        'insert'    => ['insert', 'insertorignore'],
-        'paginate'  => ['paginate'],
-    ];
+    protected $pagination;
+    
+    /**
+     * Instance of ORM Database Class
+     *
+     * @var mixed\builder\Database\DB
+     */
+    protected $database;
 
     /**
      * The methods that can be proxied.
      *
      * @var array
      */
-    static protected $proxies_compact = [
-        'get',
+    static protected $proxies = [
         'first',
         'firstorcreate',
         'firstorfail',
         'insert',
         'insertorignore',
-        'paginate',
     ];
 
 }