Replace empty() by more strict checks (#1125)

jbelien · web-flow · commit 6cb4fa02c272 · 2021-06-21T08:13:22.000+02:00
* Replace empty() by stricter checks

* Apply StyleCI fixes

* Compare with empty string instead of checking length

* Compare with empty array instead of checking count

* Compare with empty string instead of checking length
diff --git a/Plugin/LimitPlugin.php b/Plugin/LimitPlugin.php
@@ -40,7 +40,8 @@ public function __construct(int $limit)
      */
     public function handleQuery(Query $query, callable $next, callable $first)
     {
-        if (empty($query->getLocale())) {
+        $limit = $query->getLimit();
+        if (null !== $limit && $limit > 0) {
             $query = $query->withLimit($this->limit);
         }
 
diff --git a/Plugin/LocalePlugin.php b/Plugin/LocalePlugin.php
@@ -40,7 +40,8 @@ public function __construct(string $locale)
      */
     public function handleQuery(Query $query, callable $next, callable $first)
     {
-        if (empty($query->getLocale())) {
+        $locale = $query->getLocale();
+        if (null !== $locale && '' !== $locale) {
             $query = $query->withLocale($this->locale);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ public function __construct(int $limit)`
`40`	`40`	`*/`
`41`	`41`	`public function handleQuery(Query $query, callable $next, callable $first)`
`42`	`42`	`{`
`43`		`- if (empty($query->getLocale())) {`
	`43`	`+ $limit = $query->getLimit();`
	`44`	`+ if (null !== $limit && $limit > 0) {`
`44`	`45`	`$query = $query->withLimit($this->limit);`
`45`	`46`	`}`
`46`	`47`