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 31e66bc67bf4..14de1216d4c0 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"));
@@ -360,7 +361,8 @@ 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(".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..4071b53a9522
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/php-symfony/.coveralls.yml
@@ -0,0 +1,5 @@
+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/modules/openapi-generator/src/main/resources/php-symfony/.gitignore b/modules/openapi-generator/src/main/resources/php-symfony/.gitignore
index 20b7b9897609..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/
@@ -51,4 +55,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/.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/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": "*",
"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",
- "satooshi/php-coveralls": "~1.0",
- "squizlabs/php_codesniffer": "~2.6",
- "friendsofphp/php-cs-fixer": "~1.12",
+ "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/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/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/.coveralls.yml b/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml
new file mode 100644
index 000000000000..4071b53a9522
--- /dev/null
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.coveralls.yml
@@ -0,0 +1,5 @@
+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/.gitignore b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore
index 20b7b9897609..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/
@@ -51,4 +55,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/.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
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/ApiServer.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/ApiServer.php
index f57c47b342cc..de44229b454e 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/ApiServer.php
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/ApiServer.php
@@ -2,7 +2,7 @@
/**
* ApiServer
*
- * PHP version 5
+ * PHP version 7.1.3
*
* @category Class
* @package OpenAPI\Server\Api
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php
index 864fa5cd80f5..0cf1ef82a85d 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php
@@ -1,7 +1,7 @@
=5.4",
+ "php": "^7.1.3",
"ext-curl": "*",
"ext-json": "*",
"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",
- "satooshi/php-coveralls": "~1.0",
- "squizlabs/php_codesniffer": "~2.6",
- "friendsofphp/php-cs-fixer": "~1.12",
+ "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/phpunit.xml.dist b/samples/server/petstore/php-symfony/SymfonyBundle-php/phpunit.xml.dist
index 38a8370fec6a..e754829e6283 100644
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/phpunit.xml.dist
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/phpunit.xml.dist
@@ -21,6 +21,6 @@
-
+