Merge branch 'feature/implicit-head-options-middleware'

Close #7

CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 0.2.0 - 2016-12-20
+
+### Added
+
+- Nothing.
+
+### Changes
+
+- [#7](https://github.com/zendframework/zend-expressive-tooling/pull/7) updates
+  the `Zend\Expressive\Tooling\GenerateProgrammaticPipelineFromConfig\Generator`
+  class such that it now:
+
+  - Adds dependency configuration for `Zend\Expressive\Middleware\ImplicitHeadMiddleware`
+  - Adds dependency configuration for `Zend\Expressive\Middleware\ImplicitOptionsMiddleware`
+  - Registers each of the above middleware immediately following the
+    routing middleware in the pipeline.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 0.1.3 - 2016-12-08
 
 ### Added

composer.json

@@ -47,14 +47,15 @@
     ],
     "scripts": {
         "check": [
+            "@license-check",
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "license-check": "vendor/bin/docheader check src/",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --coverage-clover clover.xml",
-        "license-check": "vendor/bin/docheader check src/"
+        "upload-coverage": "coveralls -v"
     }
 }

src/GenerateProgrammaticPipelineFromConfig/Generator.php

@@ -10,6 +10,8 @@
 use ArrayObject;
 use Traversable;
 use Zend\Expressive\Application;
+use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
 use Zend\Expressive\Router\Route;
 use Zend\Stdlib\SplPriorityQueue;
 
@@ -30,13 +32,17 @@ class Generator
 use Zend\Expressive\Container\ErrorResponseGeneratorFactory;
 use Zend\Expressive\Container\NotFoundHandlerFactory;
 use Zend\Expressive\Middleware\ErrorResponseGenerator;
+use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
 use Zend\Expressive\Middleware\NotFoundHandler;
 use Zend\Stratigility\Middleware\ErrorHandler;
 use Zend\Stratigility\Middleware\OriginalMessages;
 
 return [
     'dependencies' => [
         'invokables' => [
+            ImplicitHeadMiddleware::class => ImplicitHeadMiddleware::class,
+            ImplicitOptionsMiddleware::class => ImplicitOptionsMiddleware::class,
             OriginalMessages::class => OriginalMessages::class,
         ],
         'factories' => [
@@ -194,6 +200,16 @@ private function generatePipeline(array $config)
                 && $spec['middleware'] === Application::ROUTING_MIDDLEWARE
             ) {
                 $pipeline[] = '$app->pipeRoutingMiddleware();';
+                $pipeline[] = sprintf(
+                    self::TEMPLATE_PIPELINE_NO_PATH,
+                    'pipe',
+                    $this->formatMiddleware(ImplicitHeadMiddleware::class)
+                );
+                $pipeline[] = sprintf(
+                    self::TEMPLATE_PIPELINE_NO_PATH,
+                    'pipe',
+                    $this->formatMiddleware(ImplicitOptionsMiddleware::class)
+                );
                 continue;
             }
 

test/GenerateProgrammaticPipelineFromConfig/TestAsset/expected/config/autoload/programmatic-pipeline.global.php

@@ -7,13 +7,17 @@
 use Zend\Expressive\Container\ErrorResponseGeneratorFactory;
 use Zend\Expressive\Container\NotFoundHandlerFactory;
 use Zend\Expressive\Middleware\ErrorResponseGenerator;
+use Zend\Expressive\Middleware\ImplicitHeadMiddleware;
+use Zend\Expressive\Middleware\ImplicitOptionsMiddleware;
 use Zend\Expressive\Middleware\NotFoundHandler;
 use Zend\Stratigility\Middleware\ErrorHandler;
 use Zend\Stratigility\Middleware\OriginalMessages;
 
 return [
     'dependencies' => [
         'invokables' => [
+            ImplicitHeadMiddleware::class => ImplicitHeadMiddleware::class,
+            ImplicitOptionsMiddleware::class => ImplicitOptionsMiddleware::class,
             OriginalMessages::class => OriginalMessages::class,
         ],
         'factories' => [

test/GenerateProgrammaticPipelineFromConfig/TestAsset/expected/config/pipeline.php

@@ -15,6 +15,8 @@
     'Api\\Middleware\\Validation',
 ]);
 $app->pipeRoutingMiddleware();
+$app->pipe('Zend\\Expressive\\Middleware\\ImplicitHeadMiddleware');
+$app->pipe('Zend\\Expressive\\Middleware\\ImplicitOptionsMiddleware');
 $app->pipe('Zend\\Expressive\\Helper\\UrlHelperMiddleware');
 $app->pipeDispatchMiddleware();
 $app->pipe('App\\Middleware\\NotFoundHandler');