From da0e352abbdeaa532fc1a873b23e91fec9365356 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 24 Apr 2018 12:23:06 -0500 Subject: [PATCH 1/3] Updated branch aliases - dev-master => 2.8.x-dev - dev-develop => 2.9.x-dev --- composer.json | 4 ++-- composer.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f7a49b1..eea87fb 100644 --- a/composer.json +++ b/composer.json @@ -50,8 +50,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.7.x-dev", - "dev-develop": "2.8.x-dev" + "dev-master": "2.8.x-dev", + "dev-develop": "2.9.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index f91ff79..7734772 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b0aed4f8edd34eaa93f115c43223c706", + "content-hash": "d28060dd357e2d5fa562f6aec27d5f51", "packages": [ { "name": "paragonie/random_compat", From bae2fe98938e8246454b6e62fd95ed03e16a656f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 24 Apr 2018 12:23:45 -0500 Subject: [PATCH 2/3] Merged 2.7.1 and 2.8.0 changelog entries --- CHANGELOG.md | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 532b210..5e22c35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,22 +25,6 @@ All notable changes to this project will be documented in this file, in reverse - [#23](https://github.com/zendframework/zend-captcha/pull/23) fixes an issue with garbage collection of expired CAPTCHA images when concurrent requests trigger collection. -## 2.7.1 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - - [#31](https://github.com/zendframework/zend-captcha/pull/31) fixes using the ReCaptcha response as the value parameter to isValid(). From e67e8eef90e07e6a79cf191b6ad7f27fc4452ad1 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 24 Apr 2018 12:23:59 -0500 Subject: [PATCH 3/3] Set release date for 2.8.0 in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e22c35..493b81b 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.8.0 - TBD +## 2.8.0 - 2018-04-24 ### Added