Improve typing

Author: abnegate

templates/php/src/Client.php.twig

@@ -14,28 +14,28 @@ class Client
     const METHOD_CONNECT = 'CONNECT';
     const METHOD_TRACE = 'TRACE';
 
-    const CHUNK_SIZE = 5*1024*1024;
+    const CHUNK_SIZE = 5 * 1024 * 1024;
 
     /**
      * Is Self Signed Certificates Allowed?
      *
      * @var bool
      */
-    protected $selfSigned = false;
+    protected bool $selfSigned = false;
 
     /**
      * Service host name
      *
      * @var string
      */
-    protected $endpoint = '{{spec.endpoint}}';
+    protected string $endpoint = '{{spec.endpoint}}';
 
     /**
      * Global Headers
      *
      * @var array
      */
-    protected $headers = [
+    protected array $headers = [
         'content-type' => '',
         'user-agent' => '{{spec.title | caseUcfirst}}{{ language.name | caseUcfirst }}SDK/{{ sdk.version }} ({{deviceInfo}})',
         'x-sdk-name'=> '{{ sdk.name }}',
@@ -45,7 +45,7 @@ class Client
     ];
 
     /**
-     * SDK constructor.
+     * Client constructor.
      */
     public function __construct()
     {
@@ -66,7 +66,7 @@ class Client
      *
      * @return Client
      */
-    public function set{{header.key | caseUcfirst}}($value)
+    public function set{{header.key | caseUcfirst}}(string $value): Client
     {
         $this->addHeader('{{header.name}}', $value);
 
@@ -79,7 +79,7 @@ class Client
      * @param bool $status
      * @return $this
      */
-    public function setSelfSigned($status = true)
+    public function setSelfSigned(bool $status = true): Client
     {
         $this->selfSigned = $status;
 
@@ -90,7 +90,7 @@ class Client
      * @param $endpoint
      * @return $this
      */
-    public function setEndpoint($endpoint)
+    public function setEndpoint(string $endpoint): Client
     {
         $this->endpoint = $endpoint;
 
@@ -101,7 +101,7 @@ class Client
      * @param $key
      * @param $value
      */
-    public function addHeader($key, $value)
+    public function addHeader(string $key, string $value): Client
     {
         $this->headers[strtolower($key)] = $value;
         
@@ -224,7 +224,7 @@ class Client
      * @param string $prefix
      * @return array
      */
-    protected function flatten(array $data, $prefix = '') {
+    protected function flatten(array $data, string $prefix = ''): array {
         $output = [];
 
         foreach($data as $key => $value) {

templates/php/src/InputFile.php.twig

@@ -29,7 +29,7 @@ class InputFile {
         return $this->filename;
     }
 
-    public static function withPath(string $path, ?string $mimeType = null, ?string $filename = null)
+    public static function withPath(string $path, ?string $mimeType = null, ?string $filename = null): InputFile
     {
         $instance = new InputFile();
         $instance->path = $path;
@@ -39,7 +39,7 @@ class InputFile {
         return $instance;
     } 
 
-    public static function withData(string $data, ?string $mimeType = null, ?string $filename = null)
+    public static function withData(string $data, ?string $mimeType = null, ?string $filename = null): InputFile
     {
         $instance = new InputFile();
         $instance->path = null;

templates/php/src/Permission.php.twig

@@ -8,18 +8,22 @@ class Permission
     {
         return "read(\"$role\")";
     }
+
     public static function write(string $role): string
     {
         return "write(\"$role\")";
     }
+
     public static function create(string $role): string
     {
         return "create(\"$role\")";
     }
+
     public static function update(string $role): string
     {
         return "update(\"$role\")";
     }
+
     public static function delete(string $role): string
     {
         return "delete(\"$role\")";

templates/php/src/Query.php.twig

@@ -42,7 +42,7 @@ class Query implements \JsonSerializable
      * @param mixed $value
      * @return string
      */
-    public static function equal(string $attribute, $value): string
+    public static function equal(string $attribute, mixed $value): string
     {
         return (new Query('equal', $attribute, $value))->__toString();
     }
@@ -54,7 +54,7 @@ class Query implements \JsonSerializable
      * @param mixed $value
      * @return string
      */
-    public static function notEqual(string $attribute, $value): string
+    public static function notEqual(string $attribute, mixed $value): string
     {
         return (new Query('notEqual', $attribute, $value))->__toString();
     }
@@ -66,7 +66,7 @@ class Query implements \JsonSerializable
      * @param mixed $value
      * @return string
      */
-    public static function lessThan(string $attribute, $value): string
+    public static function lessThan(string $attribute, mixed $value): string
     {
         return (new Query('lessThan', $attribute, $value))->__toString();
     }
@@ -78,7 +78,7 @@ class Query implements \JsonSerializable
      * @param mixed $value
      * @return string
      */
-    public static function lessThanEqual(string $attribute, $value): string
+    public static function lessThanEqual(string $attribute, mixed $value): string
     {
         return (new Query('lessThanEqual', $attribute, $value))->__toString();
     }
@@ -90,7 +90,7 @@ class Query implements \JsonSerializable
      * @param mixed $value
      * @return string
      */
-    public static function greaterThan(string $attribute, $value): string
+    public static function greaterThan(string $attribute, mixed $value): string
     {
         return (new Query('greaterThan', $attribute, $value))->__toString();
     }
@@ -102,7 +102,7 @@ class Query implements \JsonSerializable
      * @param mixed $value
      * @return string
      */
-    public static function greaterThanEqual(string $attribute, $value): string
+    public static function greaterThanEqual(string $attribute, mixed $value): string
     {
         return (new Query('greaterThanEqual', $attribute, $value))->__toString();
     }
@@ -149,7 +149,7 @@ class Query implements \JsonSerializable
      * @param string|int|float $end
      * @return string
      */
-    public static function between(string $attribute, $start, $end): string
+    public static function between(string $attribute, mixed $start, mixed $end): string
     {
         return (new Query('between', $attribute, [$start, $end]))->__toString();
     }

templates/php/src/Service.php.twig

@@ -4,14 +4,8 @@ namespace {{ spec.title | caseUcfirst }};
 
 abstract class Service
 {
-    /**
-     * @var Client
-     */
-    protected $client;
+    protected Client $client;
 
-    /**
-     * @param Client $client
-     */
     public function __construct(Client $client)
     {
         $this->client = $client;