From 6bbd34367483f6c2e4b4826a178af2c335951ff3 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 13:22:14 +0300 Subject: [PATCH 01/11] Set PHP 7.1.3 required version I've tried to specify ^7.0 version at first, but main package which is symfony/framework-bundle@v4.4.8 requires PHP ^7.1.3. --- .../src/main/resources/php-symfony/ApiPass.mustache | 2 +- .../src/main/resources/php-symfony/ApiServer.mustache | 2 +- .../src/main/resources/php-symfony/Bundle.mustache | 2 +- .../src/main/resources/php-symfony/Controller.mustache | 2 +- .../src/main/resources/php-symfony/Extension.mustache | 2 +- .../src/main/resources/php-symfony/README.mustache | 2 +- .../src/main/resources/php-symfony/api.mustache | 2 +- .../src/main/resources/php-symfony/api_controller.mustache | 2 +- .../src/main/resources/php-symfony/composer.mustache | 2 +- .../src/main/resources/php-symfony/model.mustache | 2 +- .../main/resources/php-symfony/testing/ControllerTest.mustache | 2 +- .../src/main/resources/php-symfony/testing/api_test.mustache | 2 +- .../src/main/resources/php-symfony/testing/model_test.mustache | 2 +- .../petstore/php-symfony/SymfonyBundle-php/Api/ApiServer.php | 2 +- .../php-symfony/SymfonyBundle-php/Api/PetApiInterface.php | 2 +- .../php-symfony/SymfonyBundle-php/Api/StoreApiInterface.php | 2 +- .../php-symfony/SymfonyBundle-php/Api/UserApiInterface.php | 2 +- .../php-symfony/SymfonyBundle-php/Controller/Controller.php | 2 +- .../php-symfony/SymfonyBundle-php/Controller/PetController.php | 2 +- .../SymfonyBundle-php/Controller/StoreController.php | 2 +- .../php-symfony/SymfonyBundle-php/Controller/UserController.php | 2 +- .../DependencyInjection/Compiler/OpenAPIServerApiPass.php | 2 +- .../DependencyInjection/OpenAPIServerExtension.php | 2 +- .../php-symfony/SymfonyBundle-php/Model/ApiResponse.php | 2 +- .../petstore/php-symfony/SymfonyBundle-php/Model/Category.php | 2 +- .../petstore/php-symfony/SymfonyBundle-php/Model/Order.php | 2 +- .../server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php | 2 +- .../server/petstore/php-symfony/SymfonyBundle-php/Model/Tag.php | 2 +- .../petstore/php-symfony/SymfonyBundle-php/Model/User.php | 2 +- .../php-symfony/SymfonyBundle-php/OpenAPIServerBundle.php | 2 +- samples/server/petstore/php-symfony/SymfonyBundle-php/README.md | 2 +- .../SymfonyBundle-php/Tests/Api/PetApiInterfaceTest.php | 2 +- .../SymfonyBundle-php/Tests/Api/StoreApiInterfaceTest.php | 2 +- .../SymfonyBundle-php/Tests/Api/UserApiInterfaceTest.php | 2 +- .../SymfonyBundle-php/Tests/Controller/ControllerTest.php | 2 +- .../SymfonyBundle-php/Tests/Model/ApiResponseTest.php | 2 +- .../php-symfony/SymfonyBundle-php/Tests/Model/CategoryTest.php | 2 +- .../php-symfony/SymfonyBundle-php/Tests/Model/OrderTest.php | 2 +- .../php-symfony/SymfonyBundle-php/Tests/Model/PetTest.php | 2 +- .../php-symfony/SymfonyBundle-php/Tests/Model/TagTest.php | 2 +- .../php-symfony/SymfonyBundle-php/Tests/Model/UserTest.php | 2 +- .../server/petstore/php-symfony/SymfonyBundle-php/composer.json | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache b/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache index 1d71f37d97bb..10bf6bea00cb 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/ApiPass.mustache @@ -2,7 +2,7 @@ /** * {{bundleName}}ApiPass * - * PHP version 5 + * PHP version 7.1.3 * * @category Class * @package {{invokerPackage}}\DependencyInjection\Compiler diff --git a/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache index bc317a145e46..1e902459ef00 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/ApiServer.mustache @@ -2,7 +2,7 @@ /** * ApiServer * - * PHP version 5 + * PHP version 7.1.3 * * @category Class * @package {{apiPackage}} diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache index 1f55e24b3b7e..4bbbf5062d8f 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/Bundle.mustache @@ -2,7 +2,7 @@ /** * {{bundleClassName}} * - * PHP version 5 + * PHP version 7.1.3 * * @category Class * @package {{invokerPackage}} diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache index d7b5d5feec44..bafc3668ff33 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/Controller.mustache @@ -2,7 +2,7 @@ /** * Controller * - * PHP version 5 + * PHP version 7.1.3 * * @category Class * @package {{controllerPackage}} diff --git a/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache b/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache index 9e9f541835cc..4395c42aef0a 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/Extension.mustache @@ -2,7 +2,7 @@ /** * {{bundleExtensionName}} * - * PHP version 5 + * PHP version 7.1.3 * * @category Class * @package {{invokerPackage}}\DependencyInjection diff --git a/modules/openapi-generator/src/main/resources/php-symfony/README.mustache b/modules/openapi-generator/src/main/resources/php-symfony/README.mustache index 69fe2bebd3ca..e3451ecf3938 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/README.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/README.mustache @@ -19,7 +19,7 @@ For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}}) ## Requirements -PHP 5.4.0 and later +PHP 7.1.3 and later ## Installation & Usage diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache index a9ccc73e02db..81f343bb38e9 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache @@ -1,7 +1,7 @@ =5.4", + "php": "^7.1.3", "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", diff --git a/modules/openapi-generator/src/main/resources/php-symfony/model.mustache b/modules/openapi-generator/src/main/resources/php-symfony/model.mustache index 44c3e9d6bf13..12959e5101c6 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/model.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/model.mustache @@ -4,7 +4,7 @@ /** * {{classname}} * - * PHP version 5 + * PHP version 7.1.3 * * @category Class * @package {{modelPackage}} diff --git a/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache b/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache index 382b66c9154a..49861fd96722 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache @@ -1,7 +1,7 @@ =5.4", + "php": "^7.1.3", "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", From 7174337bf9ed52f0ca84158c930325e85a0ccd44 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 13:33:01 +0300 Subject: [PATCH 02/11] Bump Symfony FrameworkBundle to ^4.4.8 Current Symfony Framework stable version is v5.0.8, but I guess it requires significant codebase upgrade, so I've sticked with 4.4.8 which shouldn't cause any breaking changes. Old requirement was ^3.3|^4.1 which compatible with 4.4.8. --- .../src/main/resources/php-symfony/composer.mustache | 2 +- .../server/petstore/php-symfony/SymfonyBundle-php/composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index dc4a00e4c543..c2cd72afd4ab 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -25,7 +25,7 @@ "ext-mbstring": "*", "symfony/validator": "*", "jms/serializer-bundle": "^2.0", - "symfony/framework-bundle": "^3.3|^4.1" + "symfony/framework-bundle": "^4.4.8" }, "require-dev": { "phpunit/phpunit": "~4.8", diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json index 03385b581ef1..a86f546ae3c4 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json @@ -22,7 +22,7 @@ "ext-mbstring": "*", "symfony/validator": "*", "jms/serializer-bundle": "^2.0", - "symfony/framework-bundle": "^3.3|^4.1" + "symfony/framework-bundle": "^4.4.8" }, "require-dev": { "phpunit/phpunit": "~4.8", From 78f665f12387b940926c760a32db0eb9b70a86c4 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 15:02:00 +0300 Subject: [PATCH 03/11] Bump PHPUnit version to ^7.0 PHPUnit 8.x version required PHP ^7.2, so I'm setting 7.x version to support PHP 7.1. There is new way to specify Kernel class, related PR: https://github.com/symfony/symfony/pull/22668 --- .../codegen/languages/PhpSymfonyServerCodegen.java | 3 ++- .../src/main/resources/php-symfony/composer.mustache | 2 +- .../testing/{AppKernel.php => AppKernel.mustache} | 5 ++++- .../main/resources/php-symfony/testing/model_test.mustache | 4 +++- .../main/resources/php-symfony/testing/phpunit.xml.mustache | 2 +- .../php-symfony/SymfonyBundle-php/Tests/AppKernel.php | 5 ++++- .../SymfonyBundle-php/Tests/Model/ApiResponseTest.php | 4 +++- .../SymfonyBundle-php/Tests/Model/CategoryTest.php | 4 +++- .../php-symfony/SymfonyBundle-php/Tests/Model/OrderTest.php | 4 +++- .../php-symfony/SymfonyBundle-php/Tests/Model/PetTest.php | 4 +++- .../php-symfony/SymfonyBundle-php/Tests/Model/TagTest.php | 4 +++- .../php-symfony/SymfonyBundle-php/Tests/Model/UserTest.php | 4 +++- .../petstore/php-symfony/SymfonyBundle-php/composer.json | 2 +- .../petstore/php-symfony/SymfonyBundle-php/phpunit.xml.dist | 2 +- 14 files changed, 35 insertions(+), 14 deletions(-) rename modules/openapi-generator/src/main/resources/php-symfony/testing/{AppKernel.php => AppKernel.mustache} (77%) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index ef09fa0caa13..a9c975080221 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -300,6 +300,7 @@ public void processOpts() { additionalProperties.put("escapedInvokerPackage", invokerPackage.replace("\\", "\\\\")); additionalProperties.put("controllerPackage", controllerPackage); additionalProperties.put("servicePackage", servicePackage); + additionalProperties.put("testsPackage", testsPackage); additionalProperties.put("apiTestsPackage", apiTestsPackage); additionalProperties.put("modelTestsPackage", modelTestsPackage); additionalProperties.put("controllerTestsPackage", controllerTestsPackage); @@ -349,7 +350,7 @@ public void processOpts() { // Testing components supportingFiles.add(new SupportingFile("testing/phpunit.xml.mustache", "", "phpunit.xml.dist")); supportingFiles.add(new SupportingFile("testing/pom.xml", "", "pom.xml")); - supportingFiles.add(new SupportingFile("testing/AppKernel.php", toSrcPath(testsPackage, srcBasePath), "AppKernel.php")); + supportingFiles.add(new SupportingFile("testing/AppKernel.mustache", toSrcPath(testsPackage, srcBasePath), "AppKernel.php")); supportingFiles.add(new SupportingFile("testing/ControllerTest.mustache", toSrcPath(controllerTestsPackage, srcBasePath), "ControllerTest.php")); supportingFiles.add(new SupportingFile("testing/test_config.yml", toSrcPath(testsPackage, srcBasePath), "test_config.yml")); diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index c2cd72afd4ab..8586e2808136 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -28,7 +28,7 @@ "symfony/framework-bundle": "^4.4.8" }, "require-dev": { - "phpunit/phpunit": "~4.8", + "phpunit/phpunit": "^7.0", "satooshi/php-coveralls": "~1.0", "squizlabs/php_codesniffer": "~2.6", "friendsofphp/php-cs-fixer": "~1.12", diff --git a/modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.php b/modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.mustache similarity index 77% rename from modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.php rename to modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.mustache index 631690bc9786..617189baa7a5 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.php +++ b/modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.mustache @@ -1,5 +1,8 @@ - + diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/AppKernel.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/AppKernel.php index 631690bc9786..5016d238d10b 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/AppKernel.php +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Tests/AppKernel.php @@ -1,5 +1,8 @@ - + From d40b4197f4932836496835388cd89e973b6d5802 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 15:22:02 +0300 Subject: [PATCH 04/11] Bump PHP CS Fixer version to ^2.16.3 Configuration and all renamed rules fixed. Config file renamed to .php_cs.dist as recommended in migration guide. Migration guide from 1.x to 2.x: https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE.md#config-file --- .../languages/PhpSymfonyServerCodegen.java | 2 +- .../src/main/resources/php-symfony/.gitignore | 12 ++++++++++- .../src/main/resources/php-symfony/.php_cs | 18 ----------------- .../main/resources/php-symfony/.php_cs.dist | 20 +++++++++++++++++++ .../resources/php-symfony/composer.mustache | 2 +- .../php-symfony/SymfonyBundle-php/.gitignore | 12 ++++++++++- .../php-symfony/SymfonyBundle-php/.php_cs | 18 ----------------- .../SymfonyBundle-php/.php_cs.dist | 20 +++++++++++++++++++ .../SymfonyBundle-php/composer.json | 2 +- 9 files changed, 65 insertions(+), 41 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/php-symfony/.php_cs create mode 100644 modules/openapi-generator/src/main/resources/php-symfony/.php_cs.dist delete mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs.dist diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index a9c975080221..d4926da27107 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -361,7 +361,7 @@ public void processOpts() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile(".travis.yml", "", ".travis.yml")); - supportingFiles.add(new SupportingFile(".php_cs", "", ".php_cs")); + supportingFiles.add(new SupportingFile(".php_cs.dist", "", ".php_cs.dist")); supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); // Type-hintable primitive types diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.gitignore b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore index 20b7b9897609..4b025b56b2e6 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/.gitignore +++ b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore @@ -51,4 +51,14 @@ # From root gitignore /Tests/cache/ -/Tests/logs/ \ No newline at end of file +/Tests/logs/ + +# PHP Coding Standards Fixer +# https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE.md#config-file +# From now you can create new configuration file: .php_cs.dist. +# This file is used if no .php_cs file was found. +# It is recommended to create .php_cs.dist file attached in your repository and add .php_cs file to .gitignore for allowing your contributors to have theirs own configuration file. +/.php_cs + +# No reason to commit PHP CS Fixer cache files +/.php_cs.cache diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.php_cs b/modules/openapi-generator/src/main/resources/php-symfony/.php_cs deleted file mode 100644 index 6b8e23c818a9..000000000000 --- a/modules/openapi-generator/src/main/resources/php-symfony/.php_cs +++ /dev/null @@ -1,18 +0,0 @@ -level(Symfony\CS\FixerInterface::PSR2_LEVEL) - ->setUsingCache(true) - ->fixers( - [ - 'ordered_use', - 'phpdoc_order', - 'short_array_syntax', - 'strict', - 'strict_param' - ] - ) - ->finder( - Symfony\CS\Finder\DefaultFinder::create() - ->in(__DIR__) - ); diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.php_cs.dist b/modules/openapi-generator/src/main/resources/php-symfony/.php_cs.dist new file mode 100644 index 000000000000..df19888e44ff --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-symfony/.php_cs.dist @@ -0,0 +1,20 @@ +in(__DIR__) +; + +return PhpCsFixer\Config::create() + ->setUsingCache(true) + ->setRules([ + '@PSR2' => true, + 'ordered_imports' => [ + 'sort_algorithm' => 'alpha' + ], + 'phpdoc_order' => true, + 'array_syntax' => ['syntax' => 'short'], + 'strict_comparison' => true, + 'strict_param' => true + ]) + ->setFinder($finder) +; diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index 8586e2808136..7636fc715f1c 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -31,7 +31,7 @@ "phpunit/phpunit": "^7.0", "satooshi/php-coveralls": "~1.0", "squizlabs/php_codesniffer": "~2.6", - "friendsofphp/php-cs-fixer": "~1.12", + "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", "hoa/regex": "~1.0" }, diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore index 20b7b9897609..4b025b56b2e6 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore @@ -51,4 +51,14 @@ # From root gitignore /Tests/cache/ -/Tests/logs/ \ No newline at end of file +/Tests/logs/ + +# PHP Coding Standards Fixer +# https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE.md#config-file +# From now you can create new configuration file: .php_cs.dist. +# This file is used if no .php_cs file was found. +# It is recommended to create .php_cs.dist file attached in your repository and add .php_cs file to .gitignore for allowing your contributors to have theirs own configuration file. +/.php_cs + +# No reason to commit PHP CS Fixer cache files +/.php_cs.cache diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs b/samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs deleted file mode 100644 index 6b8e23c818a9..000000000000 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs +++ /dev/null @@ -1,18 +0,0 @@ -level(Symfony\CS\FixerInterface::PSR2_LEVEL) - ->setUsingCache(true) - ->fixers( - [ - 'ordered_use', - 'phpdoc_order', - 'short_array_syntax', - 'strict', - 'strict_param' - ] - ) - ->finder( - Symfony\CS\Finder\DefaultFinder::create() - ->in(__DIR__) - ); diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs.dist b/samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs.dist new file mode 100644 index 000000000000..df19888e44ff --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs.dist @@ -0,0 +1,20 @@ +in(__DIR__) +; + +return PhpCsFixer\Config::create() + ->setUsingCache(true) + ->setRules([ + '@PSR2' => true, + 'ordered_imports' => [ + 'sort_algorithm' => 'alpha' + ], + 'phpdoc_order' => true, + 'array_syntax' => ['syntax' => 'short'], + 'strict_comparison' => true, + 'strict_param' => true + ]) + ->setFinder($finder) +; diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json index 522f8bc3965d..443af5655caf 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json @@ -28,7 +28,7 @@ "phpunit/phpunit": "^7.0", "satooshi/php-coveralls": "~1.0", "squizlabs/php_codesniffer": "~2.6", - "friendsofphp/php-cs-fixer": "~1.12", + "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", "hoa/regex": "~1.0" }, From 68b347754fd99d99d5a8576522ad2728ef15feb5 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 15:28:02 +0300 Subject: [PATCH 05/11] Remove PHP_CodeSniffer package Second linter doesn't make sense. I think Symfony user would prefer PHP CS Fixer over PHP_CodeSniffer because first one maintained by Symfony members. --- .../src/main/resources/php-symfony/composer.mustache | 1 - .../server/petstore/php-symfony/SymfonyBundle-php/composer.json | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index 7636fc715f1c..f18d1d7a1254 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -30,7 +30,6 @@ "require-dev": { "phpunit/phpunit": "^7.0", "satooshi/php-coveralls": "~1.0", - "squizlabs/php_codesniffer": "~2.6", "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", "hoa/regex": "~1.0" diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json index 443af5655caf..135939f3d075 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json @@ -27,7 +27,6 @@ "require-dev": { "phpunit/phpunit": "^7.0", "satooshi/php-coveralls": "~1.0", - "squizlabs/php_codesniffer": "~2.6", "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", "hoa/regex": "~1.0" From 6e66bd60b81d6c14bf48d68b91dd6ffe9049c28d Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 15:59:41 +0300 Subject: [PATCH 06/11] Remove satooshi/php-coveralls package from Composer This package is abandoned and Coveralls recommends to install it directly in Travis-CI task script. --- .../src/main/resources/php-symfony/composer.mustache | 1 - .../server/petstore/php-symfony/SymfonyBundle-php/composer.json | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index f18d1d7a1254..4f411130ec8b 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -29,7 +29,6 @@ }, "require-dev": { "phpunit/phpunit": "^7.0", - "satooshi/php-coveralls": "~1.0", "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", "hoa/regex": "~1.0" diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json index 135939f3d075..5ed32ed7d00d 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json @@ -26,7 +26,6 @@ }, "require-dev": { "phpunit/phpunit": "^7.0", - "satooshi/php-coveralls": "~1.0", "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", "hoa/regex": "~1.0" From 4b5864a109a1da093c4526ad503197984d56061b Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 16:04:46 +0300 Subject: [PATCH 07/11] Update Travic-CI config I've changed test versions to PHP 7.1.3 and 7.2. PHPUnit generates coverage report in report/logs/clover.xml file. Then PHP CS Fixer runs with --dry-run option to not override anything just to show coding style errors. --- .../main/resources/php-symfony/.travis.yml | 26 +++++++++++++------ .../php-symfony/SymfonyBundle-php/.travis.yml | 26 +++++++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.travis.yml b/modules/openapi-generator/src/main/resources/php-symfony/.travis.yml index d77f3825f6fe..de5a983645fc 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/.travis.yml +++ b/modules/openapi-generator/src/main/resources/php-symfony/.travis.yml @@ -1,10 +1,20 @@ language: php -sudo: false +dist: trusty php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - hhvm -before_install: "composer install" -script: "vendor/bin/phpunit" + - 7.1.3 + - 7.2 + +install: + - composer install --dev --no-interaction +script: + - mkdir -p report/logs + - php vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=report/logs/clover.xml + - php vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no + +before_script: + - composer require --dev php-coveralls/php-coveralls --no-interaction + +after_success: + - travis_retry php vendor/bin/php-coveralls + # or enable logging + - travis_retry php vendor/bin/php-coveralls -v diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.travis.yml b/samples/server/petstore/php-symfony/SymfonyBundle-php/.travis.yml index d77f3825f6fe..de5a983645fc 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.travis.yml +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.travis.yml @@ -1,10 +1,20 @@ language: php -sudo: false +dist: trusty php: - - 5.4 - - 5.5 - - 5.6 - - 7.0 - - hhvm -before_install: "composer install" -script: "vendor/bin/phpunit" + - 7.1.3 + - 7.2 + +install: + - composer install --dev --no-interaction +script: + - mkdir -p report/logs + - php vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=report/logs/clover.xml + - php vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --dry-run --stop-on-violation --using-cache=no + +before_script: + - composer require --dev php-coveralls/php-coveralls --no-interaction + +after_success: + - travis_retry php vendor/bin/php-coveralls + # or enable logging + - travis_retry php vendor/bin/php-coveralls -v From e1d0e88e95ceef6054e33866c4069e40244f13ea Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 16:13:33 +0300 Subject: [PATCH 08/11] Add basic Coveralls config This is basic recommended config for a PHP based project. --- .../codegen/languages/PhpSymfonyServerCodegen.java | 1 + .../src/main/resources/php-symfony/.coveralls.yml | 6 ++++++ .../petstore/php-symfony/SymfonyBundle-php/.coveralls.yml | 6 ++++++ 3 files changed, 13 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index d4926da27107..ede41960569b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -362,6 +362,7 @@ public void processOpts() { supportingFiles.add(new SupportingFile(".travis.yml", "", ".travis.yml")); supportingFiles.add(new SupportingFile(".php_cs.dist", "", ".php_cs.dist")); + supportingFiles.add(new SupportingFile(".coveralls.yml", "", ".coveralls.yml")); supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh")); // Type-hintable primitive types diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml b/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml new file mode 100644 index 000000000000..ad32f44afdf0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml @@ -0,0 +1,6 @@ +# same as Ruby lib +service_name: travis-ci # travis-ci or travis-pro + +# for php-coveralls +coverage_clover: report/logs/clover.xml +json_path: report/logs/coveralls-upload.json \ No newline at end of file diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml b/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml new file mode 100644 index 000000000000..ad32f44afdf0 --- /dev/null +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml @@ -0,0 +1,6 @@ +# same as Ruby lib +service_name: travis-ci # travis-ci or travis-pro + +# for php-coveralls +coverage_clover: report/logs/clover.xml +json_path: report/logs/coveralls-upload.json \ No newline at end of file From 455392af3c3c055052076545eb33cb77176e4169 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 16:25:11 +0300 Subject: [PATCH 09/11] Add symfony/yaml package This package was part of satooshi/php-coveralls, now it should be defined as dev dependency. --- .../src/main/resources/php-symfony/composer.mustache | 1 + .../server/petstore/php-symfony/SymfonyBundle-php/composer.json | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache index 4f411130ec8b..f9472f261f65 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache +++ b/modules/openapi-generator/src/main/resources/php-symfony/composer.mustache @@ -31,6 +31,7 @@ "phpunit/phpunit": "^7.0", "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", + "symfony/yaml": "^4.4.8", "hoa/regex": "~1.0" }, "autoload": { diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json index 5ed32ed7d00d..c0532c12768f 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/composer.json @@ -28,6 +28,7 @@ "phpunit/phpunit": "^7.0", "friendsofphp/php-cs-fixer": "^2.16.3", "symfony/browser-kit": "*", + "symfony/yaml": "^4.4.8", "hoa/regex": "~1.0" }, "autoload": { From cee3f053d77a9cc07c5bdbb2fdf645a4a34f343d Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Tue, 5 May 2020 16:30:20 +0300 Subject: [PATCH 10/11] Do not commit composer.lock I think committed composer.lock can cause CI errors while tests on fresh installs are better. --- .../src/main/resources/php-symfony/.gitignore | 8 ++++++-- .../petstore/php-symfony/SymfonyBundle-php/.gitignore | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.gitignore b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore index 4b025b56b2e6..0bac519d3e84 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/.gitignore +++ b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore @@ -29,6 +29,10 @@ !bin/symfony_requirements /vendor/ +# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +composer.lock + # Assets and user uploads /web/bundles/ /web/uploads/ @@ -55,8 +59,8 @@ # PHP Coding Standards Fixer # https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE.md#config-file -# From now you can create new configuration file: .php_cs.dist. -# This file is used if no .php_cs file was found. +# From now you can create new configuration file: .php_cs.dist. +# This file is used if no .php_cs file was found. # It is recommended to create .php_cs.dist file attached in your repository and add .php_cs file to .gitignore for allowing your contributors to have theirs own configuration file. /.php_cs diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore index 4b025b56b2e6..0bac519d3e84 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore @@ -29,6 +29,10 @@ !bin/symfony_requirements /vendor/ +# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +composer.lock + # Assets and user uploads /web/bundles/ /web/uploads/ @@ -55,8 +59,8 @@ # PHP Coding Standards Fixer # https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/UPGRADE.md#config-file -# From now you can create new configuration file: .php_cs.dist. -# This file is used if no .php_cs file was found. +# From now you can create new configuration file: .php_cs.dist. +# This file is used if no .php_cs file was found. # It is recommended to create .php_cs.dist file attached in your repository and add .php_cs file to .gitignore for allowing your contributors to have theirs own configuration file. /.php_cs From 62c7c619ccc55f1a048ac2ea07fd147439494b53 Mon Sep 17 00:00:00 2001 From: Yuriy Belenko Date: Fri, 8 May 2020 09:40:40 +0300 Subject: [PATCH 11/11] Remove confusing Ruby comment --- .../src/main/resources/php-symfony/.coveralls.yml | 1 - .../server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml b/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml index ad32f44afdf0..4071b53a9522 100644 --- a/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml +++ b/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml @@ -1,4 +1,3 @@ -# same as Ruby lib service_name: travis-ci # travis-ci or travis-pro # for php-coveralls diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml b/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml index ad32f44afdf0..4071b53a9522 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml @@ -1,4 +1,3 @@ -# same as Ruby lib service_name: travis-ci # travis-ci or travis-pro # for php-coveralls