Merge branch 'releases/2.1.2' into develop

2.1.2 readiness

CHANGELOG.md

@@ -1,5 +1,126 @@
 # CHANGELOG
 
+## 2.1.2 (20 Feb 2013):
+
+- 3085: create controller via Zend\Mvc\Controller\ControllerManager
+  (https://github.com/zendframework/zf2/issues/3085)
+- 3469: ConnectionInterface docblock is wrong or implementation is wrong..
+  (https://github.com/zendframework/zf2/issues/3469)
+- 3506: [WIP] [#3113] Fix spelling in error validation messages
+  (https://github.com/zendframework/zf2/issues/3506)
+- 3636: If route has child routes and in URL has arbitrary query like "?lang=de"
+  it does not work
+  (https://github.com/zendframework/zf2/issues/3636)
+- 3652: Query parameter ?action=somevalue will get 404 error
+  (https://github.com/zendframework/zf2/issues/3652)
+- 3683: Fix to make sure NotEmpty validator is not already set
+  (https://github.com/zendframework/zf2/issues/3683)
+- 3691: Fix for GitHub issue 3469
+  (https://github.com/zendframework/zf2/issues/3691)
+- 3698: Openssl error string
+  (https://github.com/zendframework/zf2/issues/3698)
+- 3699: Certain servers may not set a whitespace after a colon 
+  (Set-Cookie: header)
+  (https://github.com/zendframework/zf2/issues/3699)
+- 3701: Synced pt\_BR\Zend\_Validate.php with en\Zend\_Validate.php
+  (https://github.com/zendframework/zf2/issues/3701)
+- 3702: added new file: resources\languages\pt\_BR\Zend\_Captcha.php
+  (https://github.com/zendframework/zf2/issues/3702)
+- 3703: [WIP] Adding parallel testing ANT build configuration and related files
+  (https://github.com/zendframework/zf2/issues/3703)
+- 3705: Recent composer.json update of stdlib package
+  (https://github.com/zendframework/zf2/issues/3705)
+- 3706: clear joins and create without columns
+  (https://github.com/zendframework/zf2/issues/3706)
+- 3707: quoteIdentifier problem in sequence
+  (https://github.com/zendframework/zf2/issues/3707)
+- 3708: Filter\File\RenameUpload: wrap move\_uploaded\_file to be easly mocked
+  (https://github.com/zendframework/zf2/issues/3708)
+- 3712: Fix for URIs with a query string not matching
+  (https://github.com/zendframework/zf2/issues/3712)
+- 3713: Session Container Mismatch & Version Compare fixes for 5.3.3
+  (https://github.com/zendframework/zf2/issues/3713)
+- 3715: [#3705] Fix autoload.files setting in composer.json
+  (https://github.com/zendframework/zf2/issues/3715)
+- 3716: Added the Zend\Form decepence in composer.json for Zend\Mvc
+  (https://github.com/zendframework/zf2/issues/3716)
+- 3721: Created README.md files for each component
+  (https://github.com/zendframework/zf2/issues/3721)
+- 3722: [Form] [DateTimeSelect] Filter, manager, and view helper fixes
+  (https://github.com/zendframework/zf2/issues/3722)
+- 3725: Use built-in php constants
+  (https://github.com/zendframework/zf2/issues/3725)
+- 3729: Zend\Barcode (Fixes #2862)
+  (https://github.com/zendframework/zf2/issues/3729)
+- 3732: Fix for #2531 - Multiplie navigation don't work
+  (https://github.com/zendframework/zf2/issues/3732)
+- 3733: Fix/select where
+  (https://github.com/zendframework/zf2/issues/3733)
+- 3735: [Form] [FormElementManager] don't overwrite form factory if already set
+  (https://github.com/zendframework/zf2/issues/3735)
+- 3742: Object+hydrator element annotation fix
+  (https://github.com/zendframework/zf2/issues/3742)
+- 3743: [#3739 & #3740] Using version-compare in accept header handler params.
+  (https://github.com/zendframework/zf2/issues/3743)
+- 3746: Fix bugs for some locales!
+  (https://github.com/zendframework/zf2/issues/3746)
+- 3757: Fixed a bug where mail messages were malformed when using the Sendmail
+  (https://github.com/zendframework/zf2/issues/3757)
+- 3764: Validator File MimeType (IsImage & IsCompressed)
+  (https://github.com/zendframework/zf2/issues/3764)
+- 3771: Zend\File\Transfer\Adapter\Http on receive : error "File was not found"  in ZF 2.1
+  (https://github.com/zendframework/zf2/issues/3771)
+- 3778: [#3711] Fix regression in query string matching
+  (https://github.com/zendframework/zf2/issues/3778)
+- 3782: [WIP] Zend\Di\Di::get() with call parameters ignored shared instances.
+  (https://github.com/zendframework/zf2/issues/3782)
+- 3783: Provide branch-alias entries for each component composer.json
+  (https://github.com/zendframework/zf2/issues/3783)
+- 3785: Zend\Db\Sql\Literal Fix when % is used in string
+  (https://github.com/zendframework/zf2/issues/3785)
+- 3786: Inject shared event manager in initializer
+  (https://github.com/zendframework/zf2/issues/3786)
+- 3789: Update library/Zend/Mail/Header/AbstractAddressList.php
+  (https://github.com/zendframework/zf2/issues/3789)
+- 3793: Resolved Issue: #3748 - offsetGet and __get should do a direct proxy to
+  $_SESSION
+  (https://github.com/zendframework/zf2/issues/3793)
+- 3794: Implement query and fragment assembling into the HTTP router itself
+  (https://github.com/zendframework/zf2/issues/3794)
+- 3797: remove @category, @package, and @subpackage docblocks
+  (https://github.com/zendframework/zf2/issues/3797)
+- 3798: Remove extra semicolons
+  (https://github.com/zendframework/zf2/issues/3798)
+- 3803: Fix identical validator
+  (https://github.com/zendframework/zf2/issues/3803)
+- 3806: Remove obsolete catch statement
+  (https://github.com/zendframework/zf2/issues/3806)
+- 3807: Resolve undefined classes in phpDoc
+  (https://github.com/zendframework/zf2/issues/3807)
+- 3808: Add missing @return annotations
+  (https://github.com/zendframework/zf2/issues/3808)
+- 3813: Bug fix for GlobIterator extending service
+  (https://github.com/zendframework/zf2/issues/3813)
+- 3817: Add failing tests for Simple console route
+  (https://github.com/zendframework/zf2/issues/3817)
+- 3819: Allow form element filter to convert a string to array
+  (https://github.com/zendframework/zf2/issues/3819)
+- 3828: Cannot validate form when keys of collection in data are non consecutive
+  (https://github.com/zendframework/zf2/issues/3828)
+- 3831: Non-matching argument type for ArrayObject
+  (https://github.com/zendframework/zf2/issues/3831)
+- 3832: Zend\Db\Sql\Predicate\Predicate->literal() does not work with integer 0
+  as $expressionParameters
+  (https://github.com/zendframework/zf2/issues/3832)
+- 3836: Zend\Db\Sql\Predicate\Predicate Fix for literal() usage
+  (https://github.com/zendframework/zf2/issues/3836)
+- 3837: Fix for legacy Transfer usage of File Validators
+  (https://github.com/zendframework/zf2/issues/3837)
+- 3838: Stdlib\ArrayObject & Zend\Session\Container Compatibility with ArrayObject
+  (https://github.com/zendframework/zf2/issues/3838)
+- 3839: Fixes #2477 - Implemented optional subdomains using regex
+  (https://github.com/zendframework/zf2/issues/3839)
+
 ## 2.1.1 (06 Feb 2013):
 
 - 2510: Zend\Session\Container does not allow modification by reference

README.md

@@ -1,17 +1,17 @@
-### Welcome to the *Zend Framework 2.2* Release!
+### Welcome to the *Zend Framework 2.1* Release!
 
 Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)
 Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=develop)](http://travis-ci.org/zendframework/zf2)
 
 ## RELEASE INFORMATION
 
-*Zend Framework 2.2.0dev*
+*Zend Framework 2.1.2*
 
-This is the second minor (feature) release for the version 2 series.
+This is the second maintenance release for the version 2.1 series.
 
-DD MMM YYYY
+20 Feb 2013
 
-### UPDATES IN 2.2.0
+### UPDATES IN 2.1.2
 
 Please see [CHANGELOG.md](CHANGELOG.md).
 

library/Zend/Version/Version.php

@@ -19,7 +19,7 @@ final class Version
     /**
      * Zend Framework version identification - see compareVersion()
      */
-    const VERSION = '2.2.0dev';
+    const VERSION = '2.1.2';
 
     /**
      * Github Service Identifier for version information is retreived from