Zend Expressive fix and upgrade to version 2 (#6461)

* upgraded zend-expressive from version 1 to 2

* Changed error handler for compatibility with Zend Expressive 2

* generated newest sample files for Petstore ze-ph

* removed ErrorMiddleware because it is never been used anymore. Regenerated samples

* removed ErrorMiddleware Template from Codegen

* remove ErrorMiddleware from petstore sample

* Fixed some code styles

* regenerated ze-ph samples with corrected code styles

* added new line at the end of the file

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ZendExpressivePathHandlerServerCodegen.java

@@ -55,7 +55,6 @@ public ZendExpressivePathHandlerServerCodegen() {
  supportingFiles.add(new SupportingFile("Date.php.mustache", packagePath + File.separator + srcBasePath + File.separator + "Strategy", "Date.php"));
  supportingFiles.add(new SupportingFile("DateTime.php.mustache", packagePath + File.separator + srcBasePath + File.separator + "Strategy", "DateTime.php"));
  supportingFiles.add(new SupportingFile("Type.php.mustache", packagePath + File.separator + srcBasePath + File.separator + "Validator", "Type.php"));
- supportingFiles.add(new SupportingFile("ErrorMiddleware.php.mustache", packagePath + File.separator + srcBasePath, "ErrorMiddleware.php"));
 
  additionalProperties.put(CodegenConstants.ARTIFACT_VERSION, "1.0.0");
  }

modules/swagger-codegen/src/main/resources/ze-ph/Date.php.mustache

@@ -12,6 +12,10 @@ class Date extends DateTime
  */
  protected function parseDateString($arrayValue)
  {
- return \DateTime::createFromFormat(static::DATE_TIME_FORMAT.' H:i:sP', $arrayValue.' 00:00:00+00:00', new \DateTimeZone('UTC'));
+ return \DateTime::createFromFormat(
+ static::DATE_TIME_FORMAT . ' H:i:sP',
+ $arrayValue . ' 00:00:00+00:00',
+ new \DateTimeZone('UTC')
+ );
  }
-}
+}

modules/swagger-codegen/src/main/resources/ze-ph/DateTime.php.mustache

@@ -1,11 +1,13 @@
 <?php
 
 namespace {{invokerPackage}}\Strategy;
+
 use Articus\DataTransfer\Strategy\StrategyInterface;
 
 class DateTime implements StrategyInterface
 {
  const DATE_TIME_FORMAT = \DateTime::RFC3339;
+
  /**
  * @inheritDoc
  */
@@ -41,4 +43,4 @@ class DateTime implements StrategyInterface
  {
  return \DateTime::createFromFormat(static::DATE_TIME_FORMAT, $arrayValue, new \DateTimeZone('UTC'));
  }
-}
+}

modules/swagger-codegen/src/main/resources/ze-ph/Type.php.mustache

@@ -68,4 +68,4 @@ class Type extends AbstractValidator
  throw new \InvalidArgumentException(sprintf('Can not check for type %s.', $this->type));
  }
  }
-}
+}

modules/swagger-codegen/src/main/resources/ze-ph/api.mustache

@@ -11,7 +11,6 @@ use Articus\PathHandler\Exception as PHException;
 use Psr\Http\Message\ServerRequestInterface;
 
 {{#operations}}
-
 {{#description}}
 /**
  * {{&description}}
@@ -40,7 +39,11 @@ class {{classname}} implements {{interfacesToImplement}}
  * TODO check if producer is valid, if it has correct priority and if it can be moved to class annotation
  * @PHA\Producer(name=PHProducer\Transfer::class, mediaType="{{mediaType}}")
 {{/produces}}
+ * @param ServerRequestInterface $request
+ *
+ * @throws PHException\HttpCode 500 if the method is not implemented
 {{#returnType}}
+ *
  * @return {{returnType}}
 {{/returnType}}
  */

modules/swagger-codegen/src/main/resources/ze-ph/app.yml.mustache

@@ -3,17 +3,24 @@ dependencies:
  #Has to add this line because currently router is strict requirement for Zend\Expressive\Application even if only middleware_pipeline is used
  Zend\Expressive\Router\RouterInterface: Zend\Expressive\Router\ZendRouter
  Zend\Diactoros\Response\EmitterInterface: Zend\Diactoros\Response\SapiStreamEmitter
- {{invokerPackage}}\ErrorMiddleware: {{invokerPackage}}\ErrorMiddleware
  factories:
  Zend\Expressive\Application: Zend\Expressive\Container\ApplicationFactory
  Articus\PathHandler\Middleware: Articus\PathHandler\MiddlewareFactory
  Articus\DataTransfer\Service: Articus\DataTransfer\ServiceFactory
+ Zend\Stratigility\Middleware\ErrorHandler: Zend\Expressive\Container\ErrorHandlerFactory
+ Zend\Expressive\Middleware\ErrorResponseGenerator: Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory
+ Zend\Expressive\Whoops: Zend\Expressive\Container\WhoopsFactory
+ Zend\Expressive\WhoopsPageHandler: Zend\Expressive\Container\WhoopsPageHandlerFactory
 
 middleware_pipeline:
+ error:
+ middleware: Zend\Stratigility\Middleware\ErrorHandler
  api:
  middleware: Articus\PathHandler\Middleware
  path: {{basePathWithoutHost}}
- error:
- middleware: {{invokerPackage}}\ErrorMiddleware
- error: true
- priority: -10000
+
+whoops:
+ json_exceptions:
+ display: true
+ show_trace: true
+ ajax_only: true

modules/swagger-codegen/src/main/resources/ze-ph/composer.json.mustache

@@ -7,12 +7,14 @@
  "require": {
  "php": "^5.6 || ^7.0",
  "ext-yaml" : "^1.2 || ^2.0",
- "zendframework/zend-expressive": "^1.0",
- "zendframework/zend-expressive-router": "1.2.*",
- "articus/path-handler": "0.1.*",
+ "zendframework/zend-expressive": "^2.0",
+ "zendframework/zend-expressive-router": "^2.1",
+ "zendframework/zend-expressive-zendrouter": "^2.0",
+ "articus/path-handler": "0.2.*",
  "articus/data-transfer": "*",
  "zendframework/zend-serializer": "*",
- "zendframework/zend-config": "*"
+ "zendframework/zend-config": "*",
+ "filp/whoops": "^2.1.7"
  },
  "autoload": {
  "psr-4": {

modules/swagger-codegen/src/main/resources/ze-ph/config.yml

@@ -1,2 +1,3 @@
 #App
 cache_configuration: false
+debug: true

modules/swagger-codegen/src/main/resources/ze-ph/index.php

@@ -7,4 +7,4 @@
 
 /** @var \Zend\Expressive\Application $app */
 $app = $container->get(\Zend\Expressive\Application::class);
-$app->run();
+$app->run();

modules/swagger-codegen/src/main/resources/ze-ph/model.mustache

@@ -9,7 +9,7 @@ use Articus\DataTransfer\Annotation as DTA;
  * {{description}}
 {{/description}}
  */
-class {{classname}} 
+class {{classname}}
 {
 {{#vars}}
  /**
@@ -127,5 +127,4 @@ class {{classname}}
  */
  public ${{name}};
 {{/vars}}
-}
-{{/model}}{{/models}}
+}{{/model}}{{/models}}

samples/server/petstore/ze-ph/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.2.3-SNAPSHOT
+2.3.0-SNAPSHOT

samples/server/petstore/ze-ph/application/config.yml

@@ -1,2 +1,3 @@
 #App
 cache_configuration: false
+debug: true

samples/server/petstore/ze-ph/application/config/app.yml

@@ -3,17 +3,24 @@ dependencies:
  #Has to add this line because currently router is strict requirement for Zend\Expressive\Application even if only middleware_pipeline is used
  Zend\Expressive\Router\RouterInterface: Zend\Expressive\Router\ZendRouter
  Zend\Diactoros\Response\EmitterInterface: Zend\Diactoros\Response\SapiStreamEmitter
- App\ErrorMiddleware: App\ErrorMiddleware
  factories:
  Zend\Expressive\Application: Zend\Expressive\Container\ApplicationFactory
  Articus\PathHandler\Middleware: Articus\PathHandler\MiddlewareFactory
  Articus\DataTransfer\Service: Articus\DataTransfer\ServiceFactory
+ Zend\Stratigility\Middleware\ErrorHandler: Zend\Expressive\Container\ErrorHandlerFactory
+ Zend\Expressive\Middleware\ErrorResponseGenerator: Zend\Expressive\Container\WhoopsErrorResponseGeneratorFactory
+ Zend\Expressive\Whoops: Zend\Expressive\Container\WhoopsFactory
+ Zend\Expressive\WhoopsPageHandler: Zend\Expressive\Container\WhoopsPageHandlerFactory
 
 middleware_pipeline:
+ error:
+ middleware: Zend\Stratigility\Middleware\ErrorHandler
  api:
  middleware: Articus\PathHandler\Middleware
  path: /v2
- error:
- middleware: App\ErrorMiddleware
- error: true
- priority: -10000
+
+whoops:
+ json_exceptions:
+ display: true
+ show_trace: true
+ ajax_only: true

samples/server/petstore/ze-ph/application/config/path_handler.yml

@@ -9,6 +9,12 @@ path_handler:
  handler: Fake
  may_terminate: true
  child_routes:
+ 'jsonFormData':
+ type: Literal
+ options:
+ route: /jsonFormData
+ defaults:
+ handler: FakeJsonFormData
  'outer':
  type: Literal
  options:
@@ -38,6 +44,12 @@ path_handler:
  route: /string
  defaults:
  handler: FakeOuterString
+ 'fake_classname_test':
+ type: Literal
+ options:
+ route: /fake_classname_test
+ defaults:
+ handler: FakeClassnameTest
  'pet':
  type: Literal
  options:
@@ -150,10 +162,12 @@ path_handler:
  handlers:
  invokables:
  Fake: App\Handler\Fake
+ FakeJsonFormData: App\Handler\FakeJsonFormData
  FakeOuterBoolean: App\Handler\FakeOuterBoolean
  FakeOuterComposite: App\Handler\FakeOuterComposite
  FakeOuterNumber: App\Handler\FakeOuterNumber
  FakeOuterString: App\Handler\FakeOuterString
+ FakeClassnameTest: App\Handler\FakeClassnameTest
  Pet: App\Handler\Pet
  PetFindByStatus: App\Handler\PetFindByStatus
  PetFindByTags: App\Handler\PetFindByTags

samples/server/petstore/ze-ph/composer.json

@@ -7,12 +7,14 @@
  "require": {
  "php": "^5.6 || ^7.0",
  "ext-yaml" : "^1.2 || ^2.0",
- "zendframework/zend-expressive": "^1.0",
- "zendframework/zend-expressive-router": "1.2.*",
- "articus/path-handler": "0.1.*",
+ "zendframework/zend-expressive": "^2.0",
+ "zendframework/zend-expressive-router": "^2.1",
+ "zendframework/zend-expressive-zendrouter": "^2.0",
+ "articus/path-handler": "0.2.*",
  "articus/data-transfer": "*",
  "zendframework/zend-serializer": "*",
- "zendframework/zend-config": "*"
+ "zendframework/zend-config": "*",
+ "filp/whoops": "^2.1.7"
  },
  "autoload": {
  "psr-4": {

samples/server/petstore/ze-ph/public/index.php

@@ -7,4 +7,4 @@
 
 /** @var \Zend\Expressive\Application $app */
 $app = $container->get(\Zend\Expressive\Application::class);
-$app->run();
+$app->run();

samples/server/petstore/ze-ph/src/App/DTO/AdditionalPropertiesClass.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class AdditionalPropertiesClass 
+class AdditionalPropertiesClass
 {
  /**
  * @DTA\Data(field="map_property", nullable=true)
@@ -21,4 +21,3 @@ class AdditionalPropertiesClass
  */
  public $map_of_map_property;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/Animal.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class Animal 
+class Animal
 {
  /**
  * @DTA\Data(field="className")
@@ -21,4 +21,3 @@ class Animal
  */
  public $color;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/AnimalFarm.php

@@ -6,7 +6,6 @@
 
 /**
  */
-class AnimalFarm 
+class AnimalFarm
 {
 }
-

samples/server/petstore/ze-ph/src/App/DTO/ApiResponse.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class ApiResponse 
+class ApiResponse
 {
  /**
  * @DTA\Data(field="code", nullable=true)
@@ -27,4 +27,3 @@ class ApiResponse
  */
  public $message;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/ArrayOfArrayOfNumberOnly.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class ArrayOfArrayOfNumberOnly 
+class ArrayOfArrayOfNumberOnly
 {
  /**
  * @DTA\Data(field="ArrayArrayNumber", nullable=true)
@@ -18,4 +18,3 @@ class ArrayOfArrayOfNumberOnly
  */
  public $array_array_number;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/ArrayOfNumberOnly.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class ArrayOfNumberOnly 
+class ArrayOfNumberOnly
 {
  /**
  * @DTA\Data(field="ArrayNumber", nullable=true)
@@ -17,4 +17,3 @@ class ArrayOfNumberOnly
  */
  public $array_number;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/ArrayTest.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class ArrayTest 
+class ArrayTest
 {
  /**
  * @DTA\Data(field="array_of_string", nullable=true)
@@ -35,4 +35,3 @@ class ArrayTest
  */
  public $array_array_of_model;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/Capitalization.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class Capitalization 
+class Capitalization
 {
  /**
  * @DTA\Data(field="smallCamel", nullable=true)
@@ -46,4 +46,3 @@ class Capitalization
  */
  public $att_name;
 }
-

samples/server/petstore/ze-ph/src/App/DTO/Cat.php

@@ -6,7 +6,7 @@
 
 /**
  */
-class Cat 
+class Cat
 {
  /**
  * @DTA\Data(field="className")
@@ -27,4 +27,3 @@ class Cat
  */
  public $declawed;
 }
-