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

* 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

Author: jbelien

Dumper/AbstractArrayDumper.php

@@ -36,7 +36,7 @@ protected function getArray(Location $location): array
             $properties['bounds']
         );
 
-        if (0 === count($properties)) {
+        if ([] === $properties) {
             $properties = null;
         }
 

Model/Address.php

@@ -235,12 +235,12 @@ public static function createFromArray(array $data)
 
         $adminLevels = [];
         foreach ($data['adminLevels'] as $adminLevel) {
-            if (empty($adminLevel['level'])) {
+            if (null === $adminLevel['level'] || 0 === $adminLevel['level']) {
                 continue;
             }
 
             $name = $adminLevel['name'] ?? $adminLevel['code'] ?? null;
-            if (empty($name)) {
+            if (null === $name || '' === $name) {
                 continue;
             }
 

Model/AddressBuilder.php

@@ -109,7 +109,7 @@ public function build(string $class = Address::class): Address
         }
 
         $country = null;
-        if (!empty($this->country) || !empty($this->countryCode)) {
+        if ((null !== $this->country && '' !== $this->country) || (null !== $this->countryCode && '' !== $this->countryCode)) {
             $country = new Country($this->country, $this->countryCode);
         }
 

Model/AddressCollection.php

@@ -53,7 +53,7 @@ public function count()
      */
     public function first(): Location
     {
-        if (empty($this->locations)) {
+        if ([] === $this->locations) {
             throw new CollectionIsEmpty();
         }
 
@@ -65,7 +65,7 @@ public function first(): Location
      */
     public function isEmpty(): bool
     {
-        return empty($this->locations);
+        return [] === $this->locations;
     }
 
     /**

Model/AdminLevelCollection.php

@@ -73,7 +73,7 @@ public function count()
      */
     public function first(): AdminLevel
     {
-        if (empty($this->adminLevels)) {
+        if ([] === $this->adminLevels) {
             throw new CollectionIsEmpty();
         }
 

ProviderAggregator.php

@@ -180,7 +180,7 @@ private static function getProvider($query, array $providers, Provider $currentP
             return $currentProvider;
         }
 
-        if (0 === count($providers)) {
+        if ([] === $providers) {
             throw ProviderNotRegistered::noProviderRegistered();
         }
 

Query/GeocodeQuery.php

@@ -53,7 +53,7 @@ final class GeocodeQuery implements Query
      */
     private function __construct(string $text)
     {
-        if (empty($text)) {
+        if ('' === $text) {
             throw new InvalidArgument('Geocode query cannot be empty');
         }
 

StatefulGeocoder.php

@@ -23,7 +23,7 @@
 final class StatefulGeocoder implements Geocoder
 {
     /**
-     * @var string
+     * @var string|null
      */
     private $locale;
 
@@ -61,7 +61,7 @@ public function geocode(string $value): Collection
         $query = GeocodeQuery::create($value)
             ->withLimit($this->limit);
 
-        if (!empty($this->locale)) {
+        if (null !== $this->locale && '' !== $this->locale) {
             $query = $query->withLocale($this->locale);
         }
 
@@ -80,7 +80,7 @@ public function reverse(float $latitude, float $longitude): Collection
         $query = ReverseQuery::fromCoordinates($latitude, $longitude)
             ->withLimit($this->limit);
 
-        if (!empty($this->locale)) {
+        if (null !== $this->locale && '' !== $this->locale) {
             $query = $query->withLocale($this->locale);
         }
 
@@ -93,7 +93,7 @@ public function reverse(float $latitude, float $longitude): Collection
     public function geocodeQuery(GeocodeQuery $query): Collection
     {
         $locale = $query->getLocale();
-        if (empty($locale) && null !== $this->locale) {
+        if ((null === $locale || '' === $locale) && null !== $this->locale) {
             $query = $query->withLocale($this->locale);
         }
 
@@ -111,7 +111,7 @@ public function geocodeQuery(GeocodeQuery $query): Collection
     public function reverseQuery(ReverseQuery $query): Collection
     {
         $locale = $query->getLocale();
-        if (empty($locale) && null !== $this->locale) {
+        if ((null === $locale || '' === $locale) && null !== $this->locale) {
             $query = $query->withLocale($this->locale);
         }