diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 356a5ff..1b40453 100644 --- 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 index 6a1f986..437e6d2 100644 --- 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 index d206fb6..c43aa6e 100644 --- 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];