[php-symfony] Set required PHP version ^7.1.3

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

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

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/
+/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

modules/openapi-generator/src/main/resources/php-symfony/.php_cs.dist

@@ -0,0 +1,20 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->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)
+;

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

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

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}}

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}}

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}}

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

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
 

modules/openapi-generator/src/main/resources/php-symfony/api.mustache

@@ -1,7 +1,7 @@
 <?php
 /**
  * {{classname}}
- * PHP version 5
+ * PHP version 7.1.3
  *
  * @category Class
  * @package  {{invokerPackage}}

modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache

@@ -2,7 +2,7 @@
 
 {{#operations}}/**
  * {{controllerName}}
- * PHP version 5
+ * PHP version 7.1.3
  *
  * @category Class
  * @package  {{controllerPackage}}

modules/openapi-generator/src/main/resources/php-symfony/composer.mustache

@@ -19,20 +19,19 @@
         }
     ],
     "require": {
-        "php": ">=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": {

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}}

modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.php → modules/openapi-generator/src/main/resources/php-symfony/testing/AppKernel.mustache

@@ -1,5 +1,8 @@
 <?php
 
+namespace {{testsPackage}};
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
@@ -8,7 +11,7 @@ class AppKernel extends Kernel
     public function registerBundles()
     {
         $bundles = array(
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle()
+            new FrameworkBundle()
         );
 
         return $bundles;

modules/openapi-generator/src/main/resources/php-symfony/testing/ControllerTest.mustache

@@ -1,7 +1,7 @@
 <?php
 /**
  * ControllerTest
- * PHP version 5
+ * PHP version 7.1.3
  *
  * @category Class
  * @package  {{controllerTestsPackage}}

modules/openapi-generator/src/main/resources/php-symfony/testing/api_test.mustache

@@ -1,7 +1,7 @@
 <?php
 /**
  * {{classname}}Test
- * PHP version 5
+ * PHP version 7.1.3
  *
  * @category Class
  * @package  {{apiTestsPackage}}

modules/openapi-generator/src/main/resources/php-symfony/testing/model_test.mustache

@@ -4,7 +4,7 @@
 /**
  * {{classname}}Test
  *
- * PHP version 5
+ * PHP version 7.1.3
  *
  * @category Class
  * @package  {{modelTestsPackage}}
@@ -21,6 +21,8 @@
 
 namespace {{modelPackage}};
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * {{classname}}Test Class Doc Comment
  *
@@ -31,7 +33,7 @@ namespace {{modelPackage}};
  * @author      openapi-generator contributors
  * @link        https://github.com/openapitools/openapi-generator
  */
-class {{classname}}Test extends \PHPUnit_Framework_TestCase
+class {{classname}}Test extends TestCase
 {
 
     /**

modules/openapi-generator/src/main/resources/php-symfony/testing/phpunit.xml.mustache

@@ -21,6 +21,6 @@
     </filter>
     <php>
         <ini name="error_reporting" value="E_ALL" />
-        <server name="KERNEL_DIR" value="Tests/" />
+        <server name="KERNEL_CLASS" value="{{testsPackage}}\AppKernel" />
     </php>
 </phpunit>

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

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/
+/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

samples/server/petstore/php-symfony/SymfonyBundle-php/.php_cs.dist

@@ -0,0 +1,20 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->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)
+;