Raise minimum PHP version to 7.4

https://www.php.net/releases/7_3_0.php
https://www.php.net/releases/7_4_0.php

This installed a newer version of CS Fixer

 - friendsofphp/php-cs-fixer updated from v3.4.0 to v3.72.0 minor
   See changes: PHP-CS-Fixer/PHP-CS-Fixer@FriendsOfPHP:v3.4.0...PHP-CS-Fixer:v3.72.0
   Release notes: https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v3.72.0

As a result, I had to fix some rules:

- Rename `braces` rule.
- Disable `phpdoc_to_return_type` since it now tries to move PHPDoc `@return` with a generic argument (e.g. `?T`) to a type hint.
- Apply `single_line_comment_spacing` fix.

Author: jtojnar

.github/workflows/main.yaml

@@ -20,8 +20,6 @@ jobs:
           - '8.1'
           - '8.0'
           - '7.4'
-          - '7.3'
-          - '7.2'
         include:
           - php: '7.4'
             cs_fixer: true

.php-cs-fixer.php

@@ -9,11 +9,14 @@
     '@PHP71Migration' => true,
     '@PHP71Migration:risky' => true,
     // 'phpdoc_to_param_type' => true,
-    'phpdoc_to_return_type' => true,
+    // 'phpdoc_to_return_type' => true,
     'phpdoc_types_order' => false,
 
     // overwrite some Symfony rules
-    'braces' => ['position_after_functions_and_oop_constructs' => 'same'],
+    'braces_position' => [
+        'functions_opening_brace' => 'same_line',
+        'classes_opening_brace' => 'same_line',
+    ],
     'function_declaration' => ['closure_function_spacing' => 'none'],
     'concat_space' => ['spacing' => 'one'],
     'phpdoc_align' => false,

NEWS.md

@@ -1,5 +1,8 @@
 # guzzle-transcoder changes
 
+## 0.3.1 – unreleased
+- Raise minimum PHP version to 7.4.0.
+
 ## 0.3.0 – 2023-03-06
 - Raise minimum PHP version to 7.2.5.
 - Add support for fossar/transcoder 2.0.

composer.json

@@ -3,7 +3,7 @@
     "description": "Guzzle plugin that converts responses to UTF-8",
     "type": "library",
     "require": {
-        "php": ">=7.2.5",
+        "php": ">=7.4.0",
         "guzzlehttp/guzzle": "^6.3 || ^7.0",
         "fossar/transcoder": "^1.0 || ^2.0",
         "guzzlehttp/psr7": "^1.7 || ^2.0"
@@ -29,7 +29,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.2.5"
+            "php": "7.4.0"
         }
     },
     "scripts": {

src/Utils.php

@@ -174,7 +174,7 @@ public static function joinHttpHeaderWords(array $headerValues): string {
         }
         /** @var array<array<string, ?string>> $headerValues */
         $spaces = '\\s';
-        $ctls = '\\x00-\\x1F\\x7F'; //@see http://stackoverflow.com/a/1497928/413531
+        $ctls = '\\x00-\\x1F\\x7F'; // @see http://stackoverflow.com/a/1497928/413531
         $tspecials = '()<>@,;:<>/[\\]?.="\\\\';
         $tokenPattern = "#^[^{$spaces}{$ctls}{$tspecials}]+$#";
         $result = [];