Updated php-cs-fixer rules and fixes (#73)

echosa · web-flow · commit 8d9f2c1792cd · 2020-07-21T05:24:17.000+10:00
* Update phpcs rules

* Bulk phpcs fixes
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -6,5 +6,13 @@ $finder = PhpCsFixer\Finder::create()
 ;
 
 return PhpCsFixer\Config::create()
+    ->setRules([
+        '@PSR2' => true,
+        '@Symfony' => true,
+        'phpdoc_annotation_without_dot' => false,
+        'phpdoc_no_alias_tag' => false,
+        'phpdoc_separation' => false,
+        'yoda_style' => false,
+    ])
     ->setFinder($finder)
 ;
diff --git a/src/NewTwitchApi/Auth/OauthApi.php b/src/NewTwitchApi/Auth/OauthApi.php
@@ -50,7 +50,7 @@ public function getUserAccessToken($code, string $redirectUri, $state = null): R
                     'redirect_uri' => $redirectUri,
                     'code' => $code,
                     'state' => $state,
-                ]
+                ],
             ]
         );
     }
@@ -73,7 +73,7 @@ public function refreshToken(string $refeshToken, string $scope = ''): ResponseI
         return $this->makeRequest(
             new Request('POST', 'token'),
             [
-                RequestOptions::JSON => $requestOptions
+                RequestOptions::JSON => $requestOptions,
             ]
         );
     }
@@ -88,7 +88,7 @@ public function validateAccessToken(string $accessToken): ResponseInterface
                 'GET',
                 'validate',
                 [
-                    'Authorization' => sprintf('OAuth %s', $accessToken)
+                    'Authorization' => sprintf('OAuth %s', $accessToken),
                 ]
             )
         );
@@ -115,7 +115,7 @@ public function getAppAccessToken(string $scope = ''): ResponseInterface
                     'client_secret' => $this->clientSecret,
                     'grant_type' => 'client_credentials',
                     'scope' => $scope,
-                ]
+                ],
             ]
         );
     }
diff --git a/src/NewTwitchApi/Resources/AdsApi.php b/src/NewTwitchApi/Resources/AdsApi.php
@@ -9,11 +9,10 @@
 
 class AdsApi extends AbstractResource
 {
-
     /**
-    * @throws GuzzleException
-    * @link https://dev.twitch.tv/docs/api/reference#start-commercial
-    */
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#start-commercial
+     */
     public function startCommercial(string $bearer, string $broadcasterId, int $length): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/src/NewTwitchApi/Resources/BitsApi.php b/src/NewTwitchApi/Resources/BitsApi.php
@@ -9,11 +9,10 @@
 
 class BitsApi extends AbstractResource
 {
-
-  /**
-  * @throws GuzzleException
-  * @link https://dev.twitch.tv/docs/api/reference#get-cheermotes
-  */
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#get-cheermotes
+     */
     public function getCheermotes(string $bearer, string $broadcasterId = null): ResponseInterface
     {
         $queryParamsMap = [];
@@ -26,9 +25,9 @@ public function getCheermotes(string $bearer, string $broadcasterId = null): Res
     }
 
     /**
-    * @throws GuzzleException
-    * @link https://dev.twitch.tv/docs/api/reference#get-bits-leaderboard
-    */
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#get-bits-leaderboard
+     */
     public function getBitsLeaderboard(string $bearer, int $count = null, string $period = null, string $startedAt = null, string $userId = null): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/src/NewTwitchApi/Resources/ClipsApi.php b/src/NewTwitchApi/Resources/ClipsApi.php
@@ -69,10 +69,10 @@ public function getClips(string $bearer, string $broadcasterId = null, string $g
     }
 
     /**
-    * @throws GuzzleException
-    * @link https://dev.twitch.tv/docs/api/reference#create-clip
-    */
-    public function createClip(string $bearer, string $broadcasterId, boolean $hasDelay = null): ResponseInterface
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#create-clip
+     */
+    public function createClip(string $bearer, string $broadcasterId, bool $hasDelay = null): ResponseInterface
     {
         $queryParamsMap = [];
 
diff --git a/src/NewTwitchApi/Resources/EntitlementsApi.php b/src/NewTwitchApi/Resources/EntitlementsApi.php
@@ -12,11 +12,12 @@ class EntitlementsApi extends AbstractResource
     /**
      * @throws GuzzleException
      */
-    public function getEntitlementGrantsUploadURL(string $bearer, string $manifestId, string $type = "bulk_drops_grant"): ResponseInterface
+    public function getEntitlementGrantsUploadURL(string $bearer, string $manifestId, string $type = 'bulk_drops_grant'): ResponseInterface
     {
         $queryParamsMap = [];
         $queryParamsMap[] = ['key' => 'manifest_id', 'value' => $manifestId];
         $queryParamsMap[] = ['key' => 'type', 'value' => $type];
+
         return $this->postApi('entitlements/upload', $bearer, $queryParamsMap);
     }
 }
diff --git a/src/NewTwitchApi/Resources/HypeTrainApi.php b/src/NewTwitchApi/Resources/HypeTrainApi.php
@@ -9,11 +9,10 @@
 
 class HypeTrainApi extends AbstractResource
 {
-
-  /**
-  * @throws GuzzleException
-  * @link https://dev.twitch.tv/docs/api/reference#get-hype-train-events
-  */
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#get-hype-train-events
+     */
     public function getHypeTrainEvents(string $bearer, string $broadcasterId, int $first = null, string $id = null, string $cursor = null): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/src/NewTwitchApi/Resources/ModerationApi.php b/src/NewTwitchApi/Resources/ModerationApi.php
@@ -9,11 +9,10 @@
 
 class ModerationApi extends AbstractResource
 {
-
-  /**
-   * @throws GuzzleException
-   * @link https://dev.twitch.tv/docs/api/reference/#get-banned-events
-   */
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference/#get-banned-events
+     */
     public function getBannedEvents(string $bearer, string $broadcasterId, array $ids = [], string $first = null, string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
@@ -61,9 +60,9 @@ public function getBannedUsers(string $bearer, string $broadcasterId, array $ids
     }
 
     /**
-    * @throws GuzzleException
-    * @link https://dev.twitch.tv/docs/api/reference/#get-moderators
-    */
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference/#get-moderators
+     */
     public function getModerators(string $bearer, string $broadcasterId, array $ids = [], string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
@@ -82,9 +81,9 @@ public function getModerators(string $bearer, string $broadcasterId, array $ids
     }
 
     /**
-    * @throws GuzzleException
-    * @link https://dev.twitch.tv/docs/api/reference/#get-moderator-events
-    */
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference/#get-moderator-events
+     */
     public function getModeratorEvents(string $bearer, string $broadcasterId, array $ids = [], string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/src/NewTwitchApi/Resources/SearchApi.php b/src/NewTwitchApi/Resources/SearchApi.php
@@ -9,11 +9,10 @@
 
 class SearchApi extends AbstractResource
 {
-
-  /**
-  * @throws GuzzleException
-  * @link https://dev.twitch.tv/docs/api/reference#search-categories
-  */
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#search-categories
+     */
     public function searchCategories(string $bearer, string $query, string $first = null, string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
@@ -32,9 +31,9 @@ public function searchCategories(string $bearer, string $query, string $first =
     }
 
     /**
-    * @throws GuzzleException
-    * @link https://dev.twitch.tv/docs/api/reference#search-channels
-    */
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference#search-channels
+     */
     public function searchChannels(string $bearer, string $query, $liveOnly = null, string $first = null, string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/src/NewTwitchApi/Resources/StreamsApi.php b/src/NewTwitchApi/Resources/StreamsApi.php
@@ -32,7 +32,7 @@ public function getStreamForUsername(string $bearer, string $username): Response
     public function getStreamKey(string $bearer, string $broadcasterId): ResponseInterface
     {
         $queryParamsMap = [];
-        
+
         $queryParamsMap[] = ['key' => 'broadcaster_id', 'value' => $broadcasterId];
 
         return $this->callApi('streams/key', $bearer, $queryParamsMap);
diff --git a/src/NewTwitchApi/Resources/SubscriptionsApi.php b/src/NewTwitchApi/Resources/SubscriptionsApi.php
@@ -9,11 +9,10 @@
 
 class SubscriptionsApi extends AbstractResource
 {
-
-  /**
-   * @throws GuzzleException
-   * @link https://dev.twitch.tv/docs/api/reference/#get-broadcaster-subscriptions
-   */
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference/#get-broadcaster-subscriptions
+     */
     public function getBroadcasterSubscriptions(string $bearer, string $broadcasterId, int $first = null, string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
@@ -30,11 +29,11 @@ public function getBroadcasterSubscriptions(string $bearer, string $broadcasterI
 
         return $this->callApi('subscriptions', $bearer, $queryParamsMap);
     }
+
     /**
      * @throws GuzzleException
      * @link https://dev.twitch.tv/docs/api/reference/#get-broadcaster-s-subscribers
      */
-
     public function getBroadcasterSubscribers(string $bearer, string $broadcasterId, array $ids = []): ResponseInterface
     {
         $queryParamsMap = [];
@@ -52,7 +51,6 @@ public function getBroadcasterSubscribers(string $bearer, string $broadcasterId,
      * @throws GuzzleException
      * @link https://dev.twitch.tv/docs/api/reference/#get-subscription-events
      */
-
     public function getSubscriptionEvents(string $bearer, string $broadcasterId, string $eventId = null, string $userId = null, int $first = null, string $after = null): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/src/NewTwitchApi/Resources/VideosApi.php b/src/NewTwitchApi/Resources/VideosApi.php
@@ -9,11 +9,10 @@
 
 class VideosApi extends AbstractResource
 {
-
-  /**
-   * @throws GuzzleException
-   * @link https://dev.twitch.tv/docs/api/reference/#get-videos
-   */
+    /**
+     * @throws GuzzleException
+     * @link https://dev.twitch.tv/docs/api/reference/#get-videos
+     */
     public function getVideos(string $bearer, array $ids = [], string $userId = null, string $gameId = null, string $first = null, string $before = null, string $after = null, string $language = null, string $period = null, string $sort = null, string $type = null): ResponseInterface
     {
         $queryParamsMap = [];
diff --git a/test/NewTwitchApi/Resources/UsersTest.php b/test/NewTwitchApi/Resources/UsersTest.php
@@ -54,8 +54,9 @@ private function getGuzzleClientWithMockUserResponse(): Client
 JSON;
 
         $db_response = new Response(200, [], $getUserReponseJson);
-        $mock = new MockHandler([ $db_response, $db_response ]);
+        $mock = new MockHandler([$db_response, $db_response]);
         $handler = HandlerStack::create($mock);
+
         return new Client(['handler' => $handler]);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,13 @@ $finder = PhpCsFixer\Finder::create()`
`6`	`6`	`;`
`7`	`7`
`8`	`8`	`return PhpCsFixer\Config::create()`
	`9`	`+ ->setRules([`
	`10`	`+ '@PSR2' => true,`
	`11`	`+ '@Symfony' => true,`
	`12`	`+ 'phpdoc_annotation_without_dot' => false,`
	`13`	`+ 'phpdoc_no_alias_tag' => false,`
	`14`	`+ 'phpdoc_separation' => false,`
	`15`	`+ 'yoda_style' => false,`
	`16`	`+ ])`
`9`	`17`	`->setFinder($finder)`
`10`	`18`	`;`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function getUserAccessToken($code, string $redirectUri, $state = null): R`
`50`	`50`	`'redirect_uri' => $redirectUri,`
`51`	`51`	`'code' => $code,`
`52`	`52`	`'state' => $state,`
`53`		`- ]`
	`53`	`+ ],`
`54`	`54`	`]`
`55`	`55`	`);`
`56`	`56`	`}`
`@@ -73,7 +73,7 @@ public function refreshToken(string $refeshToken, string $scope = ''): ResponseI`
`73`	`73`	`return $this->makeRequest(`
`74`	`74`	`new Request('POST', 'token'),`
`75`	`75`	`[`
`76`		`- RequestOptions::JSON => $requestOptions`
	`76`	`+ RequestOptions::JSON => $requestOptions,`
`77`	`77`	`]`
`78`	`78`	`);`
`79`	`79`	`}`
`@@ -88,7 +88,7 @@ public function validateAccessToken(string $accessToken): ResponseInterface`
`88`	`88`	`'GET',`
`89`	`89`	`'validate',`
`90`	`90`	`[`
`91`		`- 'Authorization' => sprintf('OAuth %s', $accessToken)`
	`91`	`+ 'Authorization' => sprintf('OAuth %s', $accessToken),`
`92`	`92`	`]`
`93`	`93`	`)`
`94`	`94`	`);`
`@@ -115,7 +115,7 @@ public function getAppAccessToken(string $scope = ''): ResponseInterface`
`115`	`115`	`'client_secret' => $this->clientSecret,`
`116`	`116`	`'grant_type' => 'client_credentials',`
`117`	`117`	`'scope' => $scope,`
`118`		`- ]`
	`118`	`+ ],`
`119`	`119`	`]`
`120`	`120`	`);`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,10 @@`
`9`	`9`
`10`	`10`	`class AdsApi extends AbstractResource`
`11`	`11`	`{`
`12`		`-`
`13`	`12`	`/**`
`14`		`- * @throws GuzzleException`
`15`		`- * @link https://dev.twitch.tv/docs/api/reference#start-commercial`
`16`		`- */`
	`13`	`+ * @throws GuzzleException`
	`14`	`+ * @link https://dev.twitch.tv/docs/api/reference#start-commercial`
	`15`	`+ */`
`17`	`16`	`public function startCommercial(string $bearer, string $broadcasterId, int $length): ResponseInterface`
`18`	`17`	`{`
`19`	`18`	`$queryParamsMap = [];`
Original file line number	Diff line number	Diff line change
`@@ -69,10 +69,10 @@ public function getClips(string $bearer, string $broadcasterId = null, string $g`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`- * @throws GuzzleException`
`73`		`- * @link https://dev.twitch.tv/docs/api/reference#create-clip`
`74`		`- */`
`75`		`- public function createClip(string $bearer, string $broadcasterId, boolean $hasDelay = null): ResponseInterface`
	`72`	`+ * @throws GuzzleException`
	`73`	`+ * @link https://dev.twitch.tv/docs/api/reference#create-clip`
	`74`	`+ */`
	`75`	`+ public function createClip(string $bearer, string $broadcasterId, bool $hasDelay = null): ResponseInterface`
`76`	`76`	`{`
`77`	`77`	`$queryParamsMap = [];`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,12 @@ class EntitlementsApi extends AbstractResource`
`12`	`12`	`/**`
`13`	`13`	`* @throws GuzzleException`
`14`	`14`	`*/`
`15`		`- public function getEntitlementGrantsUploadURL(string $bearer, string $manifestId, string $type = "bulk_drops_grant"): ResponseInterface`
	`15`	`+ public function getEntitlementGrantsUploadURL(string $bearer, string $manifestId, string $type = 'bulk_drops_grant'): ResponseInterface`
`16`	`16`	`{`
`17`	`17`	`$queryParamsMap = [];`
`18`	`18`	`$queryParamsMap[] = ['key' => 'manifest_id', 'value' => $manifestId];`
`19`	`19`	`$queryParamsMap[] = ['key' => 'type', 'value' => $type];`
	`20`	`+`
`20`	`21`	`return $this->postApi('entitlements/upload', $bearer, $queryParamsMap);`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function getStreamForUsername(string $bearer, string $username): Response`
`32`	`32`	`public function getStreamKey(string $bearer, string $broadcasterId): ResponseInterface`
`33`	`33`	`{`
`34`	`34`	`$queryParamsMap = [];`
`35`		`-`
	`35`	`+`
`36`	`36`	`$queryParamsMap[] = ['key' => 'broadcaster_id', 'value' => $broadcasterId];`
`37`	`37`
`38`	`38`	`return $this->callApi('streams/key', $bearer, $queryParamsMap);`