Merge branch 'hotfix/224' into develop

Forward port #224
zendframework · Dec 9, 2015 · 4ed2a15 · 4ed2a15
2 parents 332462c + e844e4b
commit 4ed2a15
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,9 @@ Fourth release candidate.
   also details how to create the command for standalone users.
 - [#221](https://github.com/zendframework/zend-expressive/pull/221) splits the
   various cookbook entries into separate files, so each is self-contained.
+- [#224](https://github.com/zendframework/zend-expressive/pull/224) adds opening
+  `<?php` tags to two configuration file examples, in order to prevent
+  copy-paste errors.
 
 ## 1.0.0rc3 - 2015-12-07
 

diff --git a/doc/book/usage-examples.md b/doc/book/usage-examples.md
@@ -286,6 +286,7 @@ return ConfigFactory::fromFiles($files);
 In `config/autoload/global.php`, place the following:
 
 ```php
+<?php
 return [
     'routes' => [
         [
@@ -434,6 +435,7 @@ If you use a container to fetch your application instance, you have an
 additional option for specifying middleware for the pipeline: configuration:
 
 ```php
+<?php
 return [
     'routes' => [
         [