Permalink
Browse files

Merge branch 'master' of https://github.com/zendframework/zf2

Conflicts:
	library/Zend/I18n/Validator/Float.php
	tests/ZendTest/I18n/Validator/FloatTest.php
  • Loading branch information...
2 parents 6396493 + 98b6676 commit f73a3f7607720750968c8fb57479b14ccf41081e Jerry Saravia committed Sep 25, 2012
Showing 761 changed files with 3,228 additions and 1,241 deletions.
View
@@ -0,0 +1,135 @@
+# CHANGELOG
+
+## 2.0.2:
+
+- 2383: Changed unreserved char definition in Zend\Uri (ZF2-533) and added shell
+ escaping to the test runner (https://github.com/zendframework/zf2/pull/2383)
+- 2393: Trying to solve issue ZF2-558
+ (https://github.com/zendframework/zf2/pull/2393)
+- 2398: Segment route: add fix for optional groups within optional groups
+ (https://github.com/zendframework/zf2/pull/2398)
+- 2400: Use 'Router' in http env and 'HttpRouter' in cli
+ (https://github.com/zendframework/zf2/pull/2400)
+- 2401: Better precision for userland fmod algorithm
+ (https://github.com/zendframework/zf2/pull/2401)
+
+
+## 2.0.1:
+
+- 2285: Seed RouteMatch params as long as params is set. This permits setting an
+ empty array. (https://github.com/zendframework/zf2/pull/2285)
+- 2286: prepareNotFoundViewModel listner - eventResult as ViewModel if set
+ (https://github.com/zendframework/zf2/pull/2286)
+- 2290: <span>$label</span> only when filled
+ (https://github.com/zendframework/zf2/pull/2290)
+- 2292: Allow (int)0 in coomments count in entry feed
+ (https://github.com/zendframework/zf2/pull/2292)
+- 2295: force to check className parameters
+ (https://github.com/zendframework/zf2/pull/2295)
+- 2296: mini-fix in controller plugin manager
+ (https://github.com/zendframework/zf2/pull/2296)
+- 2297: fixed phpdoc in Zend\Mvc\ApplicationInterface
+ (https://github.com/zendframework/zf2/pull/2297)
+- 2298: Update to Date element use statements to make it clearer which DateTime
+ (https://github.com/zendframework/zf2/pull/2298)
+- 2300: FormRow translate label fix (#ZF2-516)
+ (https://github.com/zendframework/zf2/pull/2300)
+- 2302: Notifications now to #zftalk.dev
+ (https://github.com/zendframework/zf2/pull/2302)
+- 2306: Fix several cs (https://github.com/zendframework/zf2/pull/2306)
+- 2307: Removed comment about non existent Zend_Tool
+ (https://github.com/zendframework/zf2/pull/2307)
+- 2308: Fix pluginmanager get method error
+ (https://github.com/zendframework/zf2/pull/2308)
+- 2309: Add consistency with event name
+ (https://github.com/zendframework/zf2/pull/2309)
+- 2310: Update library/Zend/Db/Sql/Select.php
+ (https://github.com/zendframework/zf2/pull/2310)
+- 2311: Version update (https://github.com/zendframework/zf2/pull/2311)
+- 2312: Validator Translations (https://github.com/zendframework/zf2/pull/2312)
+- 2313: ZF2-336: Zend\Form adds enctype attribute as multipart/form-data
+ (https://github.com/zendframework/zf2/pull/2313)
+- 2317: Make Fieldset constructor consistent with parent Element class
+ (https://github.com/zendframework/zf2/pull/2317)
+- 2321: ZF2-534 Zend\Log\Writer\Syslog prevents setting application name
+ (https://github.com/zendframework/zf2/pull/2321)
+- 2322: Jump to cache-storing instead of returning
+ (https://github.com/zendframework/zf2/pull/2322)
+- 2323: Conditional statements improved(minor changes).
+ (https://github.com/zendframework/zf2/pull/2323)
+- 2324: Fix for ZF2-517: Zend\Mail\Header\GenericHeader fails to parse empty
+ header (https://github.com/zendframework/zf2/pull/2324)
+- 2328: Wrong \__clone method (https://github.com/zendframework/zf2/pull/2328)
+- 2331: added validation support for optgroups
+ (https://github.com/zendframework/zf2/pull/2331)
+- 2332: README-GIT update with optional pre-commit hook
+ (https://github.com/zendframework/zf2/pull/2332)
+- 2334: Mail\Message::getSubject() should return value the way it was set
+ (https://github.com/zendframework/zf2/pull/2334)
+- 2335: ZF2-511 Updated refactored names and other fixes
+ (https://github.com/zendframework/zf2/pull/2335)
+- 2336: ZF-546 Remove duplicate check for time
+ (https://github.com/zendframework/zf2/pull/2336)
+- 2337: ZF2-539 Input type of image should not have attribute value
+ (https://github.com/zendframework/zf2/pull/2337)
+- 2338: ZF2-543: removed linked but not implemented cache adapters
+ (https://github.com/zendframework/zf2/pull/2338)
+- 2341: Updated Zend_Validate.php pt_BR translation to 25.Jul.2011 EN Revision
+ (https://github.com/zendframework/zf2/pull/2341)
+- 2342: ZF2-549 Zend\Log\Formatter\ErrorHandler does not handle complex events
+ (https://github.com/zendframework/zf2/pull/2342)
+- 2346: updated Page\Mvc::isActive to check if the controller param was
+ tinkered (https://github.com/zendframework/zf2/pull/2346)
+- 2349: Zend\Feed Added unittests for more code coverage
+ (https://github.com/zendframework/zf2/pull/2349)
+- 2350: Bug in Zend\ModuleManager\Listener\LocatorRegistrationListener
+ (https://github.com/zendframework/zf2/pull/2350)
+- 2351: ModuleManagerInterface is never used
+ (https://github.com/zendframework/zf2/pull/2351)
+- 2352: Hotfix for AbstractDb and Csrf Validators
+ (https://github.com/zendframework/zf2/pull/2352)
+- 2354: Update library/Zend/Feed/Writer/AbstractFeed.php
+ (https://github.com/zendframework/zf2/pull/2354)
+- 2355: Allow setting CsrfValidatorOptions in constructor
+ (https://github.com/zendframework/zf2/pull/2355)
+- 2356: Update library/Zend/Http/Cookies.php
+ (https://github.com/zendframework/zf2/pull/2356)
+- 2357: Update library/Zend/Barcode/Object/AbstractObject.php
+ (https://github.com/zendframework/zf2/pull/2357)
+- 2358: Update library/Zend/ServiceManager/AbstractPluginManager.php
+ (https://github.com/zendframework/zf2/pull/2358)
+- 2359: Update library/Zend/Server/Method/Parameter.php
+ (https://github.com/zendframework/zf2/pull/2359)
+- 2361: Zend\Form Added extra unit tests and some code improvements
+ (https://github.com/zendframework/zf2/pull/2361)
+- 2364: Remove unused use statements
+ (https://github.com/zendframework/zf2/pull/2364)
+- 2365: Resolve undefined classes and constants
+ (https://github.com/zendframework/zf2/pull/2365)
+- 2366: fixed typo in Zend\View\HelperPluginManager
+ (https://github.com/zendframework/zf2/pull/2366)
+- 2370: Error handling in AbstractWriter::write using Zend\Stdlib\ErrorHandler
+ (https://github.com/zendframework/zf2/pull/2370)
+- 2372: Update library/Zend/ServiceManager/Config.php
+ (https://github.com/zendframework/zf2/pull/2372)
+- 2375: zend-inputfilter already requires
+ (https://github.com/zendframework/zf2/pull/2375)
+- 2376: Activate the new GitHub feature: Contributing Guidelines
+ (https://github.com/zendframework/zf2/pull/2376)
+- 2377: Update library/Zend/Mvc/Controller/AbstractController.php
+ (https://github.com/zendframework/zf2/pull/2377)
+- 2379: Typo in property name in Zend/Db/Metadata/Object/AbstractTableObject.php
+ (https://github.com/zendframework/zf2/pull/2379)
+- 2382: PHPDoc params in AbstractTableGateway.php
+ (https://github.com/zendframework/zf2/pull/2382)
+- 2384: Replace Router with Http router in url view helper
+ (https://github.com/zendframework/zf2/pull/2384)
+- 2387: Replace PHP internal fmod function because it gives false negatives
+ (https://github.com/zendframework/zf2/pull/2387)
+- 2388: Proposed fix for ZF2-569 validating float with trailing 0's (10.0,
+ 10.10) (https://github.com/zendframework/zf2/pull/2388)
+- 2391: clone in Filter\FilterChain
+ (https://github.com/zendframework/zf2/pull/2391)
+- Security fix: a number of classes were not using the Escaper component in
+ order to perform URL, HTML, and/or HTML attribute escaping. Please see
+ http://framework.zend.com/security/advisory/ZF2012-03 for more details.
View
@@ -0,0 +1,77 @@
+# CONTRIBUTING
+
+## RESOURCES
+
+If you wish to contribute to Zend Framework, please be sure to
+read/subscribe to the following resources:
+
+ - Coding Standards:
+ http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
+ - ZF Git Guide:
+ [README-GIT.md](README-GIT.md)
+ - Contributor's Guide:
+ http://framework.zend.com/participate/contributor-guide
+ - ZF Contributor's mailing list:
+ Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
+ Subscribe: zf-contributors-subscribe@lists.zend.com
+ - ZF Contributor's IRC channel:
+ #zftalk.dev on Freenode.net
+
+If you are working on new features, or refactoring an existing
+component, please create a proposal. You can do this in on the RFC's
+page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
+
+## RUNNING TESTS
+
+To run tests:
+
+- Make sure you have a recent version of PHPUnit installed; 3.6.0
+ minimally.
+- Enter the `tests/` subdirectory.
+- Execute PHPUnit, providing a path to a component directory for which
+ you wish to run tests, or a specific test class file.
+
+ ```sh
+ % phpunit ZendTest/Http
+ % phpunit ZendTest/Http/Header/EtagTest.php
+ ```
+
+- You may also provide the `--group` switch; in such cases, provide the
+ top-level component name:
+
+ ```sh
+ % phpunit --group Zend_Http
+ ```
+
+ This will likely lead to errors, so it's usually best to specify a
+ specific component in which to run test:
+
+ ```sh
+ % phpunit --group ZF-XYZ Zend/Http
+ ```
+- Alternately, use the `run-tests.php` script. This can be executed with no
+ arguments to run all tests:
+
+ ```sh
+ % php run-tests.php
+ ```
+
+ You can also provide top-level component names to run tests for individual
+ components or several components at a time. The component name is the the
+ component namespace, without the `Zend\` prefix:
+
+ ```sh
+ % php run-tests Mvc
+ ```
+
+ ```sh
+ % php run-tests ModuleManager Mvc View Navigation
+ ```
+
+You can turn on conditional tests with the TestConfiguration.php file.
+To do so:
+
+ - Enter the `tests/` subdirectory.
+ - Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
+ - Edit `TestConfiguration.php` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
View
@@ -1,64 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- - ZF2 Requirements:
- http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Requirements
- - Coding Standards:
- http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
- - ZF Git Guide:
- [README-GIT.md](README-GIT.md)
- - Contributor's Guide:
- http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework
- - ZF Contributor's mailing list:
- Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
- Subscribe: zf-contributors-subscribe@lists.zend.com
- - ZF Contributor's IRC channel:
- #zftalk.2 on Freenode.net
-
-If you are working on new features, or refactoring an existing
-component, please create a proposal. You can do this in on the RFC's
-page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
-
-## RUNNING TESTS
-
-The full test suite currently does not run! This is due to some
-components not yet being migrated to namespaces, as well as to some
-issues we've encountered in refactoring.
-
-To run tests:
-
- - Make sure you have a recent version of PHPUnit installed; 3.6.0
- minimally.
- - Enter the `tests/` subdirectory.
- - Execute PHPUnit, providing a path to a component directory for which
- you wish to run tests, or a specific test class file.
-
- ```sh
- % phpunit Zend/Http
- % phpunit Zend/Http/Header/EtagTest.php
- ```
-
- - You may also provide the `--group` switch; in such cases, provide the
- top-level component name:
-
- ```sh
- % phpunit --group Zend_Http
- ```
- This will likely lead to errors, so it's usually best to specify a
- specific component in which to run test:
-
- ```sh
- % phpunit --group ZF-XYZ Zend/Http
- ```
-
-You can turn on conditional tests with the TestConfiguration.php file.
-To do so:
-
- - Enter the `tests/` subdirectory.
- - Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
- - Edit `TestConfiguration.php` to enable any specific functionality you
- want to test, as well as to provide test values to utilize.
Oops, something went wrong.

0 comments on commit f73a3f7

Please sign in to comment.