php service level params and flutter fix

Author: lohanidamodar

templates/php/base/params.twig

@@ -0,0 +1,27 @@
+        $params = [];
+{% if method.parameters.all | length %}
+{% for parameter in method.parameters.all | filter((param) => not param.isGlobal ) %}
+{% if parameter.required %}
+        if (!isset(${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }})) {
+            throw new {{spec.title | caseUcfirst}}Exception('Missing required parameter: "{{ parameter.name | caseCamel | escapeKeyword }}"');
+        }
+{% endif %}
+{% endfor %}
+{% for parameter in method.parameters.query %}
+        if (!is_null(${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }})) {
+            $params['{{ parameter.name }}'] = ${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }};
+        }
+
+{% endfor %}
+{% for parameter in method.parameters.body %}
+        if (!is_null(${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }})) {
+            $params['{{ parameter.name }}'] = ${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }};
+        }
+
+{% endfor %}
+{% for parameter in method.parameters.formData %}
+        if (!is_null(${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }})) {
+            $params['{{ parameter.name }}'] = ${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }};
+        }
+{% endfor %}
+{% endif %}

templates/php/base/requests/params.twig

@@ -9,6 +9,31 @@ use {{ spec.title | caseUcfirst }}\InputFile;
 
 class {{ service.name | caseUcfirst }} extends Service
 {
+{% if service.globalParams | length %}
+
+{% for parameter in service.globalParams %}
+     protected {{ parameter.type | typeName }} ${{ parameter.name | caseCamel | escapeKeyword }};
+
+     public function set{{ parameter.name | caseUcfirst | escapeKeyword }}({{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}): void
+     {
+          $this->{{ parameter.name | caseCamel | escapeKeyword }} = ${{ parameter.name | caseCamel | escapeKeyword }};
+     }
+
+     public function get{{ parameter.name | caseUcfirst | escapeKeyword }}({{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}): {{ parameter.type | typeName }}
+     {
+          return $this->{{ parameter.name | caseCamel | escapeKeyword }};
+     }
+{% endfor %}
+
+     public function __construct(Client $client, {% for parameter in service.globalParams %} {{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %} = null{% endif %}{% if not loop.last %}, {% endif %}{% endfor %})
+     {
+          $this->client = $client;
+{% for parameter in service.globalParams %}
+          $this->{{ parameter.name | caseCamel | escapeKeyword }} = ${{ parameter.name | caseCamel | escapeKeyword }};
+{% endfor %}
+     }
+
+{% endif %}
 {% for method in service.methods %}
     /**
      * {{ method.title }}
@@ -17,18 +42,18 @@ class {{ service.name | caseUcfirst }} extends Service
 {{ method.description|comment1 }}
      *
 {% endif %}
-{% for parameter in method.parameters.all %}
+{% for parameter in method.parameters.all | filter((param) => not param.isGlobal) %}
      * @param {{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}
 {% endfor %}
      * @throws {{spec.title | caseUcfirst}}Exception
      * @return {{ method | getReturn }}
 
      */
-    public function {{ method.name | caseCamel }}({% for parameter in method.parameters.all %}{{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %} = null{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, callable $onProgress = null{% endif %}): {{ method | getReturn }}
+    public function {{ method.name | caseCamel }}({% for parameter in method.parameters.all | filter((param) => not param.isGlobal ) %}{{ parameter.type | typeName }}${{ parameter.name | caseCamel | escapeKeyword }}{% if not parameter.required %} = null{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, callable $onProgress = null{% endif %}): {{ method | getReturn }}
     {
-        $path   = str_replace([{% for parameter in method.parameters.path %}'{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'{% if not loop.last %}, {% endif %}{% endfor %}], [{% for parameter in method.parameters.path %}${{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last %}, {% endif %}{% endfor %}], '{{ method.path }}');
+        $path   = str_replace([{% for parameter in method.parameters.path %}'{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'{% if not loop.last %}, {% endif %}{% endfor %}], [{% for parameter in method.parameters.path %}${% if parameter.isGlobal %}this->{% endif %}{{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last %}, {% endif %}{% endfor %}], '{{ method.path }}');
 
-{{ include('php/base/requests/params.twig') }}
+{{ include('php/base/params.twig') }}
 {% if 'multipart/form-data' in method.consumes %}
 {{ include('php/base/requests/file.twig') }}
 {% else %}

templates/php/src/Services/Service.php.twig

@@ -5,7 +5,7 @@ import '../lib/models.dart';
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   Client client = Client();
-  Foo foo = Foo(client);
+  Foo foo = Foo(client, x: 'string');
   Bar bar = Bar(client);
   General general = General(client);
 

tests/languages/flutter/tests.dart

@@ -16,7 +16,7 @@
 use Appwrite\Services\General;
 
 $client = new Client();
-$foo = new Foo($client);
+$foo = new Foo($client, 'string');
 $bar = new Bar($client);
 $general = new General($client);
 
@@ -26,19 +26,19 @@
 
 // Foo Service
 
-$response = $foo->get('string', 123, ['string in array']);
+$response = $foo->get(123, ['string in array']);
 echo "{$response['result']}\n";
 
-$response = $foo->post('string', 123, ['string in array']);
+$response = $foo->post(123, ['string in array']);
 echo "{$response['result']}\n";
 
-$response = $foo->put('string', 123, ['string in array']);
+$response = $foo->put(123, ['string in array']);
 echo "{$response['result']}\n";
 
-$response = $foo->patch('string', 123, ['string in array']);
+$response = $foo->patch(123, ['string in array']);
 echo "{$response['result']}\n";
 
-$response = $foo->delete('string', 123, ['string in array']);
+$response = $foo->delete(123, ['string in array']);
 echo "{$response['result']}\n";
 
 // Bar Service