Merge branch 'dev' into prod

Reviewed-on: #1

src/Controller/Traits/OverrideTableTrait.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace CheeseCake\Controller\Traits;
+
+use Cake\Core\Configure;
+use Cake\ORM\Table;
+use Cake\ORM\TableRegistry;
+
+trait OverrideTableTrait
+{
+    /**
+     * @var Table|null
+     */
+    protected ?Table $_table = null;
+
+    /**
+     * This object's default table alias.
+     *
+     * @var string|null
+     */
+    protected ?string $defaultTable = null;
+
+    /**
+     * @var string
+     */
+    protected string $_tableConfigKey = '';
+
+    /**
+     * Gets the table instance
+     *
+     * @return Table
+     */
+    public function getTable(string $tableName = null)
+    {
+        if ($this->_table instanceof Table) {
+            return $this->_table;
+        }
+        $this->getTableConfigKey();
+        $table = $tableName;
+        if (!isset($table)) {
+            $table = $this->defaultTable;
+            if (Configure::read($this->_tableConfigKey)) {
+                $table = Configure::read($this->_tableConfigKey);
+            }
+        }
+        $this->_table = TableRegistry::getTableLocator()->get($table);
+
+        return $this->_table;
+    }
+
+    protected function getTableConfigKey()
+    {
+        if (!$this->_tableConfigKey) {
+            $this->_tableConfigKey = $this->getPlugin() . '.' . $this->defaultTable . '.table';
+        }
+
+        return $this->_tableConfigKey;
+    }
+
+    /**
+     * Set the users table
+     *
+     * @param Table $table table
+     * @return void
+     */
+    public function setTable(Table $table)
+    {
+        $this->_table = $table;
+    }
+}

src/View/Helper/ActiveLinkHelper.php

@@ -47,30 +47,35 @@ class ActiveLinkHelper extends Helper
         $target = $options['target'];
         unset($options['target']);
         if (is_string($target)) {
-            if (Router::normalize($currentUrl) == Router::normalize($target)) {
+            return $this->_linkFromStringTarget($currentUrl, $target, $title, $url, $options);
-                $options['class'] = $this->_addClass($options);
-
-                return $this->Html->link($title, $url, $options);
-            }
         }
-        if (is_array($target)) {
+        if (!is_array($target)) {
-            if (!array_key_exists('plugin', $currentUrl)) {
+            return $this->Html->link($title, $url, $options);
-                $currentUrl['plugin'] = false;
+        }
-            }
+
-            if (!array_key_exists('prefix', $currentUrl)) {
+        if (!array_key_exists('plugin', $currentUrl)) {
-                $currentUrl['prefix'] = false;
+            $currentUrl['plugin'] = false;
-            }
+        }
-            foreach ($target as $targetKey => $targetValue) {
+        if (!array_key_exists('prefix', $currentUrl)) {
-                if (is_array($targetValue)) {
+            $currentUrl['prefix'] = false;
-                    return 'test';
+        }
-                }
+        if (isset($target['or']) && $target['or']) {
-                if (!array_key_exists($targetKey, $currentUrl) || $targetValue != $currentUrl[$targetKey]) {
+            foreach ($target['or'] as $singleTargetToMatch) {
+                if ($this->_matchesUrlFromArrayTarget($currentUrl, $singleTargetToMatch)) {
+                    $options['class'] = $this->_addClass($options);
+
                     return $this->Html->link($title, $url, $options);
                 }
             }
-            $options['class'] = $this->_addClass($options);
+            return $this->Html->link($title, $url, $options);
         }
 
+        if (!$this->_matchesUrlFromArrayTarget($currentUrl, $target)) {
+            return $this->Html->link($title, $url, $options);
+        }
+
+        $options['class'] = $this->_addClass($options);
+
         return $this->Html->link($title, $url, $options);
     }
 
@@ -85,4 +90,33 @@ class ActiveLinkHelper extends Helper
         
         return array_key_exists('class', $providedOptions) ? $providedOptions['class'] . ' ' . $activeClass : $activeClass;
     }
+
+    protected function _linkFromStringTarget(array $current, string $targetString, string $title, array|string|null $url, array $options)
+    {
+        if (Router::normalize($current) == Router::normalize($targetString)) {
+            $options['class'] = $this->_addClass($options);
+
+            return $this->Html->link($title, $url, $options);
+        }
+
+        return $this->Html->link($title, $url, $options);
+    }
+
+    protected function _matchesUrlFromArrayTarget(array $current, array $targetUrl)
+    {
+        foreach ($targetUrl as $targetKey => $targetValue) {
+            if (is_array($targetValue)) {
+                if (!in_array($current[$targetKey], $targetValue)) {
+                    return false;
+                }
+
+                continue;
+            }
+            if (!array_key_exists($targetKey, $current) || $targetValue != $current[$targetKey]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
 }