added composer patches support, updated collections and base models, fixes

Author: degami

.gitignore

@@ -2,6 +2,7 @@
 .phpdoc
 composer.lock
 package-lock.json
+patches.lock.json
 docs
 vendor
 node_modules/
@@ -45,4 +46,4 @@ assets/rsa_private.key
 assets/rsa_private.csr
 assets/rsa_private.pem
 docker/database/data
-docker/elasticsearch/data
+docker/elasticsearch/data

app/base/abstracts/Models/BaseCollection.php

@@ -49,11 +49,6 @@ class BaseCollection extends ContainerAwareObject implements ArrayAccess, Iterat
      */
     protected ?Result $stmt = null;
 
-    /**
-     * @var array objects cache
-     */
-    protected static array $loadedObjects = [];
-
 
     public function __construct(
         protected ContainerInterface $container,
@@ -153,7 +148,7 @@ public function addOrder($order = []) : static
                 }
             }
         } else {
-            $this->stmt = $this->getSelect()->orderBy('id');
+            $this->stmt = $this->getSelect()->orderBy($this->getContainer()->call([$this->className, 'getKeyField']));
         }
 
         return $this;
@@ -215,7 +210,6 @@ public function load() : static
             $this->items = [];
             foreach($this->getContainer()->call([$this->className, 'hydrateStatementResult'], ['stmt' => $this->getSelect()]) as $item) {
                 $this->items[$item->getId()] = $item;
-                static::$loadedObjects[$this->getTableName()][$item->getId()] = $item;
             }
 
             if (getenv('DEBUG')) {
@@ -246,7 +240,6 @@ public function getFirst()
             return null;
         }
 
-        static::$loadedObjects[$this->getTableName()][$item->getId()] = $item;
         return $item;
     }
 
@@ -408,7 +401,6 @@ public function paginate(Request $request, $page_size = self::ITEMS_PER_PAGE): a
         $this->items = [];
         foreach ($this->getContainer()->call([$this->className, 'hydrateStatementResult'], ['stmt' => $this->getSelect()->limit($page_size, $start)]) as $item) {
             $this->items[$item->getId()] = $item;
-            static::$loadedObjects[$this->getTableName()][$item->getId()] = $item;
         }
 
         $out = ['items' => $this->getItems(), 'page' => $page, 'total' => $total];

app/base/abstracts/Models/BaseModel.php

@@ -29,6 +29,7 @@
 use App\Base\Abstracts\ContainerAwareObject;
 use App\Base\Exceptions\InvalidValueException;
 use Exception;
+use League\Plates\Template\Func;
 
 /**
  * A wrapper for LessQL Row
@@ -61,6 +62,8 @@ abstract class BaseModel extends ContainerAwareObject implements ArrayAccess, It
      */
     protected static array $loadedObjects = [];
 
+    protected static string|array $keyField = 'id';
+
     /**
      * {@inheritdocs}
      *
@@ -224,7 +227,7 @@ protected static function getModelBasicWhere($condition = [], $order = []): Resu
                 }
             }
         } else {
-            $stmt = $stmt->orderBy('id');
+            $stmt = $stmt->orderBy(static::getKeyField());
         }
 
         return $stmt;
@@ -241,6 +244,33 @@ public static function defaultTableName(): string
         return strtolower(static::pascalCaseToSnakeCase(array_pop($path)));
     }
 
+    public static Function getKeyField() : string|array
+    {
+        return static::$keyField;
+    }
+
+    protected static function loadedObjectsIdentifier($id)
+    {
+        if (is_array(static::getKeyField())) {
+            return implode("|", array_map(function($column, $value) {
+                return $column.':'.$value;
+            }, static::getKeyField(), $id));
+        }
+
+        return static::getKeyField().':'.$id;
+    }
+
+    public function getKeyFieldValue() : mixed
+    {
+        if (!is_array(static::getKeyField())) {
+            return $this->getData(static::getKeyField());
+        }
+
+        return array_combine(static::getKeyField(), array_map(function($column) {
+            return $this->getData($column);
+        }, static::getKeyField()));
+    }
+
     /**
      * fills empty model with data
      *
@@ -340,14 +370,21 @@ public static function load($id, $reset = false): BaseModel
             $debugbar['time']->startMeasure($measure_key);
         }
 
-        if (isset(static::$loadedObjects[static::defaultTableName()][$id]) && !$reset) {
+        if (isset(static::$loadedObjects[static::defaultTableName()][static::loadedObjectsIdentifier($id)]) && !$reset) {
             if (getenv('DEBUG')) {
                 $debugbar['time']->stopMeasure($measure_key);
             }
-            return static::$loadedObjects[static::defaultTableName()][$id];
+            return static::$loadedObjects[static::defaultTableName()][static::loadedObjectsIdentifier($id)];
+        }
+
+        $keyField = static::getKeyField();
+        if (is_array($keyField)) {
+            $condition = array_combine($keyField, $id);
+        } else {
+            $condition = [$keyField => $id];
         }
 
-        $object = $container->call([static::class, 'loadByCondition'], ['condition' => ['id' => $id]]);
+        $object = $container->call([static::class, 'loadByCondition'], ['condition' => $condition]);
 
         if (getenv('DEBUG')) {
             $debugbar['time']->stopMeasure($measure_key);
@@ -383,13 +420,13 @@ public static function loadByCondition(array $condition): ?BaseModel
             throw new BasicException('Model not found');
         }
 
-        static::$loadedObjects[static::defaultTableName()][$db_row->id] = $container->make(static::class, ['db_row' => $db_row]);
+        static::$loadedObjects[static::defaultTableName()][static::loadedObjectsIdentifier($db_row->id)] = $container->make(static::class, ['db_row' => $db_row]);
 
         if (getenv('DEBUG')) {
             $debugbar['time']->stopMeasure($measure_key);
         }
 
-        return static::$loadedObjects[static::defaultTableName()][$db_row->id];
+        return static::$loadedObjects[static::defaultTableName()][static::loadedObjectsIdentifier($db_row->id)];
     }
 
     /**

app/base/tools/Plates/SiteBase.php

@@ -39,6 +39,11 @@ class SiteBase implements ExtensionInterface
      */
     protected Engine $engine;
 
+    /**
+     * @var Website|null current website cached element
+     */
+    protected static $currentWebsite = null;
+
     /**
      * constructor
      *
@@ -80,7 +85,10 @@ public function getObject(): SiteBase
      */
     public function getCurrentWebsite(): ?Website
     {
-        return $this->getSiteData()->getCurrentWebsite();
+        if (is_null(static::$currentWebsite)) {
+            static::$currentWebsite = $this->getSiteData()->getCurrentWebsite();
+        }
+        return static::$currentWebsite;
     }
 
     /**

app/base/tools/Utils/SiteData.php

@@ -63,11 +63,22 @@ public function currentServerName(): ?string
      * @throws NotFoundException
      */
     public function getCurrentWebsite(): ?Website
-    {
+    {        
         if ($this->getAppWebsite() instanceof Website && $this->getAppWebsite()->isLoaded()) {
             return $this->getAppWebsite();
         }
 
+        $container = $this->getContainer();
+
+        /** @var DebugBar $debugbar */
+        $debugbar = $container->get('debugbar');
+
+        $measure_key = 'SiteData getCurrentWebsite';
+
+        if (getenv('DEBUG')) {
+            $debugbar['time']->startMeasure($measure_key);
+        }
+
         $website = null;
         if (php_sapi_name() == 'cli-server' || php_sapi_name() == 'cli') {
             $website = $this->getContainer()->call([Website::class, 'load'], ['id' => getenv('website_id')]);
@@ -78,6 +89,10 @@ public function getCurrentWebsite(): ?Website
             $website = $this->getContainer()->make(Website::class, ['db_row' => $db_row]);
         }
 
+        if (getenv('DEBUG')) {
+            $debugbar['time']->stopMeasure($measure_key);
+        }
+
         if ($website instanceof Website) {
             // register into container
             $this->getContainer()->set(Website::class, $website);

composer.json

@@ -43,7 +43,8 @@
         "spatie/array-to-xml": "^2.11",
         "elasticsearch/elasticsearch": "~7.0",
         "mathiasverraes/classfunctions": "^1.1@dev",
-        "phpgangsta/googleauthenticator": "dev-master"
+        "phpgangsta/googleauthenticator": "dev-master",
+        "cweagans/composer-patches": "dev-main"
     },
   "autoload": {
     "files": [
@@ -72,5 +73,18 @@
   },
     "require-dev": {
         "maximebf/debugbar": "^1.15"
-    }
+    },
+    "config": {
+        "allow-plugins": {
+            "cweagans/composer-patches": true
+        }
+    },
+    "extra": {
+      "composer-exit-on-patch-failure": true,
+      "patches": {
+          "maximebf/debugbar": {
+              "fixes sql queries not shown due to js errors": "patches/debugbar_sql.patch"
+          }
+      }
+  }
 }

patches/debugbar_sql.patch

@@ -0,0 +1,20 @@
+--- a/src/DebugBar/Resources/widgets/sqlqueries/widget.js	2024-04-13 14:49:54.902665978 +0200
++++ b/src/DebugBar/Resources/widgets/sqlqueries/widget.js	2024-04-13 14:50:43.998929879 +0200
+@@ -70,10 +70,14 @@
+             var filters = [], self = this;
+ 
+             this.$list = new PhpDebugBar.Widgets.ListWidget({ itemRenderer: function(li, stmt) {
+-                if (stmt.type === 'transaction') {
++                try {
++                    if (stmt.type === 'transaction') {
++                        $('<strong />').addClass(csscls('sql')).addClass(csscls('name')).text(stmt.sql).appendTo(li);
++                    } else {
++                        $('<code />').addClass(csscls('sql')).html(PhpDebugBar.Widgets.highlight(stmt.sql, 'sql')).appendTo(li);
++                    }    
++                } catch (Exception) {
+                     $('<strong />').addClass(csscls('sql')).addClass(csscls('name')).text(stmt.sql).appendTo(li);
+-                } else {
+-                    $('<code />').addClass(csscls('sql')).html(PhpDebugBar.Widgets.highlight(stmt.sql, 'sql')).appendTo(li);
+                 }
+                 if (stmt.width_percent) {
+                     $('<div />').addClass(csscls('bg-measure')).append(