Merge pull request #99 from dariobmf/feature/support-php81

Support PHP 8 in composer.json

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.2.0] - 2023.10.17
+### Added
+- Added support for PHP 8
+
 ## [10.1.5] - 2023.09.15
 ### Fixed
 - Added missing null check for optional nullable object mapping

composer.json

@@ -19,7 +19,7 @@
     "ext-json": "*",
     "ext-xml": "*",
     "cebe/php-openapi": "^1.4",
-    "docler-labs/api-client-exception": "^1.0.1",
+    "docler-labs/api-client-exception": "^1.0.1 || ^2.0",
     "friendsofphp/php-cs-fixer": "^2.16",
     "guzzlehttp/psr7": "^1.6",
     "icecave/parity": "^3.0",
@@ -38,7 +38,7 @@
     "mikey179/vfsstream": "^1.6",
     "php-coveralls/php-coveralls": "^2.2",
     "phpstan/phpstan": "^0.12.32",
-    "phpunit/phpunit": "^9.2",
+    "phpunit/phpunit": "^9.5",
     "roave/security-advisories": "dev-latest",
     "symfony/filesystem": "^5.1"
   },

example/PetStoreClient/composer.json

@@ -9,13 +9,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.4",
-        "docler-labs/api-client-exception": "^1.0|^2.0",
+        "php": "^7.4 || ^8.0",
+        "docler-labs/api-client-exception": "^1.0 || ^2.0",
         "ext-dom": "*",
         "ext-json": "*",
-        "guzzlehttp/psr7": "^1.6|^2.0",
-        "pimple/pimple": "^3.3",
-        "psr/container": "^1.0",
+        "guzzlehttp/psr7": "^1.6 || ^2.6",
+        "pimple/pimple": "^3.5",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-client": "^1.0"
     },
     "autoload": {

src/Generator/Implementation/Container/PimpleContainer.php

@@ -77,7 +77,7 @@ public function getContainerRegisterImports(): array
     public function getPackages(): array
     {
         return [
-            'pimple/pimple' => '^3.3',
+            'pimple/pimple' => '^3.5',
         ];
     }
 

src/Generator/Implementation/HttpMessage/GuzzleHttpMessage.php

@@ -18,7 +18,7 @@ public function getRequestMapperClassName(): string
     public function getPackages(): array
     {
         return [
-            'guzzlehttp/psr7' => '^1.6|^2.0',
+            'guzzlehttp/psr7' => '^1.6 || ^2.6',
         ];
     }
 

src/Meta/ComposerJsonTemplate.php

@@ -65,8 +65,8 @@ public function render(Specification $specification, MetaFileCollection $fileReg
     private function getCommonPackages(): array
     {
         return [
-            'docler-labs/api-client-exception' => '^1.0|^2.0',
-            'psr/container'                    => '^1.0',
+            'docler-labs/api-client-exception' => '^1.0 || ^2.0',
+            'psr/container'                    => '^1.0 || ^2.0',
             'psr/http-client'                  => '^1.0',
         ];
     }

template/composer.json.twig

@@ -11,7 +11,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">={{ phpVersion }}",
+        "php": "^{{ phpVersion }} || ^8.0",
         {% for package, version in packages -%}
 "{{ package }}": "{{ version }}"{%- if not loop.last -%},{% endif %}
 

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

@@ -8,12 +8,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.4",
-        "docler-labs/api-client-exception": "^1.0|^2.0",
+        "php": "^7.4 || ^8.0",
+        "docler-labs/api-client-exception": "^1.0 || ^2.0",
         "ext-json": "*",
-        "guzzlehttp/psr7": "^1.6|^2.0",
-        "pimple/pimple": "^3.3",
-        "psr/container": "^1.0",
+        "guzzlehttp/psr7": "^1.6 || ^2.6",
+        "pimple/pimple": "^3.5",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-client": "^1.0"
     },
     "autoload": {

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

@@ -8,12 +8,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.4",
-        "docler-labs/api-client-exception": "^1.0|^2.0",
+        "php": "^7.4 || ^8.0",
+        "docler-labs/api-client-exception": "^1.0 || ^2.0",
         "ext-json": "*",
-        "guzzlehttp/psr7": "^1.6|^2.0",
-        "pimple/pimple": "^3.3",
-        "psr/container": "^1.0",
+        "guzzlehttp/psr7": "^1.6 || ^2.6",
+        "pimple/pimple": "^3.5",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-client": "^1.0"
     },
     "autoload": {

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

@@ -8,12 +8,12 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.4",
-        "docler-labs/api-client-exception": "^1.0|^2.0",
+        "php": "^7.4 || ^8.0",
+        "docler-labs/api-client-exception": "^1.0 || ^2.0",
         "ext-json": "*",
         "nyholm/psr7": "^1.3",
-        "pimple/pimple": "^3.3",
-        "psr/container": "^1.0",
+        "pimple/pimple": "^3.5",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-client": "^1.0"
     },
     "autoload": {

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

@@ -8,13 +8,13 @@
         "sort-packages": true
     },
     "require": {
-        "php": ">=7.4",
-        "docler-labs/api-client-exception": "^1.0|^2.0",
+        "php": "^7.4 || ^8.0",
+        "docler-labs/api-client-exception": "^1.0 || ^2.0",
         "ext-intl": "*",
         "ext-json": "*",
-        "guzzlehttp/psr7": "^1.6|^2.0",
-        "pimple/pimple": "^3.3",
-        "psr/container": "^1.0",
+        "guzzlehttp/psr7": "^1.6 || ^2.6",
+        "pimple/pimple": "^3.5",
+        "psr/container": "^1.0 || ^2.0",
         "psr/http-client": "^1.0"
     },
     "autoload": {