Merge pull request #108 from DoclerLabs/add-more-php-versions

add more php versions

Author: vsouz4

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [10.7.0] - 2024.02.15
+### Added
+- Added support for php 8.1, 8.2, 8.3 constraints
+
 ## [10.6.1] - 2024.02.10
 ### Fixed
 - operationId containing dashes is converted to camel case

README.md

@@ -76,7 +76,7 @@ The following environment variables are available:
 | `OUTPUT_DIR` | yes | | | /client |
 | `CODE_STYLE` | no | {path-to-repository}/.php-cs-fixer.php.dist | | /client/myCodeStyle.php |
 | `SOURCE_DIR` | no | src | | src |
-| `CLIENT_PHP_VERSION` | no | 7.4 | 7.0, 7.1, 7.2, 7.3, 7.4, 8.0 | 7.4 |
+| `CLIENT_PHP_VERSION` | no | 7.4 | 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 | 7.4 |
 | `COMPOSER_JSON_TEMPLATE_DIR` | no | {path-to-repository}/template/composer.json.twig | | /path/composer.json.twig |
 | `README_MD_TEMPLATE_DIR` | no | {path-to-repository}/template/README.md.twig | | /path/README.md.twig |
 | `HTTP_MESSAGE` | no | guzzle | guzzle, nyholm | nyholm |

src/Ast/PhpVersion.php

@@ -20,13 +20,22 @@ class PhpVersion
 
     public const VERSION_PHP80 = 8.0;
 
+    public const VERSION_PHP81 = 8.1;
+
+    public const VERSION_PHP82 = 8.2;
+
+    public const VERSION_PHP83 = 8.3;
+
     private const SUPPORTED_VERSIONS = [
         self::VERSION_PHP70,
         self::VERSION_PHP71,
         self::VERSION_PHP72,
         self::VERSION_PHP73,
         self::VERSION_PHP74,
         self::VERSION_PHP80,
+        self::VERSION_PHP81,
+        self::VERSION_PHP82,
+        self::VERSION_PHP83,
     ];
 
     public function __construct(private float $phpVersion)

test/suite/functional/Meta/ComposerJson/composer_default81.json

@@ -0,0 +1,28 @@
+{
+    "name": "test/test-api-client",
+    "description": "Client library for Swagger Petstore",
+    "keywords": [
+        "api-client"
+    ],
+    "config": {
+        "sort-packages": true
+    },
+    "require": {
+        "php": "^8.1",
+        "docler-labs/api-client-exception": "^1.0 || ^2.0",
+        "ext-json": "*",
+        "guzzlehttp/psr7": "^1.6 || ^2.6",
+        "pimple/pimple": "^3.5",
+        "psr/container": "^1.0 || ^2.0",
+        "psr/http-client": "^1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Test\\": "src/"
+        }
+    },
+    "suggest": {
+        "guzzlehttp/guzzle": "PSR-18 provided by Guzzle 7",
+        "php-http/guzzle6-adapter": "PSR-18 wrapper for Guzzle 6"
+    }
+}

test/suite/functional/Meta/ComposerJsonTemplateTest.php

@@ -37,6 +37,12 @@ public function exampleProvider(): array
                 'composer.json',
                 ConfigurationBuilder::fake()->withPhpVersion(PhpVersion::VERSION_PHP80)->build(),
             ],
+            'Default composer.json + PHP 8.1' => [
+                '/ComposerJson/petstore.yaml',
+                '/ComposerJson/composer_default81.json',
+                'composer.json',
+                ConfigurationBuilder::fake()->withPhpVersion(PhpVersion::VERSION_PHP81)->build(),
+            ],
             'composer.json with intl + PHP 7.4' => [
                 '/ComposerJson/petstore_with_intl_requirement.yaml',
                 '/ComposerJson/composer_with_intl_requirement74.json',

test/suite/unit/Output/Php/PhpVersionTest.php

@@ -16,7 +16,7 @@ class PhpVersionTest extends TestCase
     public function testInvalidVersion()
     {
         $this->expectException(UnexpectedValueException::class);
-        new PhpVersion(8.3);
+        new PhpVersion(8.4);
     }
 
     public function testIsParameterTypeHintSupported()