From 4dfaf6f78dce980d9d24d374776ee6d47825a741 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 11 Jan 2016 12:27:20 -0600 Subject: [PATCH] 2.7.0 release preparation - Set date for 2.7.0 in CHANGELOG. - Updated `composer.json` branch aliases and PHP version requirement. --- CHANGELOG.md | 2 +- composer.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07d7e92c..819bd636 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.7.0 - TBD +## 2.7.0 - 2016-01-11 ### Added diff --git a/composer.json b/composer.json index a8436c59..181a6438 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ } }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "container-interop/container-interop": "~1.0" }, "require-dev": { @@ -31,8 +31,8 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7-dev", + "dev-develop": "3.0-dev" } }, "autoload-dev": {