Merge branch '12.0' into pkolmann_registriy

Author: pkolmann

.github/SECURITY.md

@@ -3,7 +3,7 @@
 ## Supported Versions
 
 After each new major release, the previous release will be supported for no
-less than 2 years, unless explictly stated otherwise. This may mean that there
+less than 2 years, unless explicitly stated otherwise. This may mean that there
 are multiple supported versions at any given time.
 
 ## Reporting a Vulnerability

.github/workflows/static.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -23,14 +23,14 @@ jobs:
           update: true
 
       - name: Install Dependencies
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer update --no-interaction --no-progress
 
       - name: Install PHPStan
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
@@ -41,7 +41,7 @@ jobs:
 
   psalm:
     name: Psalm
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code
@@ -57,14 +57,14 @@ jobs:
           update: true
 
       - name: Install Dependencies
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer update --no-interaction --no-progress
 
       - name: Install Psalm
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5

.github/workflows/tests.yml

@@ -7,11 +7,11 @@ on:
 jobs:
   tests:
     name: PHP ${{ matrix.php }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
-        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
 
     steps:
       - name: Checkout Code
@@ -30,14 +30,14 @@ jobs:
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Install Dependencies
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer update --no-interaction --no-progress
 
       - name: Install PHPUnit
-        uses: nick-invision/retry@v2
+        uses: nick-invision/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5

.styleci.yml

@@ -16,7 +16,6 @@ enabled:
 disabled:
   - native_constant_invocation_symfony
   - native_function_invocation_symfony
-  - no_superfluous_phpdoc_tags_symfony
   - phpdoc_align
   - phpdoc_to_comment
   - phpdoc_var_without_name

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [12.0.0] - 2025-02-23
+
+* Add PHP 8.4 support
+* Drop support for PHP earlier than 8.1
+* Moved various param types to native PHP types
+
 ## [11.14.0] - 2024-03-11
 
 * Add support for `php-http/cache-plugin:^2.0`

LICENSE

@@ -1,7 +1,7 @@
 MIT License
 
 Copyright (c) 2012-2018 Matt Humphrey <[email protected]>
-Copyright (c) 2018-2024 Graham Campbell <[email protected]>
+Copyright (c) 2018-2025 Graham Campbell <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -23,27 +23,26 @@ Check out the [change log](CHANGELOG.md), [releases](https://github.com/GitLabPH
 
 ## Installation
 
-This version supports [PHP](https://php.net) 7.4-8.3. To get started, simply require the project using [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
+This version supports [PHP](https://php.net) 8.1-8.4. To get started, simply require the project using [Composer](https://getcomposer.org). You will also need to install packages that "provide" [`psr/http-client-implementation`](https://packagist.org/providers/psr/http-client-implementation) and [`psr/http-factory-implementation`](https://packagist.org/providers/psr/http-factory-implementation).
 
 ### Standard Installation
 
 ```bash
-$ composer require "m4tthumphrey/php-gitlab-api:^11.14" \
-  "guzzlehttp/guzzle:^7.8" "http-interop/http-factory-guzzle:^1.2"
+$ composer require "m4tthumphrey/php-gitlab-api:^12.0" "guzzlehttp/guzzle:^7.9.2"
 ```
 
 ### Framework Integration
 
 #### Laravel:
 
 ```bash
-$ composer require "graham-campbell/gitlab:^7.5"
+$ composer require "graham-campbell/gitlab:^8.0"
 ```
 
 #### Symfony:
 
 ```bash
-$ composer require "zeichen32/gitlabapibundle:^6.1"
+$ composer require "zeichen32/gitlabapibundle:^7.0"
 ```
 
 We are decoupled from any HTTP messaging client by using [PSR-7](https://www.php-fig.org/psr/psr-7/), [PSR-17](https://www.php-fig.org/psr/psr-17/), [PSR-18](https://www.php-fig.org/psr/psr-18/), and [HTTPlug](https://httplug.io/). You can visit [HTTPlug for library users](https://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages. The framework integration [graham-campbell/gitlab](https://github.com/GrahamCampbell/Laravel-GitLab) is by [Graham Campbell](https://github.com/GrahamCampbell) and [zeichen32/gitlabapibundle](https://github.com/Zeichen32/GitLabApiBundle) is by [Jens Averkamp](https://github.com/Zeichen32).
@@ -96,7 +95,7 @@ $builder->addPlugin($plugin);
 $client = new Gitlab\Client($builder);
 ```
 
-One can read more about HTTPlug plugins [here](https://docs.php-http.org/en/latest/plugins/introduction.html#how-it-works). Take a look around the [API methods](https://github.com/GitLabPHP/Client/tree/11.2/src/Api), and please feel free to report any bugs, noting our [code of conduct](.github/CODE_OF_CONDUCT.md).
+One can read more about HTTPlug plugins [here](https://docs.php-http.org/en/latest/plugins/introduction.html#how-it-works). Take a look around the [API methods](https://github.com/GitLabPHP/Client/tree/12.0/src/Api), and please feel free to report any bugs, noting our [code of conduct](.github/CODE_OF_CONDUCT.md).
 
 
 ## Contributing

composer.json

@@ -26,25 +26,23 @@
         }
     ],
     "require": {
-        "php": "^7.4.15 || ^8.0.2",
+        "php": "^8.1",
         "ext-json": "*",
         "ext-xml": "*",
-        "php-http/cache-plugin": "^1.8.1 || ^2.0",
-        "php-http/client-common": "^2.7.1",
-        "php-http/discovery": "^1.19.2",
-        "php-http/httplug": "^2.4",
-        "php-http/multipart-stream-builder": "^1.3",
-        "psr/cache": "^1.0 || ^2.0 || ^3.0",
+        "php-http/cache-plugin": "^2.0.1",
+        "php-http/client-common": "^2.7.2",
+        "php-http/discovery": "^1.20.0",
+        "php-http/httplug": "^2.4.1",
+        "php-http/multipart-stream-builder": "^1.4.2",
+        "psr/cache": "^2.0 || ^3.0",
         "psr/http-client-implementation": "^1.0",
         "psr/http-factory-implementation": "^1.0",
         "psr/http-message": "^1.1 || ^2.0",
-        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/polyfill-php80": "^1.26"
+        "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8.2",
-        "guzzlehttp/guzzle": "^7.8",
-        "http-interop/http-factory-guzzle": "^1.2"
+        "guzzlehttp/guzzle": "^7.9.2"
     },
     "autoload": {
         "psr-4": {

phpstan-baseline.neon

@@ -1,42 +1,104 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, Closure\\(\\)\\: void given\\.$#"
+			message: '#^Parameter \#1 \$callback of function set_error_handler expects \(callable\(int, string, string, int\)\: bool\)\|null, Closure\(\)\: void given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/Api/AbstractApi.php
 
 		-
-			message: "#^Parameter \\#2 \\$resource of method Http\\\\Message\\\\MultipartStream\\\\MultipartStreamBuilder\\:\\:addResource\\(\\) expects Psr\\\\Http\\\\Message\\\\StreamInterface\\|resource\\|string, mixed given\\.$#"
+			message: '#^Parameter \#2 \$resource of method Http\\Message\\MultipartStream\\MultipartStreamBuilder\:\:addResource\(\) expects Psr\\Http\\Message\\StreamInterface\|resource\|string, mixed given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/Api/AbstractApi.php
 
 		-
-			message: "#^Parameter \\#4 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, mixed given\\.$#"
+			message: '#^Parameter \#4 \.\.\.\$values of function sprintf expects bool\|float\|int\|string\|null, mixed given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/Api/AbstractApi.php
 
 		-
-			message: "#^Property Gitlab\\\\Api\\\\AbstractApi\\:\\:\\$perPage is never written, only read\\.$#"
+			message: '#^Property Gitlab\\Api\\AbstractApi\:\:\$perPage \(int\|null\) is never assigned int so it can be removed from the property type\.$#'
+			identifier: property.unusedType
 			count: 1
 			path: src/Api/AbstractApi.php
 
 		-
-			message: "#^PHPDoc tag @return contains generic type Http\\\\Promise\\\\Promise\\<Psr\\\\Http\\\\Message\\\\ResponseInterface\\> but interface Http\\\\Promise\\\\Promise is not generic\\.$#"
+			message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
+			identifier: foreach.nonIterable
+			count: 1
+			path: src/Api/Groups.php
+
+		-
+			message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
+			identifier: foreach.nonIterable
+			count: 2
+			path: src/Api/Projects.php
+
+		-
+			message: '#^Parameter \#1 \$array of function array_values expects array\<T\>, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Api/Projects.php
+
+		-
+			message: '#^Parameter \#1 \$options of method Symfony\\Component\\OptionsResolver\\OptionsResolver\:\:resolve\(\) expects array, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Api/Repositories.php
+
+		-
+			message: '#^Parameter \#1 \$uri of static method Gitlab\\Api\\AbstractApi\:\:encodePath\(\) expects int\|string, mixed given\.$#'
+			identifier: argument.type
+			count: 3
+			path: src/Api/RepositoryFiles.php
+
+		-
+			message: '#^Parameter \#1 \$message of static method Gitlab\\HttpClient\\Message\\ResponseMediator\:\:getMessageAsString\(\) expects array, mixed given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/HttpClient/Message/ResponseMediator.php
+
+		-
+			message: '#^Parameter \#3 \.\.\.\$values of function sprintf expects bool\|float\|int\|string\|null, mixed given\.$#'
+			identifier: argument.type
+			count: 2
+			path: src/HttpClient/Message/ResponseMediator.php
+
+		-
+			message: '#^PHPDoc tag @return contains generic type Http\\Promise\\Promise\<Psr\\Http\\Message\\ResponseInterface\> but interface Http\\Promise\\Promise is not generic\.$#'
+			identifier: generics.notGeneric
 			count: 1
 			path: src/HttpClient/Plugin/Authentication.php
 
 		-
-			message: "#^PHPDoc tag @return contains generic type Http\\\\Promise\\\\Promise\\<Psr\\\\Http\\\\Message\\\\ResponseInterface\\> but interface Http\\\\Promise\\\\Promise is not generic\\.$#"
+			message: '#^PHPDoc tag @return contains generic type Http\\Promise\\Promise\<Psr\\Http\\Message\\ResponseInterface\> but interface Http\\Promise\\Promise is not generic\.$#'
+			identifier: generics.notGeneric
 			count: 1
 			path: src/HttpClient/Plugin/ExceptionThrower.php
 
 		-
-			message: "#^Cannot cast mixed to string\\.$#"
+			message: '#^PHPDoc tag @var with type string is not subtype of native type non\-empty\-string\|false\.$#'
+			identifier: varTag.nativeType
+			count: 1
+			path: src/HttpClient/Util/JsonArray.php
+
+		-
+			message: '#^Cannot cast mixed to string\.$#'
+			identifier: cast.string
 			count: 1
 			path: src/HttpClient/Util/QueryStringBuilder.php
 
 		-
-			message: "#^Variable method call on Gitlab\\\\Api\\\\AbstractApi\\.$#"
+			message: '#^PHPDoc tag @var with type Closure\(Gitlab\\Api\\AbstractApi\)\: Gitlab\\Api\\AbstractApi is not subtype of type Closure\(Gitlab\\Api\\AbstractApi\)\: Gitlab\\Api\\AbstractApi\.$#'
+			identifier: varTag.type
+			count: 1
+			path: src/ResultPager.php
+
+		-
+			message: '#^Variable method call on Gitlab\\Api\\AbstractApi\.$#'
+			identifier: method.dynamicName
 			count: 1
 			path: src/ResultPager.php
 

phpstan.neon.dist

@@ -2,20 +2,15 @@ includes:
     - phpstan-baseline.neon
     - vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
-    - vendor-bin/phpstan/vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
-
-rules:
-    - Ergebnis\PHPStan\Rules\Closures\NoNullableReturnTypeDeclarationRule
-    - Ergebnis\PHPStan\Rules\Expressions\NoCompactRule
-    - Ergebnis\PHPStan\Rules\Expressions\NoEvalRule
-    - Ergebnis\PHPStan\Rules\Files\DeclareStrictTypesRule
-    - Ergebnis\PHPStan\Rules\Methods\PrivateInFinalClassRule
 
 parameters:
     level: max
-    checkMissingIterableValueType: false
     paths:
         - src
     ignoreErrors:
         - '#Only booleans are allowed in an if condition#'
         - '#PHPDoc tag \@var above a method has no effect.#'
+        - '#return type has no value type specified in iterable type array#'
+        - '#no value type specified in iterable type array#'
+        - '#expects array\<string, mixed\>, array given#'
+        - '#expects array\<string, string\>, array given#'

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4">
+<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
   <file src="src/Api/AbstractApi.php">
     <InvalidArgument>
       <code><![CDATA[function () use ($filename, $mode, &$ex): void {