diff --git a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/composer.mustache b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/composer.mustache index 7ef3e16b0e8..c06fa218e43 100644 --- a/modules/openapi-generator/src/main/resources/php/libraries/psr-18/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php/libraries/psr-18/composer.mustache @@ -1,7 +1,9 @@ { - "name": "{{gitUserId}}/{{gitRepoId}}", + {{#composerPackageName}} + "name": "{{{.}}}", + {{/composerPackageName}} {{#artifactVersion}} - "version": "{{artifactVersion}}", + "version": "{{{.}}}", {{/artifactVersion}} "description": "{{{appDescription}}}", "keywords": [ @@ -13,19 +15,19 @@ "rest", "api" ], - "homepage": "https://openapi-generator.tech", - "license": "unlicense", + "homepage": "{{{artifactUrl}}}", + "license": "{{{licenseName}}}", "authors": [ { - "name": "OpenAPI-Generator contributors", - "homepage": "https://openapi-generator.tech" + "name": "{{{developerOrganization}}}", + "homepage": "{{{developerOrganizationUrl}}}" } ], "config": { "sort-packages": true }, "require": { - "php": ">=7.2", + "php": "^7.4 || ^8.0", "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", @@ -41,14 +43,14 @@ }, "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0", - "friendsofphp/php-cs-fixer": "^2.12", + "friendsofphp/php-cs-fixer": "^3.5", "guzzlehttp/guzzle": "^7.0", "php-http/guzzle7-adapter": "^1.0" }, "autoload": { - "psr-4": { "{{escapedInvokerPackage}}\\" : "{{srcBasePath}}/" } + "psr-4": { "{{{escapedInvokerPackage}}}\\" : "{{{srcBasePath}}}/" } }, "autoload-dev": { - "psr-4": { "{{escapedInvokerPackage}}\\Test\\" : "{{testBasePath}}/" } + "psr-4": { "{{{escapedInvokerPackage}}}\\Test\\" : "{{{testBasePath}}}/" } } } diff --git a/samples/client/petstore/php/psr-18/composer.json b/samples/client/petstore/php/psr-18/composer.json index 988cf821ed5..d0360d4f9b8 100644 --- a/samples/client/petstore/php/psr-18/composer.json +++ b/samples/client/petstore/php/psr-18/composer.json @@ -1,5 +1,4 @@ { - "name": "GIT_USER_ID/GIT_REPO_ID", "description": "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\", "keywords": [ "openapitools", @@ -14,7 +13,7 @@ "license": "unlicense", "authors": [ { - "name": "OpenAPI-Generator contributors", + "name": "OpenAPI", "homepage": "https://openapi-generator.tech" } ], @@ -22,7 +21,7 @@ "sort-packages": true }, "require": { - "php": ">=7.2", + "php": "^7.4 || ^8.0", "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", @@ -38,7 +37,7 @@ }, "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0", - "friendsofphp/php-cs-fixer": "^2.12", + "friendsofphp/php-cs-fixer": "^3.5", "guzzlehttp/guzzle": "^7.0", "php-http/guzzle7-adapter": "^1.0" },