Merge branch 'releases/2.2.4'

2.2.4 readiness
radnan · Aug 26, 2013 · 5b03d86 · 5b03d86
2 parents eb25ed3 + 6dad278
commit 5b03d86
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2.2.4 (2013-08-26)
+
+- [5008: deprecated feature in classmap generator](https://github.com/zendframework/zf2/issues/5008)
+- [5015: Allow set Form::setPreferFormInputFilter via options](https://github.com/zendframework/zf2/issues/5015)
+- [5028: Fix forms regression introduced in 2.2.3](https://github.com/zendframework/zf2/issues/5028)
+
 ## 2.2.3 (2013-08-21):
 
 - [4851: allow usage of validator and filter plugin managers in input filter factory if form manager injected](https://github.com/zendframework/zf2/issues/4851)

diff --git a/README.md b/README.md
@@ -5,14 +5,24 @@ Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?bra
 
 ## RELEASE INFORMATION
 
-*Zend Framework 2.2.4dev*
+*Zend Framework 2.2.4*
 
 This is the fourth maintenance release for the 2.2 series.
 
-DD MMM YYYY
+26 Aug 2013
 
 ### UPDATES IN 2.2.4
 
+This release fixes a regression introduced in 2.2.3 to the Form component.
+
+Basically, a fix included in 2.2.3 created a situation that enforced the
+`preferFormInputFilter` flag; prior to 2.2.3, the code acted as if it the flag
+was enabled, but as a side effect of several bugs.
+
+2.2.4 enables the flag by default, which restores the previous behavior, while
+retaining the fixes to 2.2.3. Additionally, the flag may now be set via form
+options passed either to a factory or to the `setOptions()` method.
+
 Please see [CHANGELOG.md](CHANGELOG.md).
 
 ### SYSTEM REQUIREMENTS

diff --git a/library/Zend/Version/Version.php b/library/Zend/Version/Version.php
@@ -19,7 +19,7 @@ final class Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '2.2.4dev';
+    const VERSION = '2.2.4';
 
     /**
      * Github Service Identifier for version information is retreived from