Get closer to @PhpCsFixer standard ruleset

.php_cs.dist

@@ -6,12 +6,47 @@ return PhpCsFixer\Config::create()
         '@PHP56Migration:risky' => true,
         '@PHPUnit57Migration:risky' => true,
         '@PSR2' => true,
+        'align_multiline_comment' => true,
+        'array_indentation' => true,
         'array_syntax' => ['syntax' => 'short'],
         'blank_line_after_opening_tag' => true,
+        'cast_spaces' => true,
         'class_attributes_separation' => [
             'elements' => ['method'],
         ],
+        'class_definition' => true,
+        'combine_consecutive_unsets' => true,
+        'comment_to_phpdoc' => true,
+        'compact_nullable_typehint' => true,
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'declare_equal_normalize' => true,
+        'ereg_to_preg' => true,
+        'error_suppression' => true,
+        'escape_implicit_backslashes' => true,
+        'explicit_string_variable' => true,
+        'final_internal_class' => true,
+        'fopen_flag_order' => true,
+        'fopen_flags' => true,
+        'fully_qualified_strict_types' => true,
+        'function_to_constant' => true,
+        'function_typehint_space' => true,
+        'heredoc_to_nowdoc' => true,
+        'implode_call' => true,
+        'increment_style' => true,
+        'is_null' => true,
         'linebreak_after_opening_tag' => true,
+        'logical_operators' => true,
+        'lowercase_cast' => true,
+        'lowercase_static_reference' => true,
+        'magic_constant_casing' => true,
+        'magic_method_casing' => true,
+        'method_chaining_indentation' => true,
+        'modernize_types_casting' => true,
+        'multiline_comment_opening_closing' => true,
+        'multiline_whitespace_before_semicolons' => true,
+        'native_constant_invocation' => true,
         'native_function_invocation' => true,
     ])
 ;

build.php

@@ -2,15 +2,15 @@
 <?php
 \chdir(\dirname(__FILE__));
 
-$autoload = (int)$argv[1];
+$autoload = (int) $argv[1];
 $returnStatus = null;
 
 if (!$autoload) {
     // Modify composer to not autoload Stripe
     $composer = \json_decode(\file_get_contents('composer.json'), true);
-    unset($composer['autoload']);
-    unset($composer['autoload-dev']);
-    \file_put_contents('composer.json', \json_encode($composer, JSON_PRETTY_PRINT));
+    unset($composer['autoload'], $composer['autoload-dev']);
+
+    \file_put_contents('composer.json', \json_encode($composer, \JSON_PRETTY_PRINT));
 }
 
 \passthru('composer update', $returnStatus);
@@ -19,7 +19,7 @@
 }
 
 $config = $autoload ? 'phpunit.xml' : 'phpunit.no_autoload.xml';
-\passthru("./vendor/bin/phpunit -c $config", $returnStatus);
+\passthru("./vendor/bin/phpunit -c ${config}", $returnStatus);
 if ($returnStatus !== 0) {
     exit(1);
 }

examples/oauth.php

@@ -21,14 +21,14 @@
 
     $accountId = $resp->stripe_user_id;
 
-    echo "<p>Success! Account <code>$accountId</code> is connected.</p>\n";
-    echo "<p>Click <a href=\"?deauth=$accountId\">here</a> to disconnect the account.</p>\n";
+    echo "<p>Success! Account <code>${accountId}</code> is connected.</p>\n";
+    echo "<p>Click <a href=\"?deauth=${accountId}\">here</a> to disconnect the account.</p>\n";
 } elseif (isset($_GET['error'])) {
     // The user was redirect back from the OAuth form with an error.
     $error = $_GET['error'];
     $error_description = $_GET['error_description'];
 
-    echo "<p>Error: code=" . \htmlspecialchars($error, ENT_QUOTES) . ", description=" . \htmlspecialchars($error_description, ENT_QUOTES) . "</p>\n";
+    echo "<p>Error: code=" . \htmlspecialchars($error, \ENT_QUOTES) . ", description=" . \htmlspecialchars($error_description, \ENT_QUOTES) . "</p>\n";
     echo "<p>Click <a href=\"?\">here</a> to restart the OAuth flow.</p>\n";
 } elseif (isset($_GET['deauth'])) {
     // Deauthorization request
@@ -42,11 +42,11 @@
         exit("Error: " . $e->getMessage());
     }
 
-    echo "<p>Success! Account <code>" . \htmlspecialchars($accountId, ENT_QUOTES) . "</code> is disconnected.</p>\n";
+    echo "<p>Success! Account <code>" . \htmlspecialchars($accountId, \ENT_QUOTES) . "</code> is disconnected.</p>\n";
     echo "<p>Click <a href=\"?\">here</a> to restart the OAuth flow.</p>\n";
 } else {
     $url = \Stripe\OAuth::authorizeUrl([
         'scope' => 'read_only',
     ]);
-    echo "<a href=\"$url\">Connect with Stripe</a>\n";
+    echo "<a href=\"${url}\">Connect with Stripe</a>\n";
 }

lib/AlipayAccount.php

@@ -33,7 +33,7 @@ public function instanceUrl()
         }
         $parentExtn = \urlencode(Util\Util::utf8($parent));
         $extn = \urlencode(Util\Util::utf8($this['id']));
-        return "$base/$parentExtn/$path/$extn";
+        return "${base}/${parentExtn}/${path}/${extn}";
     }
 
     /**

lib/ApiOperations/NestedResource.php

@@ -38,7 +38,7 @@ protected static function _nestedResourceUrl($id, $nestedPath, $nestedId = null)
     {
         $url = static::resourceUrl($id) . $nestedPath;
         if ($nestedId !== null) {
-            $url .= "/$nestedId";
+            $url .= "/${nestedId}";
         }
         return $url;
     }

lib/ApiRequestor.php

@@ -57,7 +57,8 @@ private static function _telemetryJson($requestTelemetry)
             'last_request_metrics' => [
                 'request_id' => $requestTelemetry->requestId,
                 'request_duration_ms' => $requestTelemetry->requestDuration,
-        ]];
+            ],
+        ];
 
         $result = \json_encode($payload);
         if ($result != false) {
@@ -127,8 +128,8 @@ public function request($method, $url, $params = null, $headers = null)
     public function handleErrorResponse($rbody, $rcode, $rheaders, $resp)
     {
         if (!\is_array($resp) || !isset($resp['error'])) {
-            $msg = "Invalid response object from API: $rbody "
-              . "(HTTP response code was $rcode)";
+            $msg = "Invalid response object from API: ${rbody} "
+              . "(HTTP response code was ${rcode})";
             throw new Exception\UnexpectedValueException($msg);
         }
 
@@ -259,7 +260,7 @@ private static function _defaultHeaders($apiKey, $clientInfo = null)
     {
         $uaString = 'Stripe/v1 PhpBindings/' . Stripe::VERSION;
 
-        $langVersion = \phpversion();
+        $langVersion = \PHP_VERSION;
         $uname_disabled = \in_array('php_uname', \explode(',', \ini_get('disable_functions')));
         $uname = $uname_disabled ? '(disabled)' : \php_uname();
 
@@ -321,7 +322,7 @@ private function _requestRaw($method, $url, $params, $headers)
             $clientUAInfo = $this->httpClient()->getUserAgentInfo();
         }
 
-        $absUrl = $this->_apiBase.$url;
+        $absUrl = $this->_apiBase . $url;
         $params = self::_encodeObjects($params);
         $defaultHeaders = $this->_defaultHeaders($myApiKey, $clientUAInfo);
         if (Stripe::$apiVersion) {
@@ -419,9 +420,9 @@ private function _interpretResponse($rbody, $rcode, $rheaders)
     {
         $resp = \json_decode($rbody, true);
         $jsonError = \json_last_error();
-        if ($resp === null && $jsonError !== JSON_ERROR_NONE) {
-            $msg = "Invalid response body from API: $rbody "
-              . "(HTTP response code was $rcode, json_last_error() was $jsonError)";
+        if ($resp === null && $jsonError !== \JSON_ERROR_NONE) {
+            $msg = "Invalid response body from API: ${rbody} "
+              . "(HTTP response code was ${rcode}, json_last_error() was ${jsonError})";
             throw new Exception\UnexpectedValueException($msg, $rcode);
         }
 

lib/ApiResource.php

@@ -95,13 +95,13 @@ public static function resourceUrl($id)
         if ($id === null) {
             $class = \get_called_class();
             $message = "Could not determine which URL to request: "
-               . "$class instance has invalid ID: $id";
+               . "${class} instance has invalid ID: ${id}";
             throw new Exception\UnexpectedValueException($message);
         }
         $id = Util\Util::utf8($id);
         $base = static::classUrl();
         $extn = \urlencode($id);
-        return "$base/$extn";
+        return "${base}/${extn}";
     }
 
     /**

lib/ApplicationFeeRefund.php

@@ -34,7 +34,7 @@ public function instanceUrl()
         if (!$id) {
             throw new Exception\UnexpectedValueException(
                 "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
+                "class instance has invalid ID: ${id}",
                 null
             );
         }
@@ -44,7 +44,7 @@ public function instanceUrl()
         $base = ApplicationFee::classUrl();
         $feeExtn = \urlencode($fee);
         $extn = \urlencode($id);
-        return "$base/$feeExtn/refunds/$extn";
+        return "${base}/${feeExtn}/refunds/${extn}";
     }
 
     /**

lib/BankAccount.php

@@ -60,7 +60,7 @@ public function instanceUrl()
         }
         $parentExtn = \urlencode(Util\Util::utf8($parent));
         $extn = \urlencode(Util\Util::utf8($this['id']));
-        return "$base/$parentExtn/$path/$extn";
+        return "${base}/${parentExtn}/${path}/${extn}";
     }
 
     /**

lib/BitcoinReceiver.php

@@ -61,11 +61,11 @@ public function instanceUrl()
             $path = 'sources';
             $parentExtn = \urlencode(Util\Util::utf8($parent));
             $extn = \urlencode(Util\Util::utf8($this['id']));
-            return "$base/$parentExtn/$path/$extn";
+            return "${base}/${parentExtn}/${path}/${extn}";
         } else {
             $base = BitcoinReceiver::classUrl();
             $extn = \urlencode(Util\Util::utf8($this['id']));
-            return "$base/$extn";
+            return "${base}/${extn}";
         }
     }
 }

lib/Capability.php

@@ -40,7 +40,7 @@ public function instanceUrl()
         if (!$id) {
             throw new Exception\UnexpectedValueException(
                 "Could not determine which URL to request: " .
-                "class instance has invalid ID: $id",
+                "class instance has invalid ID: ${id}",
                 null
             );
         }
@@ -50,7 +50,7 @@ public function instanceUrl()
         $base = Account::classUrl();
         $accountExtn = \urlencode($account);
         $extn = \urlencode($id);
-        return "$base/$accountExtn/capabilities/$extn";
+        return "${base}/${accountExtn}/capabilities/${extn}";
     }
 
     /**

lib/Card.php

@@ -93,7 +93,7 @@ public function instanceUrl()
         }
         $parentExtn = \urlencode(Util\Util::utf8($parent));
         $extn = \urlencode(Util\Util::utf8($this['id']));
-        return "$base/$parentExtn/$path/$extn";
+        return "${base}/${parentExtn}/${path}/${extn}";
     }
 
     /**

lib/Collection.php

@@ -96,7 +96,7 @@ public function retrieve($id, $params = null, $opts = null)
         $extn = \urlencode($id);
         list($response, $opts) = $this->_request(
             'get',
-            "$url/$extn",
+            "${url}/${extn}",
             $params,
             $opts
         );
@@ -233,7 +233,7 @@ private function extractPathAndUpdateParams($params)
     {
         $url = \parse_url($this->url);
         if (!isset($url['path'])) {
-            throw new Exception\UnexpectedValueException("Could not parse list url into parts: $url");
+            throw new Exception\UnexpectedValueException("Could not parse list url into parts: ${url}");
         }
 
         if (isset($url['query'])) {

lib/CustomerBalanceTransaction.php

@@ -46,7 +46,7 @@ public function instanceUrl()
         $customer = $this['customer'];
         if (!$id) {
             throw new Exception\UnexpectedValueException(
-                "Could not determine which URL to request: class instance has invalid ID: $id",
+                "Could not determine which URL to request: class instance has invalid ID: ${id}",
                 null
             );
         }
@@ -56,7 +56,7 @@ public function instanceUrl()
         $base = Customer::classUrl();
         $customerExtn = \urlencode($customer);
         $extn = \urlencode($id);
-        return "$base/$customerExtn/balance_transactions/$extn";
+        return "${base}/${customerExtn}/balance_transactions/${extn}";
     }
 
     /**

lib/Exception/ApiErrorException.php

@@ -209,7 +209,7 @@ public function __toString()
 
     protected function constructErrorObject()
     {
-        if (\is_null($this->jsonBody) || !\array_key_exists('error', $this->jsonBody)) {
+        if (null === $this->jsonBody || !\array_key_exists('error', $this->jsonBody)) {
             return null;
         }
 

lib/Exception/OAuth/OAuthErrorException.php

@@ -10,7 +10,7 @@ abstract class OAuthErrorException extends \Stripe\Exception\ApiErrorException
 {
     protected function constructErrorObject()
     {
-        if (\is_null($this->jsonBody)) {
+        if (null === $this->jsonBody) {
             return null;
         }
 

lib/File.php

@@ -51,7 +51,7 @@ public static function classUrl()
     public static function create($params = null, $opts = null)
     {
         $opts = \Stripe\Util\RequestOptions::parse($opts);
-        if (\is_null($opts->apiBase)) {
+        if (null === $opts->apiBase) {
             $opts->apiBase = Stripe::$apiUploadBase;
         }
         // Manually flatten params, otherwise curl's multipart encoder will