chore: rebuilt with latest generator

dkarlovi · dkarlovi · commit 51cc95aa1ecb · 2021-03-17T15:31:34.000+01:00
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ DOCQA_DOCKER_COMMAND=docker run --init --interactive --rm --user "$(shell id -u)
 endif
 
 ifndef PHPQA_DOCKER_COMMAND
-PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.41-php${BUILD_ENV}-alpine
+PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.52-php${BUILD_ENV}-alpine
 PHPQA_DOCKER_COMMAND=docker run --init --interactive --rm --env "COMPOSER_CACHE_DIR=/composer/cache" --user "$(shell id -u):$(shell id -g)" --tmpfs /tmp --volume "$(shell pwd):/project" --volume "${HOME}/.composer:/composer" --workdir /project ${PHPQA_DOCKER_IMAGE}
 endif
 
diff --git a/README.md b/README.md
@@ -116,5 +116,5 @@ api@reddit.com
 
 This PHP package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: `1.0.2`
+- API version: `1.0.3`
 - Build package: `org.openapitools.codegen.languages.PhpClientCodegen`
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "ext-mbstring": "*",
         "guzzlehttp/guzzle": "^6.2"
diff --git a/src/Api/UserApi.php b/src/Api/UserApi.php
@@ -260,7 +260,7 @@ static function ($exception): void {
      *
      * @throws \InvalidArgumentException
      */
-    public function getSavedRequest($username, $after = null, $before = null, $limit = 25): \GuzzleHttp\Psr7\Request
+    public function getSavedRequest($username, $after = null, $before = null, $limit = 25): Request
     {
         // verify the required parameter 'username' is set
         if ($username === null || (\is_array($username) && \count($username) === 0)) {
@@ -532,7 +532,7 @@ static function ($exception): void {
      *
      * @throws \InvalidArgumentException
      */
-    public function meRequest(): \GuzzleHttp\Psr7\Request
+    public function meRequest(): Request
     {
         $resourcePath = '/me';
         $formParams = [];
diff --git a/src/Configuration.php b/src/Configuration.php
@@ -373,11 +373,11 @@ public static function setDefaultConfiguration(self $config): void
      */
     public static function toDebugReport(): string
     {
-        $report = 'PHP SDK (Sigwin\RedditClient) Debug Report:'.PHP_EOL;
-        $report .= '    OS: '.php_uname().PHP_EOL;
-        $report .= '    PHP Version: '.PHP_VERSION.PHP_EOL;
-        $report .= '    The version of the OpenAPI document: 1.0.2'.PHP_EOL;
-        $report .= '    Temp Folder Path: '.self::getDefaultConfiguration()->getTempFolderPath().PHP_EOL;
+        $report = 'PHP SDK (Sigwin\RedditClient) Debug Report:'.\PHP_EOL;
+        $report .= '    OS: '.php_uname().\PHP_EOL;
+        $report .= '    PHP Version: '.\PHP_VERSION.\PHP_EOL;
+        $report .= '    The version of the OpenAPI document: 1.0.3'.\PHP_EOL;
+        $report .= '    Temp Folder Path: '.self::getDefaultConfiguration()->getTempFolderPath().\PHP_EOL;
 
         return $report;
     }
diff --git a/src/Model/Listing.php b/src/Model/Listing.php
@@ -127,7 +127,7 @@ public function __toString(): string
     {
         return json_encode(
             ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
+            \JSON_PRETTY_PRINT
         );
     }
 
diff --git a/src/Model/ListingEnvelope.php b/src/Model/ListingEnvelope.php
@@ -111,7 +111,7 @@ public function __toString(): string
     {
         return json_encode(
             ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
+            \JSON_PRETTY_PRINT
         );
     }
 
@@ -241,8 +241,10 @@ public function setKind($kind): self
 
     /**
      * Gets data.
+     *
+     * @return \Sigwin\RedditClient\Model\Listing
      */
-    public function getData(): \Sigwin\RedditClient\Model\Listing
+    public function getData(): Listing
     {
         return $this->container['data'];
     }
diff --git a/src/Model/Me.php b/src/Model/Me.php
@@ -109,7 +109,7 @@ public function __toString(): string
     {
         return json_encode(
             ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
+            \JSON_PRETTY_PRINT
         );
     }
 
diff --git a/src/Model/Thing.php b/src/Model/Thing.php
@@ -112,7 +112,7 @@ public function __toString(): string
     {
         return json_encode(
             ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
+            \JSON_PRETTY_PRINT
         );
     }
 
@@ -243,8 +243,10 @@ public function setKind($kind): self
 
     /**
      * Gets data.
+     *
+     * @return \Sigwin\RedditClient\Model\ThingData
      */
-    public function getData(): \Sigwin\RedditClient\Model\ThingData
+    public function getData(): ThingData
     {
         return $this->container['data'];
     }
diff --git a/src/Model/ThingData.php b/src/Model/ThingData.php
@@ -187,7 +187,7 @@ public function __toString(): string
     {
         return json_encode(
             ObjectSerializer::sanitizeForSerialization($this),
-            JSON_PRETTY_PRINT
+            \JSON_PRETTY_PRINT
         );
     }
 
diff --git a/src/ObjectSerializer.php b/src/ObjectSerializer.php
@@ -264,7 +264,7 @@ public static function deserialize($data, $class, $httpHeaders = null)
             return $values;
         }
 
-        if (mb_substr($class, 0, 4) === 'map[') { // for associative array e.g. map[string,int]
+        if (preg_match('/^(array<|map\[)/', $class)) { // for associative array e.g. array<string,int>
             $data = \is_string($data) ? json_decode($data) : $data;
             $data = (array) $data;
             $inner = mb_substr($class, 4, -1);
@@ -294,10 +294,18 @@ public static function deserialize($data, $class, $httpHeaders = null)
             // be interpreted as a missing field/value. Let's handle
             // this graceful.
             if ( ! empty($data)) {
-                return new \DateTimeImmutable($data);
+                try {
+                    return new \DateTimeImmutable($data);
+                } catch (\Exception $exception) {
+                    // Some API's return a date-time with too high nanosecond
+                    // precision for php's DateTime to handle. This conversion
+                    // (string -> unix timestamp -> DateTime) is a workaround
+                    // for the problem.
+                    return (new \DateTimeImmutable())->setTimestamp(strtotime($data));
+                }
+            } else {
+                return null;
             }
-
-            return null;
         }
 
         /** @psalm-suppress ParadoxicalCondition */
diff --git a/test/Api/UserApiTest.php b/test/Api/UserApiTest.php
@@ -38,14 +38,14 @@ public static function tearDownAfterClass(): void
     /**
      * Setup before running each test case.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case.
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/test/Model/ListingEnvelopeTest.php b/test/Model/ListingEnvelopeTest.php
@@ -39,14 +39,14 @@ public static function tearDownAfterClass(): void
     /**
      * Setup before running each test case.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case.
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/test/Model/ListingTest.php b/test/Model/ListingTest.php
@@ -39,14 +39,14 @@ public static function tearDownAfterClass(): void
     /**
      * Setup before running each test case.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case.
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/test/Model/MeTest.php b/test/Model/MeTest.php
@@ -39,14 +39,14 @@ public static function tearDownAfterClass(): void
     /**
      * Setup before running each test case.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case.
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/test/Model/ThingDataTest.php b/test/Model/ThingDataTest.php
@@ -39,14 +39,14 @@ public static function tearDownAfterClass(): void
     /**
      * Setup before running each test case.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case.
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 
diff --git a/test/Model/ThingTest.php b/test/Model/ThingTest.php
@@ -39,14 +39,14 @@ public static function tearDownAfterClass(): void
     /**
      * Setup before running each test case.
      */
-    public function setUp(): void
+    protected function setUp(): void
     {
     }
 
     /**
      * Clean up after running each test case.
      */
-    public function tearDown(): void
+    protected function tearDown(): void
     {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`	`],`
`21`	`21`	`"require": {`
`22`		`- "php": "^7.2",`
	`22`	`+ "php": "^7.4 \|\| ^8.0",`
`23`	`23`	`"ext-json": "*",`
`24`	`24`	`"ext-mbstring": "*",`
`25`	`25`	`"guzzlehttp/guzzle": "^6.2"`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ static function ($exception): void {`
`260`	`260`	`*`
`261`	`261`	`* @throws \InvalidArgumentException`
`262`	`262`	`*/`
`263`		`- public function getSavedRequest($username, $after = null, $before = null, $limit = 25): \GuzzleHttp\Psr7\Request`
	`263`	`+ public function getSavedRequest($username, $after = null, $before = null, $limit = 25): Request`
`264`	`264`	`{`
`265`	`265`	`// verify the required parameter 'username' is set`
`266`	`266`	`if ($username === null \|\| (\is_array($username) && \count($username) === 0)) {`
`@@ -532,7 +532,7 @@ static function ($exception): void {`
`532`	`532`	`*`
`533`	`533`	`* @throws \InvalidArgumentException`
`534`	`534`	`*/`
`535`		`- public function meRequest(): \GuzzleHttp\Psr7\Request`
	`535`	`+ public function meRequest(): Request`
`536`	`536`	`{`
`537`	`537`	`$resourcePath = '/me';`
`538`	`538`	`$formParams = [];`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function __toString(): string`
`127`	`127`	`{`
`128`	`128`	`return json_encode(`
`129`	`129`	`ObjectSerializer::sanitizeForSerialization($this),`
`130`		`- JSON_PRETTY_PRINT`
	`130`	`+ \JSON_PRETTY_PRINT`
`131`	`131`	`);`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function __toString(): string`
`111`	`111`	`{`
`112`	`112`	`return json_encode(`
`113`	`113`	`ObjectSerializer::sanitizeForSerialization($this),`
`114`		`- JSON_PRETTY_PRINT`
	`114`	`+ \JSON_PRETTY_PRINT`
`115`	`115`	`);`
`116`	`116`	`}`
`117`	`117`
`@@ -241,8 +241,10 @@ public function setKind($kind): self`
`241`	`241`
`242`	`242`	`/**`
`243`	`243`	`* Gets data.`
	`244`	`+ *`
	`245`	`+ * @return \Sigwin\RedditClient\Model\Listing`
`244`	`246`	`*/`
`245`		`- public function getData(): \Sigwin\RedditClient\Model\Listing`
	`247`	`+ public function getData(): Listing`
`246`	`248`	`{`
`247`	`249`	`return $this->container['data'];`
`248`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function __toString(): string`
`109`	`109`	`{`
`110`	`110`	`return json_encode(`
`111`	`111`	`ObjectSerializer::sanitizeForSerialization($this),`
`112`		`- JSON_PRETTY_PRINT`
	`112`	`+ \JSON_PRETTY_PRINT`
`113`	`113`	`);`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function __toString(): string`
`112`	`112`	`{`
`113`	`113`	`return json_encode(`
`114`	`114`	`ObjectSerializer::sanitizeForSerialization($this),`
`115`		`- JSON_PRETTY_PRINT`
	`115`	`+ \JSON_PRETTY_PRINT`
`116`	`116`	`);`
`117`	`117`	`}`
`118`	`118`
`@@ -243,8 +243,10 @@ public function setKind($kind): self`
`243`	`243`
`244`	`244`	`/**`
`245`	`245`	`* Gets data.`
	`246`	`+ *`
	`247`	`+ * @return \Sigwin\RedditClient\Model\ThingData`
`246`	`248`	`*/`
`247`		`- public function getData(): \Sigwin\RedditClient\Model\ThingData`
	`249`	`+ public function getData(): ThingData`
`248`	`250`	`{`
`249`	`251`	`return $this->container['data'];`
`250`	`252`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ public function __toString(): string`
`187`	`187`	`{`
`188`	`188`	`return json_encode(`
`189`	`189`	`ObjectSerializer::sanitizeForSerialization($this),`
`190`		`- JSON_PRETTY_PRINT`
	`190`	`+ \JSON_PRETTY_PRINT`
`191`	`191`	`);`
`192`	`192`	`}`
`193`	`193`