Permalink
Browse files

Resolve conflicts

  • Loading branch information...
2 parents 0abbba9 + 5b1496d commit 2c48be785e3c2b80d032d19d144017f52cc72af5 @bakura10 committed Oct 28, 2012
Showing with 7,739 additions and 569 deletions.
  1. +4 −199 CHANGELOG.md
  2. +1 −1 library/Zend/Barcode/Barcode.php
  3. +1 −1 library/Zend/Cache/PatternFactory.php
  4. +1 −1 library/Zend/Cache/StorageFactory.php
  5. +36 −0 library/Zend/Code/Generator/ClassGenerator.php
  6. +49 −105 library/Zend/Code/Scanner/ClassScanner.php
  7. +1 −1 library/Zend/Code/Scanner/MethodScanner.php
  8. +284 −0 library/Zend/Code/Scanner/PropertyScanner.php
  9. +127 −0 library/Zend/Config/Factory.php
  10. +29 −0 library/Zend/Config/WriterPluginManager.php
  11. +0 −4 library/Zend/Crypt/Hmac.php
  12. +345 −0 library/Zend/Crypt/Key/Derivation/Scrypt.php
  13. +27 −1 library/Zend/Crypt/Password/Bcrypt.php
  14. +11 −1 library/Zend/Db/Sql/AbstractSql.php
  15. +1 −0 library/Zend/Filter/FilterPluginManager.php
  16. +150 −0 library/Zend/Filter/UriNormalize.php
  17. +2 −1 library/Zend/Filter/composer.json
  18. +43 −0 library/Zend/Form/Annotation/AbstractArrayOrStringAnnotation.php
  19. +2 −2 library/Zend/Form/Annotation/Hydrator.php
  20. +176 −0 library/Zend/Form/Element/DateSelect.php
  21. +313 −0 library/Zend/Form/Element/MonthSelect.php
  22. +21 −5 library/Zend/Form/Factory.php
  23. +28 −13 library/Zend/Form/View/Helper/FormCollection.php
  24. +109 −0 library/Zend/Form/View/Helper/FormDateSelect.php
  25. +10 −0 library/Zend/Form/View/Helper/FormElement.php
  26. +283 −0 library/Zend/Form/View/Helper/FormMonthSelect.php
  27. +2 −0 library/Zend/Form/View/HelperConfig.php
  28. +10 −7 library/Zend/I18n/View/Helper/DateFormat.php
  29. +84 −0 library/Zend/I18n/View/Helper/Plural.php
  30. +1 −0 library/Zend/I18n/View/HelperConfig.php
  31. +32 −2 library/Zend/Loader/ModuleAutoloader.php
  32. +51 −0 library/Zend/Log/Formatter/ChromePhp.php
  33. +105 −0 library/Zend/Log/Writer/ChromePhp.php
  34. +71 −0 library/Zend/Log/Writer/ChromePhp/ChromePhpBridge.php
  35. +54 −0 library/Zend/Log/Writer/ChromePhp/ChromePhpInterface.php
  36. +168 −0 library/Zend/Log/Writer/FingersCrossed.php
  37. +9 −8 library/Zend/Log/WriterPluginManager.php
  38. +21 −0 library/Zend/Mail/Message.php
  39. +1 −1 library/Zend/Math/BigInteger/BigInteger.php
  40. +27 −0 library/Zend/ModuleManager/Feature/FilterProviderInterface.php
  41. +27 −0 library/Zend/ModuleManager/Feature/ValidatorProviderInterface.php
  42. +6 −16 library/Zend/ModuleManager/Listener/ConfigListener.php
  43. +1 −3 library/Zend/ModuleManager/Listener/DefaultListenerAggregate.php
  44. +72 −4 library/Zend/ModuleManager/Listener/ListenerOptions.php
  45. +3 −3 library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
  46. +140 −0 library/Zend/ModuleManager/Listener/ModuleLoaderListener.php
  47. +5 −3 library/Zend/ModuleManager/Listener/ModuleResolverListener.php
  48. +64 −0 library/Zend/Mvc/Controller/Plugin/Identity.php
  49. +10 −1 library/Zend/Mvc/Controller/Plugin/Redirect.php
  50. +11 −0 library/Zend/Mvc/Controller/PluginManager.php
  51. +7 −10 library/Zend/Mvc/Service/AbstractPluginManagerFactory.php
  52. +1 −7 library/Zend/Mvc/Service/ControllerLoaderFactory.php
  53. +42 −0 library/Zend/Mvc/Service/DiAbstractServiceFactoryFactory.php
  54. +3 −11 library/Zend/Mvc/Service/DiFactory.php
  55. +42 −0 library/Zend/Mvc/Service/DiServiceInitializerFactory.php
  56. +44 −0 library/Zend/Mvc/Service/DiStrictAbstractServiceFactoryFactory.php
  57. +36 −0 library/Zend/Mvc/Service/FilterManagerFactory.php
  58. +12 −0 library/Zend/Mvc/Service/ModuleManagerFactory.php
  59. +25 −20 library/Zend/Mvc/Service/ServiceListenerFactory.php
  60. +36 −0 library/Zend/Mvc/Service/ValidatorManagerFactory.php
  61. +1 −1 library/Zend/Permissions/Acl/Acl.php
  62. +57 −0 library/Zend/Permissions/Acl/AclInterface.php
  63. +102 −0 library/Zend/Permissions/Rbac/AbstractIterator.php
  64. +124 −0 library/Zend/Permissions/Rbac/AbstractRole.php
  65. +27 −0 library/Zend/Permissions/Rbac/AssertionInterface.php
  66. +19 −0 library/Zend/Permissions/Rbac/Exception/ExceptionInterface.php
  67. +20 −0 library/Zend/Permissions/Rbac/Exception/InvalidArgumentException.php
  68. +159 −0 library/Zend/Permissions/Rbac/Rbac.php
  69. +27 −0 library/Zend/Permissions/Rbac/Role.php
  70. +91 −0 library/Zend/Serializer/Adapter/MsgPack.php
  71. +1 −0 library/Zend/Serializer/AdapterPluginManager.php
  72. +1 −1 library/Zend/Serializer/Serializer.php
  73. +0 −3 library/Zend/ServiceManager/AbstractPluginManager.php
  74. +201 −0 library/Zend/Session/SaveHandler/MongoDB.php
  75. +260 −0 library/Zend/Session/SaveHandler/MongoDBOptions.php
  76. +5 −5 library/Zend/Stdlib/AbstractOptions.php
  77. +16 −2 library/Zend/Stdlib/Hydrator/AbstractHydrator.php
  78. +42 −3 library/Zend/Stdlib/Hydrator/ClassMethods.php
  79. +25 −0 library/Zend/Stdlib/Hydrator/HydratorOptionsInterface.php
  80. +128 −0 library/Zend/Stdlib/Hydrator/Strategy/SerializableStrategy.php
  81. +1 −1 library/Zend/Tag/Cloud/DecoratorPluginManager.php
  82. +17 −0 library/Zend/Uri/UriFactory.php
  83. +112 −0 library/Zend/Validator/IsInstanceOf.php
  84. +1 −0 library/Zend/Validator/ValidatorPluginManager.php
  85. +1 −1 library/Zend/Version/Version.php
  86. +31 −1 library/Zend/View/Helper/HeadLink.php
  87. +65 −0 library/Zend/View/Helper/Identity.php
  88. +7 −7 library/Zend/View/Helper/Navigation/AbstractHelper.php
  89. +3 −3 library/Zend/View/Helper/Navigation/HelperInterface.php
  90. +2 −0 library/Zend/View/Helper/Placeholder/Container/AbstractContainer.php
  91. +11 −0 library/Zend/View/HelperPluginManager.php
  92. +6 −0 tests/ZendTest/Code/Annotation/TestAsset/EntityWithAnnotations.php
  93. +15 −0 tests/ZendTest/Code/Generator/ClassGeneratorTest.php
  94. +39 −3 tests/ZendTest/Code/Scanner/ClassScannerTest.php
  95. +47 −0 tests/ZendTest/Code/Scanner/PropertyScannerTest.php
  96. +8 −0 tests/ZendTest/Code/TestAsset/FooClass.php
  97. +91 −1 tests/ZendTest/Config/FactoryTest.php
  98. +22 −0 tests/ZendTest/Config/Writer/TestAssets/DummyWriter.php
  99. +0 −7 tests/ZendTest/Crypt/HmacTest.php
  100. +196 −0 tests/ZendTest/Crypt/Key/Derivation/ScryptTest.php
  101. +16 −0 tests/ZendTest/Crypt/Password/BcryptTest.php
  102. +46 −0 tests/ZendTest/Filter/FilterPluginManagerTest.php
  103. +70 −0 tests/ZendTest/Filter/UriNormalizeTest.php
  104. +11 −0 tests/ZendTest/Form/Annotation/AnnotationBuilderTest.php
  105. +53 −0 tests/ZendTest/Form/Element/DateSelectTest.php
  106. +84 −0 tests/ZendTest/Form/Element/MonthSelectTest.php
  107. +16 −0 tests/ZendTest/Form/FactoryTest.php
  108. +26 −0 tests/ZendTest/Form/TestAsset/Annotation/EntityWithHydratorArray.php
  109. +9 −0 tests/ZendTest/Form/View/Helper/FormCollectionTest.php
  110. +69 −0 tests/ZendTest/Form/View/Helper/FormDateSelectTest.php
  111. +69 −0 tests/ZendTest/Form/View/Helper/FormMonthSelectTest.php
  112. +1 −0 tests/ZendTest/I18n/Validator/FloatTest.php
  113. +58 −4 tests/ZendTest/I18n/View/Helper/DateFormatTest.php
  114. +68 −0 tests/ZendTest/I18n/View/Helper/PluralTest.php
  115. +13 −1 tests/ZendTest/Loader/ModuleAutoloaderTest.php
  116. +15 −0 tests/ZendTest/Loader/_files/BarModule/Module.php
  117. BIN tests/ZendTest/Loader/_files/PharModuleMap.phar
  118. +1 −0 tests/ZendTest/Loader/_files/_buildPhars.php
  119. +46 −0 tests/ZendTest/Log/TestAsset/MockChromePhp.php
  120. +83 −0 tests/ZendTest/Log/Writer/ChromePhpTest.php
  121. +57 −0 tests/ZendTest/Log/Writer/FingersCrossedTest.php
  122. +103 −91 tests/ZendTest/Mail/MessageTest.php
  123. +27 −1 tests/ZendTest/ModuleManager/Listener/ListenerOptionsTest.php
  124. +96 −0 tests/ZendTest/ModuleManager/Listener/ModuleLoaderListenerTest.php
  125. +47 −0 tests/ZendTest/Mvc/Controller/Plugin/IdentityTest.php
  126. +25 −0 tests/ZendTest/Mvc/Controller/Plugin/RedirectTest.php
  127. +34 −0 tests/ZendTest/Mvc/Controller/Plugin/TestAsset/AuthenticationAdapter.php
  128. +61 −0 tests/ZendTest/Mvc/Controller/Plugin/TestAsset/IdentityObject.php
  129. +18 −1 tests/ZendTest/Mvc/Controller/PluginManagerTest.php
  130. +6 −0 tests/ZendTest/Mvc/Service/ControllerLoaderFactoryTest.php
  131. +27 −0 tests/ZendTest/Mvc/Service/DiFactoryTest.php
  132. +144 −0 tests/ZendTest/Permissions/Rbac/RbacTest.php
  133. +45 −0 tests/ZendTest/Permissions/Rbac/TestAsset/RoleMustMatchAssertion.php
  134. +34 −0 tests/ZendTest/Permissions/Rbac/TestAsset/SimpleFalseAssertion.php
  135. +34 −0 tests/ZendTest/Permissions/Rbac/TestAsset/SimpleTrueAssertion.php
  136. +154 −0 tests/ZendTest/Serializer/Adapter/MsgPackTest.php
  137. +146 −0 tests/ZendTest/Session/SaveHandler/MongoDBOptionsTest.php
  138. +158 −0 tests/ZendTest/Session/SaveHandler/MongoDBTest.php
  139. +45 −0 tests/ZendTest/Stdlib/HydratorTest.php
  140. +30 −1 tests/ZendTest/Stdlib/OptionsTest.php
  141. +53 −0 tests/ZendTest/Stdlib/Strategy/SerializableStrategyTest.php
  142. +108 −0 tests/ZendTest/Validator/IsInstanceOfTest.php
  143. +1 −0 tests/ZendTest/Validator/ValidatorChainTest.php
  144. +76 −0 tests/ZendTest/Validator/ValidatorPluginManagerTest.php
  145. +16 −0 tests/ZendTest/View/Helper/HeadLinkTest.php
  146. +51 −0 tests/ZendTest/View/Helper/IdentityTest.php
  147. +20 −0 tests/ZendTest/View/Helper/Placeholder/ContainerTest.php
  148. +34 −0 tests/ZendTest/View/Helper/TestAsset/AuthenticationAdapter.php
  149. +61 −0 tests/ZendTest/View/Helper/TestAsset/IdentityObject.php
  150. +16 −0 tests/ZendTest/View/HelperPluginManagerTest.php
View
@@ -1,205 +1,10 @@
# CHANGELOG
-## 2.0.3:
+## 2.1.0:
-- 2244: Fix for issue ZF2-503 (https://github.com/zendframework/zf2/issues/2244)
-- 2318: Allow to remove decimals in CurrencyFormat
- (https://github.com/zendframework/zf2/issues/2318)
-- 2363: Hotfix db features with eventfeature
- (https://github.com/zendframework/zf2/issues/2363)
-- 2380: ZF2-482 Attempt to fix the buffer. Also added extra unit tests.
- (https://github.com/zendframework/zf2/issues/2380)
-- 2392: Update library/Zend/Db/Adapter/Platform/Mysql.php
- (https://github.com/zendframework/zf2/issues/2392)
-- 2395: Fix for http://framework.zend.com/issues/browse/ZF2-571
- (https://github.com/zendframework/zf2/issues/2395)
-- 2397: Memcached option merge issuse
- (https://github.com/zendframework/zf2/issues/2397)
-- 2402: Adding missing dependencies
- (https://github.com/zendframework/zf2/issues/2402)
-- 2404: Fix to comments (https://github.com/zendframework/zf2/issues/2404)
-- 2416: Fix expressionParamIndex for AbstractSql
- (https://github.com/zendframework/zf2/issues/2416)
-- 2420: Zend\Db\Sql\Select: Fixed issue with join expression named parameters
- overlapping. (https://github.com/zendframework/zf2/issues/2420)
-- 2421: Update library/Zend/Http/Header/SetCookie.php
- (https://github.com/zendframework/zf2/issues/2421)
-- 2422: fix add 2 space after @param in Zend\Loader
- (https://github.com/zendframework/zf2/issues/2422)
-- 2423: ManagerInterface must be interface, remove 'interface' description
- (https://github.com/zendframework/zf2/issues/2423)
-- 2425: Use built-in Travis composer
- (https://github.com/zendframework/zf2/issues/2425)
-- 2426: Remove need of setter in ClassMethods hydrator
- (https://github.com/zendframework/zf2/issues/2426)
-- 2432: Prevent space before end of tag with HTML5 doctype
- (https://github.com/zendframework/zf2/issues/2432)
-- 2433: fix for setJsonpCallback not called when recieved JsonModel + test
- (https://github.com/zendframework/zf2/issues/2433)
-- 2434: added phpdoc in Zend\Db
- (https://github.com/zendframework/zf2/issues/2434)
-- 2437: Hotfix/console 404 reporting
- (https://github.com/zendframework/zf2/issues/2437)
-- 2438: Improved previous fix for ZF2-558.
- (https://github.com/zendframework/zf2/issues/2438)
-- 2440: Turkish Translations for Captcha and Validate
- (https://github.com/zendframework/zf2/issues/2440)
-- 2441: Allow form collection to have any helper
- (https://github.com/zendframework/zf2/issues/2441)
-- 2516: limit(20) -> generates LIMIT '20' and throws an IllegalQueryException
- (https://github.com/zendframework/zf2/issues/2516)
-- 2545: getSqlStringForSqlObject() returns an invalid SQL statement with LIMIT
- and OFFSET clauses (https://github.com/zendframework/zf2/issues/2545)
-- 2595: Pgsql adapater has codes related to MySQL
- (https://github.com/zendframework/zf2/issues/2595)
-- 2613: Prevent password to be rendered if form validation fails
- (https://github.com/zendframework/zf2/issues/2613)
-- 2617: Fixed Zend\Validator\Iban class name
- (https://github.com/zendframework/zf2/issues/2617)
-- 2619: Form enctype fix when File elements are within a collection
- (https://github.com/zendframework/zf2/issues/2619)
-- 2620: InputFilter/Input when merging was not using raw value
- (https://github.com/zendframework/zf2/issues/2620)
-- 2622: Added ability to specify port
- (https://github.com/zendframework/zf2/issues/2622)
-- 2624: Form's default input filters added multiple times
- (https://github.com/zendframework/zf2/issues/2624)
-- 2630: fix relative link ( remove the relative links ) in README.md
- (https://github.com/zendframework/zf2/issues/2630)
-- 2631: Update library/Zend/Loader/AutoloaderFactory.php
- (https://github.com/zendframework/zf2/issues/2631)
-- 2633: fix redundance errors "The input does not appear to be a valid date"
- show twice (https://github.com/zendframework/zf2/issues/2633)
-- 2635: Fix potential issue with Sitemap test
- (https://github.com/zendframework/zf2/issues/2635)
-- 2636: add isset checks around timeout and maxredirects
- (https://github.com/zendframework/zf2/issues/2636)
-- 2641: hotfix : formRow() element error multi-checkbox and radio renderError
- not shown (https://github.com/zendframework/zf2/issues/2641)
-- 2642: Fix Travis build for CS issue
- (https://github.com/zendframework/zf2/issues/2642)
-- 2643: fix for setJsonpCallback not called when recieved JsonModel + test
- (https://github.com/zendframework/zf2/issues/2643)
-- 2644: Add fluidity to the prepare() function for a form
- (https://github.com/zendframework/zf2/issues/2644)
-- 2652: Zucchi/filter tweaks (https://github.com/zendframework/zf2/issues/2652)
-- 2665: pdftest fix (https://github.com/zendframework/zf2/issues/2665)
-- 2666: fixed url change (https://github.com/zendframework/zf2/issues/2666)
-- 2667: Possible fix for rartests
- (https://github.com/zendframework/zf2/issues/2667)
-- 2669: skip whem gmp is loaded
- (https://github.com/zendframework/zf2/issues/2669)
-- 2673: Input fallback value option
- (https://github.com/zendframework/zf2/issues/2673)
-- 2676: mysqli::close() never called
- (https://github.com/zendframework/zf2/issues/2676)
-- 2677: added phpdoc to Zend\Stdlib
- (https://github.com/zendframework/zf2/issues/2677)
-- 2678: Zend\Db\Adapter\Sqlsrv\Sqlsrv never calls Statement\initialize() (fix
- within) (https://github.com/zendframework/zf2/issues/2678)
-- 2679: Zend/Log/Logger.php using incorrect php errorLevel
- (https://github.com/zendframework/zf2/issues/2679)
-- 2680: Cache: fixed bug on getTotalSpace of filesystem and dba adapter
- (https://github.com/zendframework/zf2/issues/2680)
-- 2681: Cache/Dba: fixed notices on tearDown db4 tests
- (https://github.com/zendframework/zf2/issues/2681)
-- 2682: Replace 'Configuration' with 'Config' when retrieving configuration
- (https://github.com/zendframework/zf2/issues/2682)
-- 2683: Hotfix: Allow items from Abstract Factories to have setShared() called
- (https://github.com/zendframework/zf2/issues/2683)
-- 2685: Remove unused Uses (https://github.com/zendframework/zf2/issues/2685)
-- 2686: Adding code to allow EventManager trigger listeners using wildcard
- identifier (https://github.com/zendframework/zf2/issues/2686)
-- 2687: Hotfix/db sql nested expressions
- (https://github.com/zendframework/zf2/issues/2687)
-- 2688: Hotfix/tablegateway event feature
- (https://github.com/zendframework/zf2/issues/2688)
-- 2689: Hotfix/composer phpunit
- (https://github.com/zendframework/zf2/issues/2689)
-- 2690: Use RFC-3339 full-date format (Y-m-d) in Date element
- (https://github.com/zendframework/zf2/issues/2690)
-- 2691: join on conditions don't accept alternatives to columns
- (https://github.com/zendframework/zf2/issues/2691)
-- 2693: Update library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
- (https://github.com/zendframework/zf2/issues/2693)
-- 2694: Bring fluid interface to Feed Writer
- (https://github.com/zendframework/zf2/issues/2694)
-- 2698: fix typo in # should be :: in exception
- (https://github.com/zendframework/zf2/issues/2698)
-- 2699: fix elseif in javascript Upload Demo
- (https://github.com/zendframework/zf2/issues/2699)
-- 2700: fix cs in casting variable
- (https://github.com/zendframework/zf2/issues/2700)
-- 2705: Fix french translation
- (https://github.com/zendframework/zf2/issues/2705)
-- 2707: Improved error message when ServiceManager does not find an invokable
- class (https://github.com/zendframework/zf2/issues/2707)
-- 2710: #2461 - correcting the url encoding of path segments
- (https://github.com/zendframework/zf2/issues/2710)
-- 2711: Fix/demos ProgressBar/ZendForm.php : Object of class Zend\Form\Form
- could not be converted to string
- (https://github.com/zendframework/zf2/issues/2711)
-- 2712: fix cs casting variable for (array)
- (https://github.com/zendframework/zf2/issues/2712)
-- 2713: Update library/Zend/Mvc/Service/ViewHelperManagerFactory.php
- (https://github.com/zendframework/zf2/issues/2713)
-- 2714: Don't add separator if not prefixing columns
- (https://github.com/zendframework/zf2/issues/2714)
-- 2717: Extends when it can : Validator\DateStep extends Validator\Date to
- reduce code redundancy (https://github.com/zendframework/zf2/issues/2717)
-- 2719: Fixing the Cache Storage Factory Adapter Factory
- (https://github.com/zendframework/zf2/issues/2719)
-- 2728: Bad Regex for Content Type header
- (https://github.com/zendframework/zf2/issues/2728)
-- 2731: Reset the Order part when resetting Select
- (https://github.com/zendframework/zf2/issues/2731)
-- 2732: Removed references to Mysqli in Zend\Db\Adapter\Driver\Pgsql
- (https://github.com/zendframework/zf2/issues/2732)
-- 2733: fix @package Zend_Validate should be Zend_Validator
- (https://github.com/zendframework/zf2/issues/2733)
-- 2734: fix i18n @package and @subpackage value
- (https://github.com/zendframework/zf2/issues/2734)
-- 2736: fix captcha helper test.
- (https://github.com/zendframework/zf2/issues/2736)
-- 2737: Issue #2728 - Bad Regex for Content Type header
- (https://github.com/zendframework/zf2/issues/2737)
-- 2738: fix link 'quickstart' to version 2.0
- (https://github.com/zendframework/zf2/issues/2738)
-- 2739: remove '@subpackage' because Zend\Math is not in subpackage
- (https://github.com/zendframework/zf2/issues/2739)
-- 2742: remove () in echo-ing (https://github.com/zendframework/zf2/issues/2742)
-- 2749: Fix for #2678 (Zend\Db's Sqlsrv Driver)
- (https://github.com/zendframework/zf2/issues/2749)
-- 2750: Adds the ability to instanciate by factory to AbstractPluginManager
- (https://github.com/zendframework/zf2/issues/2750)
-- 2754: add the support to register module paths over namespace
- (https://github.com/zendframework/zf2/issues/2754)
-- 2755: remove Zend\Mvc\Controller\PluginBroker from aliases in
- "$defaultServiceConfig" (https://github.com/zendframework/zf2/issues/2755)
-- 2759: Fix Zend\Code\Scanner\TokenArrayScanner
- (https://github.com/zendframework/zf2/issues/2759)
-- 2764: Fixed Zend\Math\Rand::getString() to pass the parameter $strong to
- ::getBytes() (https://github.com/zendframework/zf2/issues/2764)
-- 2765: Csrf: always use dedicated setter
- (https://github.com/zendframework/zf2/issues/2765)
-- 2766: Session\Storage: always preserve REQUEST_ACCESS_TIME
- (https://github.com/zendframework/zf2/issues/2766)
-- 2768: Zend\Validator dependency is missed in Zend\Cache composer.json
- (https://github.com/zendframework/zf2/issues/2768)
-- 2769: change valueToLDAP to valueToLdap and valueFromLDAP to valueFromLdap
- (https://github.com/zendframework/zf2/issues/2769)
-- 2770: Memcached (https://github.com/zendframework/zf2/issues/2770)
-- 2775: Zend\Db\Sql: Fix for Mysql quoting during limit and offset
- (https://github.com/zendframework/zf2/issues/2775)
-- 2776: Allow whitespace in Iban
- (https://github.com/zendframework/zf2/issues/2776)
-- 2777: Fix issue when PREG_BAD_UTF8_OFFSET_ERROR is defined but Unicode support
- is not enabled on PCRE (https://github.com/zendframework/zf2/issues/2777)
-- 2778: Undefined Index fix in ViewHelperManagerFactory
- (https://github.com/zendframework/zf2/issues/2778)
-- 2779: Allow forms that have been added as fieldsets to bind values to bound
- ob... (https://github.com/zendframework/zf2/issues/2779)
-- 2782: Issue 2781 (https://github.com/zendframework/zf2/issues/2782)
+- The initializer for ServiceManagerAwareInterface was removed to prevent
+ confusion between ServiceManagerAwareInterface and
+ ServiceLocatorAwareInterface, and to promote using the latter interface.
## 2.0.2:
@@ -20,7 +20,7 @@
* @category Zend
* @package Zend_Barcode
*/
-class Barcode
+abstract class Barcode
{
const OBJECT = 'OBJECT';
const RENDERER = 'RENDERER';
@@ -17,7 +17,7 @@
* @category Zend
* @package Zend_Cache
*/
-class PatternFactory
+abstract class PatternFactory
{
/**
* The pattern manager
@@ -18,7 +18,7 @@
* @package Zend_Cache
* @subpackage Storage
*/
-class StorageFactory
+abstract class StorageFactory
{
/**
* Plugin manager for loading adapters
@@ -68,6 +68,11 @@ class ClassGenerator extends AbstractGenerator
protected $methods = array();
/**
+ * @var array Array of string names
+ */
+ protected $uses = array();
+
+ /**
* fromReflection() - build a Code Generation Php Object from a Class Reflection
*
* @param ClassReflection $classReflection
@@ -480,6 +485,19 @@ public function addPropertyFromGenerator(PropertyGenerator $property)
}
/**
+ * Add a class to "use" classes
+ *
+ * @param string $useClass
+ */
+ public function addUse($use, $useAlias = null)
+ {
+ if (!empty($useAlias)) {
+ $use .= ' as ' . $useAlias;
+ }
+ $this->uses[] = $use;
+ }
+
+ /**
* getProperties()
*
* @return PropertyGenerator[]
@@ -506,6 +524,16 @@ public function getProperty($propertyName)
}
/**
+ * Returns the "use" classes
+ *
+ * @return array
+ */
+ public function getUses()
+ {
+ return $this->uses;
+ }
+
+ /**
* hasProperty()
*
* @param string $propertyName
@@ -664,6 +692,14 @@ public function generate()
$output .= 'namespace ' . $namespace . ';' . self::LINE_FEED . self::LINE_FEED;
}
+ $uses = $this->getUses();
+ if (!empty($uses)) {
+ foreach ($uses as $use) {
+ $output .= 'use ' . $use . ';' . self::LINE_FEED;
+ }
+ $output .= self::LINE_FEED;
+ }
+
if (null !== ($docBlock = $this->getDocBlock())) {
$docBlock->setIndentation('');
$output .= $docBlock->generate();
Oops, something went wrong.

0 comments on commit 2c48be7

Please sign in to comment.