Merge pull request #8 from UseMuffin/feat/phpunit-11

Fix error on CakePHP 5.1
UseMuffin · Oct 29, 2024 · 74a9d43 · 74a9d43
2 parents 4df0736 + 50c86c7
commit 74a9d43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,8 +14,8 @@ permissions:
 jobs:
   testsuite:
     uses: ADmad/.github/.github/workflows/testsuite-with-db.yml@master
-    secrets: inherit
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   cs-stan:
     uses: ADmad/.github/.github/workflows/cs-stan.yml@master
-    secrets: inherit
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "cakephp/cakephp": "^5.0",
-        "phpunit/phpunit": "^10.1"
+        "phpunit/phpunit": "^10.1 || ^11.1"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Model/Behavior/OrderlyBehavior.php b/src/Model/Behavior/OrderlyBehavior.php
@@ -57,7 +57,9 @@ public function beforeFind(EventInterface $event, SelectQuery $query, ArrayObjec
      */
     protected function _normalizeConfig(array $orders): void
     {
-        if (empty($orders)) {
+        unset($orders['className']);
+
+        if ($orders === []) {
             $orders = [[]];
         } elseif (isset($orders['order']) || isset($orders['callback'])) {
             $orders = [$orders];