Merge remote-tracking branch 'refs/remotes/origin/develop'

composer.json

@@ -29,7 +29,7 @@
     },
     "autoload": {
         "files": [
-            "helpers/functions.php"
+            "src/helpers.php"
         ],
 
         "psr-4": {

src/PlacesApi.php

@@ -276,9 +276,9 @@ private function prepareNearbySearchParams($location, $radius, $params)
         ) {
             unset($params['radius']);
 
-            if (!array_any_keys_exists(['keyword', 'name', 'types'], $params)) {
+            if (!array_any_keys_exists(['keyword', 'name', 'type'], $params)) {
                 throw new GooglePlacesApiException("Nearby Search require one"
-                    . " or more of 'keyword', 'name', or 'types' params since 'rankby' = 'distance'.");
+                    . " or more of 'keyword', 'name', or 'type' params since 'rankby' = 'distance'.");
             }
         } elseif (!$radius) {
             throw new GooglePlacesApiException("'radius' param is not defined.");
@@ -302,7 +302,7 @@ private function prepareRadarSearchParams($location, $radius, $params)
 
         if (!array_any_keys_exists(['keyword', 'name', 'type'], $params)) {
             throw new GooglePlacesApiException("Radar Search require one"
-                . " or more of 'keyword', 'name', or 'types' params.");
+                . " or more of 'keyword', 'name', or 'type' params.");
         }
 
         return $params;

helpers/functions.php → src/helpers.php

@@ -11,12 +11,10 @@
      */
     function array_any_keys_exists(array $keys, array $array)
     {
-        $result = false;
-
         foreach ($keys as $key) {
-            $result = $result OR array_key_exists($key, $array);
+            if (array_key_exists($key, $array)) {
+                return true;
+            }
         }
-
-        return $result;
     }
 }