refactor: replace empty()

Author: kenjis

system/API/ResponseTrait.php

@@ -318,7 +318,7 @@ protected function format($data = null)
 
         // Determine correct response type through content negotiation if not explicitly declared
         if (
-            (empty($this->format) || ! in_array($this->format, ['json', 'xml'], true))
+            ! in_array($this->format, ['json', 'xml'], true)
             && $this->request instanceof IncomingRequest
         ) {
             $mime = $this->request->negotiate(

system/Autoloader/FileLocator.php

@@ -67,7 +67,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         $segments = explode('\\', $file);
 
         // The first segment will be empty if a slash started the filename.
-        if (empty($segments[0])) {
+        if ($segments[0] === '') {
             unset($segments[0]);
         }
 
@@ -89,7 +89,7 @@ public function locateFile(string $file, ?string $folder = null, string $ext = '
         }
 
         // if no namespaces matched then quit
-        if (empty($paths)) {
+        if ($paths === []) {
             return false;
         }
 
@@ -272,7 +272,7 @@ public function findQualifiedNameFromPath(string $path)
         foreach ($this->getNamespaces() as $namespace) {
             $namespace['path'] = realpath($namespace['path']) ?: $namespace['path'];
 
-            if (empty($namespace['path'])) {
+            if ($namespace['path'] === '') {
                 continue;
             }
 

system/BaseModel.php

@@ -567,7 +567,7 @@ public function find($id = null)
                 'singleton' => $singleton,
             ]);
 
-            if (! empty($eventData['returnData'])) {
+            if (isset($eventData['returnData']) && $eventData['returnData'] === true) {
                 return $eventData['data'];
             }
         }
@@ -629,7 +629,7 @@ public function findAll(int $limit = 0, int $offset = 0)
                 'singleton' => false,
             ]);
 
-            if (! empty($eventData['returnData'])) {
+            if (isset($eventData['returnData']) && $eventData['returnData'] === true) {
                 return $eventData['data'];
             }
         }
@@ -667,7 +667,7 @@ public function first()
                 'singleton' => true,
             ]);
 
-            if (! empty($eventData['returnData'])) {
+            if (isset($eventData['returnData']) && $eventData['returnData'] === true) {
                 return $eventData['data'];
             }
         }
@@ -703,7 +703,7 @@ public function first()
      */
     public function save($row): bool
     {
-        if (empty($row)) {
+        if ((array) $row === []) {
             return true;
         }
 
@@ -729,7 +729,9 @@ public function save($row): bool
      */
     protected function shouldUpdate($row): bool
     {
-        return ! empty($this->getIdValue($row));
+        $id = $this->getIdValue($row);
+
+        return ! ($id === null || $id === []);
     }
 
     /**
@@ -1510,15 +1512,15 @@ public function validate($row): bool
     {
         $rules = $this->getValidationRules();
 
-        if ($this->skipValidation || $rules === [] || empty($row)) {
-            return true;
-        }
-
         // Validation requires array, so cast away.
         if (is_object($row)) {
             $row = (array) $row;
         }
 
+        if ($this->skipValidation || $rules === [] || $row === []) {
+            return true;
+        }
+
         $rules = $this->cleanValidationRules ? $this->cleanValidationRules($rules, $row) : $rules;
 
         // If no data existed that needs validation
@@ -1632,7 +1634,7 @@ public function allowCallbacks(bool $val = true)
     protected function trigger(string $event, array $eventData)
     {
         // Ensure it's a valid event
-        if (! isset($this->{$event}) || empty($this->{$event})) {
+        if (! isset($this->{$event}) || $this->{$event} === []) {
             return $eventData;
         }
 
@@ -1772,7 +1774,7 @@ protected function transformDataToArray($row, string $type): array
             throw new InvalidArgumentException(sprintf('Invalid type "%s" used upon transforming data to array.', $type));
         }
 
-        if (! $this->allowEmptyInserts && empty($row)) {
+        if (! $this->allowEmptyInserts && ($row === null || (array) $row === [])) {
             throw DataException::forEmptyDataset($type);
         }
 

system/RESTful/ResourceController.php

@@ -105,6 +105,7 @@ public function delete($id = null)
      * Set/change the expected response representation for returned objects
      *
      * @param string $format json/xml
+     * @phpstan-param 'json'|'xml' $format
      *
      * @return void
      */