Merge pull request #17530 from cakephp/non-cloaking-checks

Refactor cloaking checks
cakephp · Jan 7, 2024 · 8f577b8 · 8f577b8
2 parents b6212db + 32e0f83
commit 8f577b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Locator/AbstractLocator.php b/Locator/AbstractLocator.php
@@ -53,7 +53,7 @@ public function get(string $alias, array $options = []): RepositoryInterface
         unset($storeOptions['allowFallbackClass']);
 
         if (isset($this->instances[$alias])) {
-            if (!empty($storeOptions) && isset($this->options[$alias]) && $this->options[$alias] !== $storeOptions) {
+            if ($storeOptions && isset($this->options[$alias]) && $this->options[$alias] !== $storeOptions) {
                 throw new CakeException(sprintf(
                     'You cannot configure `%s`, it already exists in the registry.',
                     $alias

diff --git a/ModelAwareTrait.php b/ModelAwareTrait.php
@@ -94,7 +94,7 @@ protected function _setModelClass(string $name): void
     public function fetchModel(?string $modelClass = null, ?string $modelType = null): RepositoryInterface
     {
         $modelClass ??= $this->modelClass;
-        if (empty($modelClass)) {
+        if (!$modelClass) {
             throw new UnexpectedValueException('Default modelClass is empty');
         }
         $modelType ??= $this->getModelType();

diff --git a/QueryCacher.php b/QueryCacher.php
@@ -70,7 +70,7 @@ public function fetch(object $query): mixed
         $key = $this->_resolveKey($query);
         $storage = $this->_resolveCacher();
         $result = $storage->get($key);
-        if (empty($result)) {
+        if (!$result) {
             return null;
         }