Code style fix

Author: Южаков Георгий

README.md

@@ -111,7 +111,6 @@ Extensions
 
 Tests
 ------
-To run the tests, run the command
 ```bash
     composer tests
 ```

examples/amazon.php

@@ -1,21 +1,20 @@
 <?php
 
 /**
- * Example of retrieving an authentication token of the Amazon service
+ * Example of retrieving an authentication token of the Amazon service.
  *
  * PHP version 5.4
  *
  * @author     Flávio Heleno <flaviohbatista@gmail.com>
- * @copyright  Copyright (c) 2012 The authors
  * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use OAuth\OAuth2\Service\Amazon;
-use OAuth\Common\Storage\Session;
 use OAuth\Common\Consumer\Credentials;
+use OAuth\Common\Storage\Session;
+use OAuth\OAuth2\Service\Amazon;
 
 /**
- * Bootstrap the example
+ * Bootstrap the example.
  */
 require_once __DIR__ . '/bootstrap.php';
 
@@ -30,8 +29,8 @@
 );
 
 // Instantiate the Amazon service using the credentials, http client, storage mechanism for the token and profile scope
-/** @var $amazonService Amazon */
-$amazonService = $serviceFactory->createService('amazon', $credentials, $storage, array('profile'));
+/** @var Amazon $amazonService */
+$amazonService = $serviceFactory->createService('amazon', $credentials, $storage, ['profile']);
 
 if (!empty($_GET['code'])) {
     // This was a callback request from Amazon, get the token
@@ -42,7 +41,6 @@
 
     // Show some of the resultant data
     echo 'Your unique Amazon user id is: ' . $result['user_id'] . ' and your name is ' . $result['name'];
-
 } elseif (!empty($_GET['go']) && $_GET['go'] === 'go') {
     $url = $amazonService->getAuthorizationUri();
     header('Location: ' . $url);

examples/battlenet.php

@@ -6,24 +6,23 @@
  * PHP version 5.4
  *
  * @author     Mukunda Johnson (mukunda.com)
- * @copyright  Copyright (c) 2012 The authors
  * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use OAuth\OAuth2\Service\BattleNet;
-use OAuth\Common\Storage\Session;
 use OAuth\Common\Consumer\Credentials;
 use OAuth\Common\Http\Uri\Uri;
+use OAuth\Common\Storage\Session;
+use OAuth\OAuth2\Service\BattleNet;
 
 /** ---------------------------------------------------------------------------
- * Bootstrap the example
+ * Bootstrap the example.
  */
 require_once __DIR__ . '/bootstrap.php';
 
-if( empty( $_GET['code'] ) && !isset($_GET['go'] )) {
+if (empty($_GET['code']) && !isset($_GET['go'])) {
 
     // Empty query; show the startup page.
-    
+
     echo '
     
     <p>Sign-in using Battle.net. Please pick your region:</p>
@@ -37,7 +36,7 @@
     </p>
     
     ';
-    
+
     die();
 }
 
@@ -54,40 +53,37 @@
     $servicesCredentials['battlenet']['secret'],
     $currentUri->getAbsoluteUri()
 );
- 
-$region = isset($_GET['region']) ? $_GET['region'] : "";
 
-$region_map = array(
+$region = $_GET['region'] ?? '';
+
+$region_map = [
     'us' => BattleNet::API_URI_US, // USA - this is the default if you omit the base API URI.
     'eu' => BattleNet::API_URI_EU, // Europe
     'kr' => BattleNet::API_URI_KR, // Korea
     'tw' => BattleNet::API_URI_TW, // Taiwan
     'cn' => BattleNet::API_URI_CN, // China
-);
+];
 
 // Get base API URI from region.
-$apiuri = isset( $region_map[$region] ) ? new Uri( $region_map[$region] ) : null;
+$apiuri = isset($region_map[$region]) ? new Uri($region_map[$region]) : null;
 
 // Without any scopes, we can get their BattleTag.
-$scopes = array();
+$scopes = [];
 
-$battlenetService = $serviceFactory->createService( 
-                        'battlenet', $credentials, $storage, $scopes, $apiuri );
+$battlenetService = $serviceFactory->createService(
+                        'battlenet', $credentials, $storage, $scopes, $apiuri);
 
-if( !empty($_GET['code']) ) {
+if (!empty($_GET['code'])) {
     // This was a callback request from Battle.net, get the token
-    $token = $battlenetService->requestAccessToken( $_GET['code'] );
+    $token = $battlenetService->requestAccessToken($_GET['code']);
 
     // See https://dev.battle.net/io-docs for OAuth request types.
     //
     // Without any scopes specified, we can get their BattleTag.
-    $result = json_decode( $battlenetService->request('/account/user') );
+    $result = json_decode($battlenetService->request('/account/user'));
 
     echo "Your BattleTag is \"$result->battletag\".";
-
-} elseif( isset($_GET['go']) ) {
-
+} elseif (isset($_GET['go'])) {
     $url = $battlenetService->getAuthorizationUri();
-    header( "Location: $url" );
-    
+    header("Location: $url");
 }

examples/bitbucket.php

@@ -1,24 +1,24 @@
 <?php
 
 /**
- * Example of retrieving an authentication token from the BitBucket service
+ * Example of retrieving an authentication token from the BitBucket service.
  *
  * PHP version 5.4
+ *
  * @author     Ændrew Rininsland <me@aendrew.com>
- * 
+ *
  * Shamelessly cribbed from work by:
  * @author     David Desberg <david@daviddesberg.com>
  * @author     Pieter Hordijk <info@pieterhordijk.com>
- * @copyright  Copyright (c) 2012 The authors
  * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use OAuth\OAuth1\Service\BitBucket;
-use OAuth\Common\Storage\Session;
 use OAuth\Common\Consumer\Credentials;
+use OAuth\Common\Storage\Session;
+use OAuth\OAuth1\Service\BitBucket;
 
 /**
- * Bootstrap the example
+ * Bootstrap the example.
  */
 require_once __DIR__ . '/bootstrap.php';
 
@@ -34,7 +34,7 @@
 );
 
 // Instantiate the BitBucket service using the credentials, http client and storage mechanism for the token
-/** @var $bbService BitBucket */
+/** @var BitBucket $bbService */
 $bbService = $serviceFactory->createService('BitBucket', $credentials, $storage);
 
 if (!empty($_GET['oauth_token'])) {
@@ -50,13 +50,12 @@
     // Send a request now that we have access token
     $result = json_decode($bbService->request('user/repositories'));
 
-    echo('The first repo in the list is ' . $result[0]->name);
-
+    echo 'The first repo in the list is ' . $result[0]->name;
 } elseif (!empty($_GET['go']) && $_GET['go'] === 'go') {
     // extra request needed for oauth1 to request a request token :-)
     $token = $bbService->requestRequestToken();
 
-    $url = $bbService->getAuthorizationUri(array('oauth_token' => $token->getRequestToken()));
+    $url = $bbService->getAuthorizationUri(['oauth_token' => $token->getRequestToken()]);
     header('Location: ' . $url);
 } else {
     $url = $currentUri->getRelativeUri() . '?go=go';

examples/bitly.php

@@ -1,22 +1,21 @@
 <?php
 
 /**
- * Example of retrieving an authentication token of the Bitly service
+ * Example of retrieving an authentication token of the Bitly service.
  *
  * PHP version 5.4
  *
  * @author     David Desberg <david@daviddesberg.com>
  * @author     Pieter Hordijk <info@pieterhordijk.com>
- * @copyright  Copyright (c) 2012 The authors
  * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use OAuth\OAuth2\Service\Bitly;
-use OAuth\Common\Storage\Session;
 use OAuth\Common\Consumer\Credentials;
+use OAuth\Common\Storage\Session;
+use OAuth\OAuth2\Service\Bitly;
 
 /**
- * Bootstrap the example
+ * Bootstrap the example.
  */
 require_once __DIR__ . '/bootstrap.php';
 
@@ -31,7 +30,7 @@
 );
 
 // Instantiate the Bitly service using the credentials, http client and storage mechanism for the token
-/** @var $bitlyService Bitly */
+/** @var Bitly $bitlyService */
 $bitlyService = $serviceFactory->createService('bitly', $credentials, $storage);
 
 if (!empty($_GET['code'])) {
@@ -43,7 +42,6 @@
 
     // Show some of the resultant data
     echo 'Your unique user id is: ' . $result['data']['login'] . ' and your name is ' . $result['data']['display_name'];
-
 } elseif (!empty($_GET['go']) && $_GET['go'] === 'go') {
     $url = $bitlyService->getAuthorizationUri();
     header('Location: ' . $url);

examples/bitrix24.php

@@ -1,22 +1,21 @@
 <?php
 
 /**
- * Example of retrieving an authentication token of the Bitrix24 service
+ * Example of retrieving an authentication token of the Bitrix24 service.
  *
  * PHP version 5.4
  *
  * @author     David Desberg <david@daviddesberg.com>
  * @author     Pieter Hordijk <info@pieterhordijk.com>
- * @copyright  Copyright (c) 2012 The authors
  * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use OAuth\OAuth2\Service\GitHub;
-use OAuth\Common\Storage\Session;
 use OAuth\Common\Consumer\Credentials;
+use OAuth\Common\Storage\Session;
+use OAuth\OAuth2\Service\GitHub;
 
 /**
- * Bootstrap the example
+ * Bootstrap the example.
  */
 require_once __DIR__ . '/bootstrap.php';
 
@@ -32,9 +31,9 @@
 
 // Instantiate the GitHub service using the credentials, http client and storage mechanism for the token
 
-$yourDomain = new \OAuth\Common\Http\Uri\Uri('https://'.$servicesCredentials['bitrix24']['domain']);
-/** @var $bitrix24 \OAuth\OAuth2\Service\Bitrix24 */
-$bitrix24 = $serviceFactory->createService('Bitrix24', $credentials, $storage, array('user'), $yourDomain);
+$yourDomain = new \OAuth\Common\Http\Uri\Uri('https://' . $servicesCredentials['bitrix24']['domain']);
+/** @var \OAuth\OAuth2\Service\Bitrix24 $bitrix24 */
+$bitrix24 = $serviceFactory->createService('Bitrix24', $credentials, $storage, ['user'], $yourDomain);
 
 if (!empty($_GET['code'])) {
     // This was a callback request from bitrix24, get the token
@@ -45,11 +44,9 @@
 
     // Show some of the resultant data
     echo 'Your email on your bitrix24 account is ' . $userInfo['EMAIL'];
-
 } elseif (!empty($_GET['go']) && $_GET['go'] === 'go') {
     $url = $bitrix24->getAuthorizationUri();
     header('Location: ' . $url);
-
 } else {
     $url = $currentUri->getRelativeUri() . '?go=go';
     echo "<a href='$url'>Login with Bitrix24!</a>";

examples/bootstrap.php

@@ -1,29 +1,25 @@
 <?php
 
 /**
- * Bootstrap the library
+ * Bootstrap the library.
  */
 require_once __DIR__ . '/../vendor/autoload.php';
 
-/**
- * Setup error reporting
- */
+// Setup error reporting
 error_reporting(E_ALL);
 ini_set('display_errors', 1);
 
-/**
- * Setup the timezone
- */
+// Setup the timezone
 ini_set('date.timezone', 'Europe/Amsterdam');
 
 /**
- * Create a new instance of the URI class with the current URI, stripping the query string
+ * Create a new instance of the URI class with the current URI, stripping the query string.
  */
 $uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
 $currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
 $currentUri->setQuery('');
 
 /**
- * Load the credential for the different services
+ * Load the credential for the different services.
  */
 require_once __DIR__ . '/init.php';

examples/box.php

@@ -1,23 +1,22 @@
 <?php
 
 /**
- * Example of retrieving an authentication token of the Box service
+ * Example of retrieving an authentication token of the Box service.
  *
  * PHP version 5.4
  *
  * @author     David Desberg <david@daviddesberg.com>
  * @author     Pieter Hordijk <info@pieterhordijk.com>
  * @author     Antoine Corcy <contact@sbin.dk>
- * @copyright  Copyright (c) 2012 The authors
  * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
  */
 
-use OAuth\OAuth2\Service\Box;
-use OAuth\Common\Storage\Session;
 use OAuth\Common\Consumer\Credentials;
+use OAuth\Common\Storage\Session;
+use OAuth\OAuth2\Service\Box;
 
 /**
- * Bootstrap the example
+ * Bootstrap the example.
  */
 require_once __DIR__ . '/bootstrap.php';
 
@@ -32,12 +31,12 @@
 );
 
 // Instantiate the Box service using the credentials, http client and storage mechanism for the token
-/** @var $boxService Box */
+/** @var Box $boxService */
 $boxService = $serviceFactory->createService('box', $credentials, $storage);
 
 if (!empty($_GET['code'])) {
     // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
+    $state = $_GET['state'] ?? null;
 
     // This was a callback request from box, get the token
     $token = $boxService->requestAccessToken($_GET['code'], $state);
@@ -47,7 +46,6 @@
 
     // Show some of the resultant data
     echo 'Your Box name is ' . $result['name'] . ' and your email is ' . $result['login'];
-
 } elseif (!empty($_GET['go']) && $_GET['go'] === 'go') {
     $url = $boxService->getAuthorizationUri();
     // var_dump($url);