Merge 9daa326 into 11c80e8

.github/workflows/php.yml

@@ -64,6 +64,9 @@ jobs:
         env:
           TERM: xterm-256color
 
+      - name: Check code for standards compliance
+        run: vendor/bin/php-cs-fixer fix --verbose --ansi --dry-run --using-cache=no --diff src/
+
       - name: Run test suite
         run: vendor/bin/phpunit --verbose
         env:

composer.json

@@ -27,6 +27,7 @@
     "league/oauth2-client": "~2.3"
   },
   "require-dev": {
+    "friendsofphp/php-cs-fixer": "^3.4",
     "phpstan/phpstan": "^1.5",
     "phpunit/phpunit": "^9"
   },
@@ -46,8 +47,10 @@
     "ci": [
       "Composer\\Config::disableProcessTimeout",
       "@analyze",
+      "@style",
       "@test"
     ],
+    "style": "php-cs-fixer fix --verbose --ansi --using-cache=no src/",
     "test": "phpunit"
   }
 }

src/Strava/API/OAuth.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Strava\API;
 
 use League\OAuth2\Client\Token\AccessToken as AccessToken;
@@ -51,7 +52,7 @@ public function urlUserDetails()
      */
     public function userDetails($response)
     {
-        $user = new stdClass;
+        $user = new stdClass();
 
         $user->uid = $response->id;
         $user->name = implode(' ', [$response->firstname, $response->lastname]);

src/Strava/API/Service/REST.php

@@ -99,12 +99,12 @@ protected function getResponse($method, $path, $parameters)
             $response = $this->adapter->request($method, $path, $parameters);
             $result = $this->getResult($response);
 
-            if ($this->responseVerbosity === 0 && !is_string($result))
+            if ($this->responseVerbosity === 0 && !is_string($result)) {
                 return $result["body"];
+            }
 
             return $result;
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             throw new Exception('[SERVICE] ' . $e->getMessage());
         }
     }
@@ -587,5 +587,4 @@ public function getStreamsRoute($id)
 
         return $this->getResponse('GET', $path, $parameters);
     }
-
 }

src/Strava/API/Service/Stub.php

@@ -207,7 +207,7 @@ public function getRoute($id)
         $json = '{"response": 1}';
         return $this->format($json);
     }
-    
+
     public function getRouteAsGPX($id)
     {
         $gpx = '<?xml version="1.0" encoding="UTF-8"?><gpx creator="StravaGPX"/>';