Merge branch 'versions/2.5.3' into develop

weierophinney · weierophinney · commit 2ada87cc3c0f · 2016-01-19T14:50:02.000-06:00
2.5.3 readiness
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,7 +31,7 @@ All notable changes to this project will be documented in this file, in reverse
   and various helper factories are implemented, while leaving the functionality
   the same.
 
-## 2.5.3 - TBD
+## 2.5.3 - 2016-01-19
 
 ### Added
 
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         }
     },
     "require": {
-        "php": ">=5.5",
+        "php": "^5.5 || ^7.0",
         "zendframework/zend-eventmanager": "dev-develop as 2.7.0",
         "zendframework/zend-loader": "~2.5",
         "zendframework/zend-stdlib": "~2.5"

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`}`
`14`	`14`	`},`
`15`	`15`	`"require": {`
`16`		`- "php": ">=5.5",`
	`16`	`+ "php": "^5.5 \|\| ^7.0",`
`17`	`17`	`"zendframework/zend-eventmanager": "dev-develop as 2.7.0",`
`18`	`18`	`"zendframework/zend-loader": "~2.5",`
`19`	`19`	`"zendframework/zend-stdlib": "~2.5"`