fix php client not checking null region

algolia · Aug 10, 2022 · be6e4f4 · damcou · Aug 10, 2022 · shortcuts
1 parent 37d4235
commit be6e4f4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 29 deletions.
diff --git a/templates/php/ConfigWithRegion.mustache b/templates/php/ConfigWithRegion.mustache
@@ -7,23 +7,8 @@ use Algolia\AlgoliaSearch\Exceptions\AlgoliaException;
 
 abstract class ConfigWithRegion extends Configuration
 {
-    public static function create(
-        $appId,
-        $apiKey,
-        $region = null,
-        $allowedRegions = null
-    ) {
-        if (
-            $region !== null &&
-            $allowedRegions !== null &&
-            !in_array($region, $allowedRegions, true)
-        ) {
-            throw new AlgoliaException(
-                '`region` must be one of the following: ' .
-                    implode(', ', $allowedRegions)
-            );
-        }
-
+    public static function create($appId, $apiKey, $region = null)
+    {
         $config = [
             'appId' => $appId,
             'apiKey' => $apiKey,

diff --git a/templates/php/api.mustache b/templates/php/api.mustache
@@ -51,18 +51,21 @@ use {{invokerPackage}}\Support\Helpers;
      */
     public static function create($appId = null, $apiKey = null, $region = null)
     {
-        $allowedRegions = self::getAllowedRegions();
-        $config = {{configClassname}}::create($appId, $apiKey, $region, $allowedRegions);
+        $allowedRegions = [{{#allowedRegions}}'{{.}}'{{^-last}},{{/-last}}{{/allowedRegions}}];
+
+        if (
+            {{^fallbackToAliasHost}}$region == null ||{{/fallbackToAliasHost}}
+            ($region !== null && !in_array($region, $allowedRegions, true))
+        ) {
+            throw new AlgoliaException(
+                '`region` {{^fallbackToAliasHost}}is required and {{/fallbackToAliasHost}}must be one of the following: ' .
+                    implode(', ', $allowedRegions)
+            );
+        }
 
-        return static::createWithConfig($config);
-    }
+        $config = {{configClassname}}::create($appId, $apiKey, $region);
 
-    /**
-     * Returns the allowed regions for the config
-     */
-    public static function getAllowedRegions()
-    {
-        return [{{#allowedRegions}}'{{.}}'{{^-last}},{{/-last}}{{/allowedRegions}}];
+        return static::createWithConfig($config);
     }
     {{/hasRegionalHost}}
 

diff --git a/templates/php/tests/client/suite.mustache b/templates/php/tests/client/suite.mustache
@@ -37,8 +37,7 @@ class {{clientPrefix}}Test extends TestCase implements HttpClientInterface
             $config = {{clientPrefix}}Config::create(
                 $appId, 
                 $apiKey, 
-                $region,
-                {{client}}::getAllowedRegions()
+                $region
             );
             $clusterHosts = {{client}}::getClusterHosts($config);
         {{/hasRegionalHost}}