Merge pull request #797 from zachborboa/master

Update PHP_CodeSniffer ruleset: PSR2 → PSR12

examples/before_send_retry.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/coinbase_account_balance.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/coinbase_btc_spot_price.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/coinbase_eth_spot_price.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/curl_display_curl_option_value.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/curl_display_curl_option_values.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/curl_display_curl_option_values_user_set.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/curl_progress.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 // Note: The server needs to send a content-length header for progress to work.

examples/curl_progress_advanced.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 // Note: The server needs to send a content-length header for progress to work.

examples/custom.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/delete.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/deviant_art_rss.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/diagnose_request.php

@@ -1,4 +1,5 @@
 <?php
+
 // keywords: diagnose, troubleshoot, help
 
 require __DIR__ . '/../vendor/autoload.php';

examples/download_file_with_redirect.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/download_files.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/download_files_with_callback.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/flickr_photo_search.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_base_url_1.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_base_url_2.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_first_n_bytes.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_pages.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_relative.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_response_cookies.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_with_callable_retry.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_with_callable_retry_based_on_http_status_code.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_with_port.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_with_retry.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/get_without_downloading_full_error_response.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/github_create_gist.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/gmail_send_email.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/google_maps_geocode_address.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/google_plus_profile.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/google_spreadsheet_values_update.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/gratipay_send_tip.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/head.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/instagram_popular_media.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/instagram_search_photos.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/mailchimp_subscribe_email_address.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/memory_leak_test_curl.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/memory_leak_test_multi_curl.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_add_curl.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/multi_curl_add_curl_from_url_list.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_before_send.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_before_send_retry.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_delete.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_download_files.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_download_files_with_callback.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_download_files_with_callbacks.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_callbacks.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_load_test.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_process_later.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_relative.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_with_callable_retry.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_with_new_random_proxy.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\ArrayUtil;

examples/multi_curl_get_with_new_random_unique_proxy.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\ArrayUtil;

examples/multi_curl_get_with_rate_limit.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_get_with_retry.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_patch.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_post.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_proxies.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_proxy.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_proxy_socks5.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_put.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_set_custom_instance_tag.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_stop.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/multi_curl_upload_file.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\MultiCurl;

examples/options.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/patch.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post_json.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post_json_array_response.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post_json_manual_encoding.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post_multiple_values_same_key_with_indexes_explicit.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post_multiple_values_same_key_with_indexes_implicit.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/post_redirect_get.php

@@ -1,4 +1,5 @@
 <?php
+
 // Perform a post-redirect-get request (POST data and follow 303 redirections
 // using GET requests).
 $curl = new Curl();

examples/post_xml.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/proxy.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/proxy_socks5.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/put.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/reddit_top_pics.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/search.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/set_cookie.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/set_url_1.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/set_url_2.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/twitter_post_tweet.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/twitter_trending_topics.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/upload_file.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/use_custom_xml_decoder.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/youtube_list_playlist_videos.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

examples/youtube_video_count.php

@@ -1,4 +1,5 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
 
 use Curl\Curl;

scripts/bump_major_version.php

@@ -7,13 +7,15 @@ $current_version = Curl\Curl::VERSION;
 list($major, $_, $__) = explode('.', $current_version);
 $new_version = implode('.', [(string)((int)$major += 1), '0', '0']);
 
-foreach ([
+foreach (
+    [
         [
             __DIR__ . '/../src/Curl/Curl.php',
             '/const VERSION = \'(?:\d+.\d+.\d+)\';/',
             'const VERSION = \'' . $new_version . '\';',
         ],
-    ] as $info) {
+    ] as $info
+) {
     list($filepath, $find, $replace) = $info;
     $data = preg_replace($find, $replace, file_get_contents($filepath));
     file_put_contents($filepath, $data);

scripts/bump_minor_version.php

@@ -7,13 +7,15 @@ $current_version = Curl\Curl::VERSION;
 list($major, $minor, $_) = explode('.', $current_version);
 $new_version = implode('.', [$major, (string)((int)$minor += 1), '0']);
 
-foreach ([
+foreach (
+    [
         [
             __DIR__ . '/../src/Curl/Curl.php',
             '/const VERSION = \'(?:\d+.\d+.\d+)\';/',
             'const VERSION = \'' . $new_version . '\';',
         ],
-    ] as $info) {
+    ] as $info
+) {
     list($filepath, $find, $replace) = $info;
     $data = preg_replace($find, $replace, file_get_contents($filepath));
     file_put_contents($filepath, $data);

scripts/bump_patch_version.php

@@ -7,13 +7,15 @@ $current_version = Curl\Curl::VERSION;
 list($major, $minor, $patch) = explode('.', $current_version);
 $new_version = implode('.', [$major, $minor, (string)((int)$patch += 1)]);
 
-foreach ([
+foreach (
+    [
         [
             __DIR__ . '/../src/Curl/Curl.php',
             '/const VERSION = \'(?:\d+.\d+.\d+)\';/',
             'const VERSION = \'' . $new_version . '\';',
         ],
-    ] as $info) {
+    ] as $info
+) {
     list($filepath, $find, $replace) = $info;
     $data = preg_replace($find, $replace, file_get_contents($filepath));
     file_put_contents($filepath, $data);

src/Curl/ArrayUtil.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Curl;
 

src/Curl/BaseCurl.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Curl;
 

src/Curl/CaseInsensitiveArray.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Curl;
 
@@ -7,7 +9,6 @@ namespace Curl;
  */
 class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator
 {
-
     /**
      * @var mixed[] Data storage with lowercase keys.
      *

src/Curl/Curl.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Curl;
 
@@ -142,7 +144,8 @@ class Curl extends BaseCurl
         $binary_data = false;
 
         // Return JSON-encoded string when the request's content-type is JSON and the data is serializable.
-        if (isset($this->headers['Content-Type']) &&
+        if (
+            isset($this->headers['Content-Type']) &&
             preg_match($this->jsonPattern, $this->headers['Content-Type']) &&
             (
                 is_array($data) ||
@@ -151,7 +154,8 @@ class Curl extends BaseCurl
                     interface_exists('JsonSerializable', false) &&
                     $data instanceof \JsonSerializable
                 )
-            )) {
+            )
+        ) {
             $data = \Curl\Encoder::encodeJson($data);
         } elseif (is_array($data)) {
             // Manually build a single-dimensional array from a multi-dimensional array as using curl_setopt($ch,
@@ -179,12 +183,14 @@ class Curl extends BaseCurl
             }
         }
 
-        if (!$binary_data &&
+        if (
+            !$binary_data &&
             (is_array($data) || is_object($data)) &&
             (
                 !isset($this->headers['Content-Type']) ||
                 !preg_match('/^multipart\/form-data/', $this->headers['Content-Type'])
-            )) {
+            )
+        ) {
             // Avoid using http_build_query() as keys with null values are
             // unexpectedly excluded from the resulting string.
             //
@@ -1310,10 +1316,12 @@ class Curl extends BaseCurl
 
             echo 'Request contained ' . ($request_body_empty ? 'no body' : 'a body') . '.' . "\n";
 
-            if ($request_headers_count === 0 && (
+            if (
+                $request_headers_count === 0 && (
                 $this->getOpt(CURLOPT_VERBOSE) ||
                 !$this->getOpt(CURLINFO_HEADER_OUT)
-            )) {
+                )
+            ) {
                 echo
                     'Warning: Request headers (Curl::requestHeaders) are expected to be empty ' .
                     '(CURLOPT_VERBOSE was enabled or CURLINFO_HEADER_OUT was disabled).' . "\n";
@@ -1378,8 +1386,10 @@ class Curl extends BaseCurl
                     echo 'Response content length (calculated): ' . $response_calculated_length . "\n";
                 }
 
-                if (isset($this->responseHeaders['Content-Type']) &&
-                    preg_match($this->jsonPattern, $this->responseHeaders['Content-Type'])) {
+                if (
+                    isset($this->responseHeaders['Content-Type']) &&
+                    preg_match($this->jsonPattern, $this->responseHeaders['Content-Type'])
+                ) {
                     $parsed_response = json_decode($this->rawResponse, true);
                     if ($parsed_response !== null) {
                         $messages = [];
@@ -1617,8 +1627,10 @@ class Curl extends BaseCurl
     public function __get($name)
     {
         $return = null;
-        if (in_array($name, self::$deferredProperties, true) &&
-            is_callable([$this, $getter = 'get' . ucfirst($name)])) {
+        if (
+            in_array($name, self::$deferredProperties, true) &&
+            is_callable([$this, $getter = 'get' . ucfirst($name)])
+        ) {
             $return = $this->$name = $this->$getter();
         }
         return $return;
@@ -1915,8 +1927,10 @@ class Curl extends BaseCurl
             }
         }
 
-        if (isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip' &&
-            is_string($response)) {
+        if (
+            isset($response_headers['Content-Encoding']) && $response_headers['Content-Encoding'] === 'gzip' &&
+            is_string($response)
+        ) {
             // Use @ to suppress message "Warning gzdecode(): data error".
             $decoded_response = @gzdecode($response);
             if ($decoded_response !== false) {

src/Curl/Decoder.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace Curl;