Align tools and settings with main project release 9.1 (#25)

vufind-org · Sep 15, 2023 · ce50040 · ce50040
1 parent 5fafa97
commit ce50040
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,13 +11,13 @@ jobs:
       VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
     strategy:
       matrix:
-        php-version: ['7.4', '8.0', '8.1']
+        php-version: ['8.0', '8.1', '8.2']
         include:
-          - php-version: 7.4
-            phing_tasks: "phpunitfast"
           - php-version: 8.0
             phing_tasks: "phpunitfast"
           - php-version: 8.1
+            phing_tasks: "phpunitfast"
+          - php-version: 8.2
             phing_tasks: "phpunitfast phpcs-console php-cs-fixer-dryrun phpstan-console"
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## Next Release - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- The minimum PHP version requirement has been raised to 8.0.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+## Fixed
+
+- Nothing.
+
 ## 3.2.0 - 2022-09-15
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -20,23 +20,21 @@
     },
     "config": {
         "platform": {
-            "php": "7.4.1"
+            "php": "8.0"
         }
     },
     "require": {
-        "php": ">=7.4.1",
+        "php": ">=8.0",
         "laminas/laminas-http": ">=2.2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.14.4",
+        "friendsofphp/php-cs-fixer": "3.26.1",
         "laminas/laminas-uri": ">=2.2",
         "pear/http_request2": "2.5.1",
-        "phploc/phploc": "7.0.2",
         "phpmd/phpmd": "2.13.0",
-        "phpstan/phpstan": "1.10.3",
-        "phpunit/phpunit": "9.6.4",
+        "phpstan/phpstan": "1.10.34",
+        "phpunit/phpunit": "9.6.12",
         "phing/phing": "2.17.4",
-        "sebastian/phpcpd": "6.0.3",
         "squizlabs/php_codesniffer": "3.7.2"
     },
     "autoload": {

diff --git a/src/VuFindHttp/HttpService.php b/src/VuFindHttp/HttpService.php
@@ -202,7 +202,7 @@ public function get(
     ) {
         if ($params) {
             $query = $this->createQueryString($params);
-            if (strpos($url, '?') !== false) {
+            if (str_contains($url, '?')) {
                 $url .= '&' . $query;
             } else {
                 $url .= '?' . $query;

diff --git a/tests/unit-tests/src/VuFindTest/HttpServiceTest.php b/tests/unit-tests/src/VuFindTest/HttpServiceTest.php
@@ -172,7 +172,7 @@ public function testGetAppendsHeaders()
             'http://example.tld',
             ['foo=bar'],
             'test',
-            ["Content-type: application/json", "Accept: application/json"]
+            ['Content-type: application/json', 'Accept: application/json']
         );
     }
 

diff --git a/tests/vufind.php-cs-fixer.php b/tests/vufind.php-cs-fixer.php
@@ -5,7 +5,7 @@
     ->in(__DIR__ . '/../src');
 
 $rules = [
-    '@PHP74Migration' => true,
+    '@PHP80Migration' => true,
     '@PHPUnit84Migration:risky' => true,
     '@PSR12' => true,
     'align_multiline_comment' => true,
@@ -17,7 +17,7 @@
     'class_attributes_separation' => ['elements' => ['method' => 'one', 'property' => 'one']],
     'concat_space' => ['spacing' => 'one'],
     'ereg_to_preg' => true,
-    'function_typehint_space' => true,
+    'get_class_to_class_keyword' => true,
     'global_namespace_import' => [
         'import_functions' => true,
         'import_classes' => null,
@@ -26,11 +26,13 @@
     'linebreak_after_opening_tag' => true,
     'lowercase_cast' => true,
     'magic_constant_casing' => true,
+    'modernize_strpos' => true,
     'native_function_casing' => true,
     'native_function_invocation' => [
         'strict' => true,
         'scope' => 'namespaced',
     ],
+    'no_alias_functions' => true,
     'no_blank_lines_after_class_opening' => true,
     'no_empty_comment' => true,
     'no_empty_phpdoc' => true,
@@ -39,10 +41,13 @@
     'no_leading_import_slash' => true,
     'no_leading_namespace_whitespace' => true,
     'no_mixed_echo_print' => true,
+    'no_php4_constructor' => true,
     'no_singleline_whitespace_before_semicolons' => true,
     'no_spaces_around_offset' => true,
     'no_unneeded_control_parentheses' => true,
     'no_unneeded_curly_braces' => true,
+    'no_unneeded_final_method' => true,
+    'no_unreachable_default_argument_value' => true,
     'no_unused_imports' => true,
     'no_useless_return' => true,
     'no_whitespace_in_blank_line' => true,
@@ -55,8 +60,10 @@
     'php_unit_method_casing' => true,
     'pow_to_exponentiation' => true,
     'single_line_after_imports' => true,
+    'single_quote' => true,
     'standardize_not_equals' => true,
     'ternary_operator_spaces' => true,
+    'type_declaration_spaces' => true,
 ];
 
 $cacheDir = __DIR__ . '/../.php_cs_cache';