Permalink
Browse files

Merge branch 'master' of git://github.com/zendframework/zf2 into hotf…

…ix/ZF2-270
  • Loading branch information...
2 parents 8745b74 + f30be2f commit 2fabb25afedc8b28a4c4819f35fed8736dca3df7 @cmple cmple committed May 3, 2012
Showing with 2,699 additions and 2,047 deletions.
  1. +5 −5 README-DEV.md
  2. +2 −2 README-GIT.md
  3. +1 −1 README.md
  4. +25 −0 composer.json
  5. +79 −55 documentation/manual/en/module_specs/Zend_EventManager-EventManager.xml
  6. +12 −12 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Attribute.xml
  7. +35 −35 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Dn.xml
  8. +27 −27 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Filter.xml
  9. +4 −9 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Ldif-Encoder.xml
  10. +40 −40 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node-RootDse.xml
  11. +49 −49 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node-Schema.xml
  12. +79 −79 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap-Node.xml
  13. +72 −103 documentation/manual/en/module_specs/Zend_Ldap-API-Ldap.xml
  14. +4 −7 documentation/manual/en/module_specs/Zend_Ldap-API.xml
  15. +23 −29 documentation/manual/en/module_specs/Zend_Ldap-Introduction.xml
  16. +2 −5 documentation/manual/en/module_specs/Zend_Ldap-LDIF.xml
  17. +3 −26 documentation/manual/en/module_specs/Zend_Ldap-Node.xml
  18. +3 −10 documentation/manual/en/module_specs/Zend_Ldap-Server.xml
  19. +22 −22 documentation/manual/en/module_specs/Zend_Ldap-Tools.xml
  20. +16 −16 documentation/manual/en/module_specs/Zend_Ldap-Usage.xml
  21. +1 −1 documentation/manual/en/module_specs/Zend_Mvc-Examples.xml
  22. +1 −1 documentation/manual/en/module_specs/Zend_View-Helpers-HeadLink.xml
  23. +1 −1 documentation/manual/en/module_specs/zend.view.quick-start.xml
  24. +3 −3 library/Zend/Authentication/{Adapter.php → Adapter/AdapterInterface.php}
  25. +3 −3 library/Zend/Authentication/Adapter/DbTable.php
  26. +2 −4 library/Zend/Authentication/Adapter/Digest.php
  27. +4 −4 library/Zend/Authentication/Adapter/{Exception.php → Exception/ExceptionInterface.php}
  28. +1 −1 library/Zend/Authentication/Adapter/Exception/InvalidArgumentException.php
  29. +1 −1 library/Zend/Authentication/Adapter/Exception/RuntimeException.php
  30. +1 −1 library/Zend/Authentication/Adapter/Exception/UnexpectedValueException.php
  31. +9 −11 library/Zend/Authentication/Adapter/Http.php
  32. +4 −4 library/Zend/Authentication/Adapter/Http/{Exception.php → Exception/ExceptionInterface.php}
  33. +9 −0 library/Zend/Authentication/Adapter/Http/Exception/InvalidArgumentException.php
  34. +9 −0 library/Zend/Authentication/Adapter/Http/Exception/RuntimeException.php
  35. +9 −11 library/Zend/Authentication/Adapter/Http/FileResolver.php
  36. +0 −9 library/Zend/Authentication/Adapter/Http/InvalidArgumentException.php
  37. +1 −1 library/Zend/Authentication/Adapter/Http/{Resolver.php → ResolverInterface.php}
  38. +0 −9 library/Zend/Authentication/Adapter/Http/RuntimeException.php
  39. +1 −4 library/Zend/Authentication/Adapter/InfoCard.php
  40. +2 −2 library/Zend/Authentication/Adapter/Ldap.php
  41. +53 −13 library/Zend/Authentication/AuthenticationService.php
  42. +4 −2 library/Zend/Authentication/{Exception.php → Exception/ExceptionInterface.php}
  43. +37 −0 library/Zend/Authentication/Exception/RuntimeException.php
  44. +19 −16 library/Zend/Authentication/Storage/Session.php
  45. +6 −6 library/Zend/Authentication/{Storage.php → Storage/StorageInterface.php}
  46. +5 −5 library/Zend/Barcode/Barcode.php
  47. +3 −2 library/Zend/Barcode/{Exception.php → Exception/ExceptionInterface.php}
  48. +1 −3 library/Zend/Barcode/Exception/InvalidArgumentException.php
  49. +1 −3 library/Zend/Barcode/Exception/RendererCreationException.php
  50. +33 −34 library/Zend/Barcode/Object/AbstractObject.php
  51. +1 −2 library/Zend/Barcode/Object/Ean8.php
  52. +1 −3 library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
  53. +5 −3 library/Zend/Barcode/Object/{Exception.php → Exception/ExceptionInterface.php}
  54. +1 −1 library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
  55. +1 −3 library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
  56. +1 −3 library/Zend/Barcode/Object/Exception/OutOfRangeException.php
  57. +1 −3 library/Zend/Barcode/Object/Exception/RuntimeException.php
  58. +21 −20 library/Zend/Barcode/{Object.php → Object/ObjectInterface.php}
  59. +1 −2 library/Zend/Barcode/Object/Upce.php
  60. +6 −7 library/Zend/Barcode/Renderer/AbstractRenderer.php
  61. +3 −3 library/Zend/Barcode/Renderer/{Exception.php → Exception/ExceptionInterface.php}
  62. +1 −3 library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
  63. +1 −3 library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
  64. +1 −3 library/Zend/Barcode/Renderer/Exception/RuntimeException.php
  65. +1 −3 library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
  66. +7 −13 library/Zend/Barcode/Renderer/Pdf.php
  67. +5 −4 library/Zend/Barcode/{Renderer.php → Renderer/RendererInterface.php}
  68. +1 −3 library/Zend/Cache/Exception/BadMethodCallException.php
  69. +4 −2 library/Zend/Cache/{Exception.php → Exception/ExceptionInterface.php}
  70. +1 −3 library/Zend/Cache/Exception/ExtensionNotLoadedException.php
  71. +1 −3 library/Zend/Cache/Exception/InvalidArgumentException.php
  72. +1 −3 library/Zend/Cache/Exception/LogicException.php
  73. +1 −3 library/Zend/Cache/Exception/OutOfCapacityException.php
  74. +1 −3 library/Zend/Cache/Exception/RuntimeException.php
  75. +1 −3 library/Zend/Cache/Exception/UnexpectedValueException.php
  76. +1 −3 library/Zend/Cache/Exception/UnsupportedMethodCallException.php
  77. +1 −2 library/Zend/Cache/Pattern/AbstractPattern.php
  78. +1 −1 library/Zend/Cache/Pattern/CallbackCache.php
  79. +1 −1 library/Zend/Cache/Pattern/CaptureCache.php
  80. +3 −3 library/Zend/Cache/Pattern/OutputCache.php
  81. +6 −4 library/Zend/Cache/{Pattern.php → Pattern/PatternInterface.php}
  82. +2 −2 library/Zend/Cache/Pattern/PatternOptions.php
  83. +4 −2 library/Zend/Cache/PatternBroker.php
  84. +3 −3 library/Zend/Cache/PatternFactory.php
  85. +103 −100 library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
  86. +8 −8 library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
  87. +34 −34 library/Zend/Cache/Storage/{Adapter.php → Adapter/AdapterInterface.php}
  88. +2 −3 library/Zend/Cache/Storage/Adapter/AdapterOptions.php
  89. +21 −21 library/Zend/Cache/Storage/Adapter/Apc.php
  90. +30 −30 library/Zend/Cache/Storage/Adapter/Filesystem.php
  91. +20 −20 library/Zend/Cache/Storage/Adapter/Memcached.php
  92. +20 −20 library/Zend/Cache/Storage/Adapter/Memory.php
  93. +15 −15 library/Zend/Cache/Storage/Adapter/WinCache.php
  94. +2 −2 library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
  95. +2 −2 library/Zend/Cache/Storage/Adapter/ZendServerShm.php
  96. +5 −3 library/Zend/Cache/Storage/AdapterBroker.php
  97. +4 −4 library/Zend/Cache/Storage/Event.php
  98. +1 −1 library/Zend/Cache/Storage/ExceptionEvent.php
  99. +1 −3 library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
  100. +1 −1 library/Zend/Cache/Storage/Plugin/ClearByFactor.php
  101. +1 −2 library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
  102. +5 −4 library/Zend/Cache/Storage/{Plugin.php → Plugin/PluginInterface.php}
  103. +2 −2 library/Zend/Cache/Storage/PluginBroker.php
  104. +1 −1 library/Zend/Cache/Storage/PostEvent.php
  105. +4 −4 library/Zend/Cache/StorageFactory.php
  106. +62 −1 library/Zend/Cache/Utils.php
  107. +1 −1 library/Zend/Currency/Currency.php
  108. +2 −2 library/Zend/Date/Date.php
  109. +1 −1 library/Zend/Date/DateObject.php
  110. +1 −1 library/Zend/Db/Adapter/Driver/Pdo/Connection.php
  111. +2 −2 library/Zend/Db/TableGateway/MasterSlaveTableGateway.php
  112. +2 −1 library/Zend/Di/Definition/CompilerDefinition.php
  113. +1 −1 library/Zend/Di/Definition/RuntimeDefinition.php
  114. +1 −2 library/Zend/EventManager/Event.php
  115. +44 −38 library/Zend/EventManager/EventManager.php
  116. +42 −0 library/Zend/EventManager/EventManagerAware.php
  117. +14 −13 library/Zend/EventManager/ProvidesEvents.php
  118. +2 −2 library/Zend/EventManager/{StaticEventCollection.php → SharedEventCollection.php}
  119. +42 −0 library/Zend/EventManager/SharedEventCollectionAware.php
  120. +149 −0 library/Zend/EventManager/SharedEventManager.php
  121. +1 −112 library/Zend/EventManager/StaticEventManager.php
  122. +1 −1 library/Zend/Feed/Reader/Reader.php
  123. +2 −0 library/Zend/Filter/FilterChain.php
  124. +12 −2 library/Zend/Http/Client.php
  125. +19 −23 library/Zend/Ldap/Attribute.php
  126. +14 −12 library/Zend/Ldap/Collection/DefaultIterator.php
  127. +7 −5 library/Zend/Ldap/Dn.php
  128. +1 −3 library/Zend/Ldap/Exception/BadMethodCallException.php
  129. +2 −2 library/Zend/Ldap/{Exception.php → Exception/ExceptionInterface.php}
  130. +1 −3 library/Zend/Ldap/Exception/InvalidArgumentException.php
  131. +5 −6 library/Zend/Ldap/Exception/LdapException.php
  132. +3 −3 library/Zend/Ldap/Filter/{Exception.php → Exception/ExceptionInterface.php}
  133. +1 −3 library/Zend/Ldap/Filter/Exception/FilterException.php
  134. +1 −0 library/Zend/Ldap/Filter/LogicalFilter.php
  135. +12 −11 library/Zend/Ldap/Ldap.php
  136. +2 −2 library/Zend/Ldap/Ldif/Encoder.php
  137. +3 −10 library/Zend/Ldap/Node.php
  138. +26 −29 library/Zend/Ldap/Node/AbstractNode.php
  139. +6 −8 library/Zend/Ldap/Node/ChildrenIterator.php
  140. +1 −1 library/Zend/Ldap/Node/Collection.php
  141. +4 −5 library/Zend/Ldap/Node/RootDse.php
  142. +1 −1 library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
  143. +6 −7 library/Zend/Ldap/Node/Schema.php
  144. +4 −6 library/Zend/Ldap/Node/Schema/AbstractItem.php
  145. +4 −4 library/Zend/Ldap/Node/Schema/ActiveDirectory.php
  146. +1 −1 library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
  147. +3 −3 library/Zend/Ldap/Node/Schema/{AttributeType.php → AttributeType/AttributeTypeInterface.php}
  148. +5 −4 library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
  149. +1 −1 library/Zend/Ldap/Node/Schema/ObjectClass/ActiveDirectory.php
  150. +3 −3 library/Zend/Ldap/Node/Schema/{ObjectClass.php → ObjectClass/ObjectClassInterface.php}
  151. +1 −1 library/Zend/Ldap/Node/Schema/ObjectClass/OpenLdap.php
  152. +3 −3 library/Zend/Ldap/Node/Schema/OpenLdap.php
  153. +1 −1 library/Zend/Locale/Data/AbstractLocale.php
  154. +1 −1 library/Zend/Locale/Data/Cldr.php
  155. +1 −1 library/Zend/Locale/Format.php
  156. +1 −1 library/Zend/Locale/Locale.php
  157. +3 −0 library/Zend/Mail/Transport/Sendmail.php
  158. +1 −0 library/Zend/Mail/Transport/SmtpOptions.php
  159. +1 −1 library/Zend/Memory/MemoryManager.php
  160. +2 −2 library/Zend/Mime/{Exception.php → Exception/ExceptionInterface.php}
  161. +4 −3 library/Zend/Mime/Exception/RuntimeException.php
  162. +1 −3 library/Zend/Mime/Part.php
  163. +2 −1 library/Zend/Module/Manager.php
  164. +2 −10 library/Zend/Module/ModuleHandler.php
  165. +2 −10 library/Zend/Mvc/AppContext.php
  166. +3 −2 library/Zend/Mvc/Application.php
  167. +32 −13 library/Zend/Mvc/Bootstrap.php
  168. +9 −7 library/Zend/Mvc/Controller/ActionController.php
  169. +15 −0 library/Zend/Mvc/Controller/Plugin/Forward.php
  170. +9 −7 library/Zend/Mvc/Controller/RestfulController.php
  171. +1 −1 library/Zend/Paginator/Paginator.php
  172. +1 −1 library/Zend/Service/SlideShare/SlideShare.php
  173. +4 −7 library/Zend/Session/SaveHandler/Cache.php
  174. +1 −1 library/Zend/Stdlib/SplStack.php
  175. +1 −1 library/Zend/Translator/Adapter/AbstractAdapter.php
  176. +1 −1 library/Zend/Translator/Translator.php
  177. +2 −2 library/Zend/Uri/{Exception.php → Exception/ExceptionInterface.php}
  178. +1 −1 library/Zend/Uri/Exception/InvalidArgumentException.php
  179. +1 −1 library/Zend/Uri/Exception/InvalidUriException.php
  180. +1 −1 library/Zend/Uri/Exception/InvalidUriPartException.php
  181. +1 −1 library/Zend/Uri/Exception/InvalidUriTypeException.php
  182. +3 −3 library/Zend/Uri/UriFactory.php
  183. +1 −1 library/Zend/View/Model/ViewModel.php
  184. +45 −7 library/Zend/View/Renderer/JsonRenderer.php
  185. +2 −1 library/Zend/View/View.php
  186. +1 −1 library/Zend/XmlRpc/Client.php
  187. +3 −3 library/Zend/XmlRpc/Client/{Exception.php → Exception/ExceptionInterface.php}
  188. +1 −1 library/Zend/XmlRpc/Client/Exception/FaultException.php
  189. +1 −1 library/Zend/XmlRpc/Client/Exception/IntrospectException.php
  190. +1 −1 library/Zend/XmlRpc/Client/Exception/InvalidArgumentException.php
  191. +1 −1 library/Zend/XmlRpc/Client/Exception/RuntimeException.php
  192. +2 −2 library/Zend/XmlRpc/{Exception.php → Exception/ExceptionInterface.php}
  193. +1 −1 library/Zend/XmlRpc/Exception/InvalidArgumentException.php
  194. +1 −1 library/Zend/XmlRpc/Exception/RuntimeException.php
  195. +2 −2 library/Zend/XmlRpc/Exception/ValueException.php
  196. +6 −6 library/Zend/XmlRpc/Fault.php
  197. +5 −7 library/Zend/XmlRpc/Generator/AbstractGenerator.php
  198. +2 −2 library/Zend/XmlRpc/{Generator.php → Generator/GeneratorInterface.php}
  199. +1 −1 library/Zend/XmlRpc/Generator/XmlWriter.php
  200. +1 −1 library/Zend/XmlRpc/Server/Exception/BadMethodCallException.php
  201. +3 −3 library/Zend/XmlRpc/Server/{Exception.php → Exception/ExceptionInterface.php}
  202. +1 −1 library/Zend/XmlRpc/Server/Exception/InvalidArgumentException.php
  203. +1 −1 library/Zend/XmlRpc/Server/Exception/RuntimeException.php
  204. +6 −6 library/Zend/XmlRpc/Server/Fault.php
  205. +3 −3 library/Zend/XmlRpc/Value.php
  206. +1 −1 library/Zend/XmlRpc/Value/DateTime.php
  207. +1 −1 library/Zend/XmlRpc/Value/Integer.php
  208. +127 −127 tests/TestConfiguration.php.dist
  209. +127 −128 tests/TravisTestConfiguration.php
  210. +2 −2 tests/Zend/Authentication/Adapter/DigestTest.php
  211. +9 −9 tests/Zend/Authentication/Adapter/Http/FileResolverTest.php
  212. +7 −7 tests/Zend/Authentication/Adapter/Http/ObjectTest.php
  213. +24 −4 tests/Zend/Authentication/AuthenticationServiceTest.php
  214. +1 −1 tests/Zend/Authentication/TestAsset/SuccessAdapter.php
  215. +9 −9 tests/Zend/Barcode/FactoryTest.php
  216. +3 −3 tests/Zend/Barcode/Object/Code25Test.php
  217. +3 −3 tests/Zend/Barcode/Object/Code25interleavedTest.php
  218. +3 −3 tests/Zend/Barcode/Object/Code39Test.php
  219. +1 −1 tests/Zend/Barcode/Object/Ean13Test.php
  220. +1 −1 tests/Zend/Barcode/Object/Ean8Test.php
  221. +1 −1 tests/Zend/Barcode/Object/IdentcodeTest.php
  222. +3 −3 tests/Zend/Barcode/Object/Itf14Test.php
  223. +1 −1 tests/Zend/Barcode/Object/LeitcodeTest.php
  224. +2 −2 tests/Zend/Barcode/Object/PlanetTest.php
  225. +2 −2 tests/Zend/Barcode/Object/PostnetTest.php
  226. +1 −1 tests/Zend/Barcode/Object/RoyalmailTest.php
  227. +14 −14 tests/Zend/Barcode/Object/TestCommon.php
  228. +1 −1 tests/Zend/Barcode/Object/UpcaTest.php
  229. +1 −1 tests/Zend/Barcode/Object/UpceTest.php
  230. +10 −10 tests/Zend/Barcode/Renderer/ImageTest.php
  231. +1 −1 tests/Zend/Barcode/Renderer/PdfTest.php
  232. +3 −3 tests/Zend/Barcode/Renderer/SvgTest.php
  233. +9 −9 tests/Zend/Barcode/Renderer/TestCommon.php
  234. +1 −1 tests/Zend/Cache/Pattern/CallbackCacheTest.php
  235. +1 −1 tests/Zend/Cache/Pattern/ClassCacheTest.php
  236. +1 −1 tests/Zend/Cache/Pattern/CommonPatternTest.php
  237. +1 −1 tests/Zend/Cache/Pattern/ObjectCacheTest.php
  238. +1 −1 tests/Zend/Cache/Pattern/OutputCacheTest.php
  239. +242 −0 tests/Zend/Cache/Storage/Adapter/AbstractAdapterTest.php
  240. +1 −1 tests/Zend/Cache/Storage/Adapter/AbstractZendServerTest.php
  241. +18 −17 tests/Zend/Cache/Storage/Adapter/CommonAdapterTest.php
  242. +1 −1 tests/Zend/Cache/Storage/Adapter/FilesystemTest.php
  243. +1 −1 tests/Zend/Cache/Storage/Plugin/CommonPluginTest.php
  244. +1 −1 tests/Zend/Currency/CurrencyTest.php
  245. +1 −1 tests/Zend/Date/DateObjectTest.php
  246. +1 −1 tests/Zend/Date/DateTest.php
  247. +24 −0 tests/Zend/Di/Definition/CompilerDefinitionTest.php
  248. +3 −0 tests/Zend/EventManager/EventManagerTest.php
  249. +5 −2 tests/Zend/EventManager/StaticEventManagerTest.php
  250. +16 −8 tests/Zend/EventManager/StaticIntegrationTest.php
  251. +2 −2 tests/Zend/EventManager/TestAsset/StaticEventsMock.php
  252. +11 −0 tests/Zend/Filter/FilterChainTest.php
  253. +6 −5 tests/Zend/Ldap/CanonTest.php
  254. +5 −4 tests/Zend/Ldap/Dn/CreationTest.php
  255. +1 −1 tests/Zend/Ldap/Dn/ExplodingTest.php
  256. +2 −2 tests/Zend/Ldap/Dn/ImplodingTest.php
  257. +11 −10 tests/Zend/Ldap/Dn/ModificationTest.php
  258. +5 −5 tests/Zend/Ldap/Node/OfflineTest.php
  259. +10 −9 tests/Zend/Ldap/Node/OnlineTest.php
  260. +1 −1 tests/Zend/Locale/Data/CldrCachedTest.php
  261. +1 −1 tests/Zend/Locale/Data/CldrTest.php
  262. +1 −1 tests/Zend/Locale/LocaleTest.php
  263. +2 −2 tests/Zend/Mail/Storage/MessageTest.php
  264. +1 −1 tests/Zend/Measure/CommonTestCase.php
  265. +1 −1 tests/Zend/Memory/AccessControllerTest.php
  266. +1 −1 tests/Zend/Memory/MemoryManagerTest.php
  267. +3 −3 tests/Zend/Mime/MimeTest.php
  268. +12 −14 tests/Zend/Mvc/ApplicationTest.php
  269. +7 −6 tests/Zend/Mvc/Controller/ActionControllerTest.php
  270. +10 −0 tests/Zend/Mvc/Controller/Plugin/ForwardTest.php
  271. +7 −6 tests/Zend/Mvc/Controller/RestfulControllerTest.php
  272. +5 −0 tests/Zend/Mvc/Controller/TestAsset/SampleController.php
  273. +1 −1 tests/Zend/Paginator/PaginatorTest.php
  274. +1 −1 tests/Zend/Service/SlideShare/SlideShareTest.php
  275. +1 −1 tests/Zend/Session/SaveHandler/CacheTest.php
  276. +1 −1 tests/Zend/Translator/Adapter/ArrayTest.php
  277. +1 −1 tests/Zend/Translator/TranslatorTest.php
  278. +1 −1 tests/Zend/View/Helper/CurrencyTest.php
  279. +2 −2 tests/Zend/View/Helper/Navigation/SitemapTest.php
  280. +70 −0 tests/Zend/View/Renderer/JsonRendererTest.php
  281. +1 −2 tests/Zend/XmlRpc/FaultTest.php
  282. +1 −1 tests/Zend/XmlRpc/GeneratorTest.php
  283. +5 −5 tests/Zend/XmlRpc/ServerTest.php
  284. +1 −1 tests/Zend/XmlRpc/ValueTest.php
View
@@ -8,20 +8,20 @@ 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/manual/en/coding-standard.html
+ http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
- ZF Git Guide:
- README-GIT.md
+ [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.dev on Freenode.net
+ #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 proposals
-page, http://framework.zend.com/wiki/display/ZFPROP/Home.
+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
View
@@ -194,9 +194,9 @@ repository, we suggest doing some cleanup of these branches.
RSS feeds may be found at:
-https://github.com/zendframework/zf2/commits/<branch>.atom
+`https://github.com/zendframework/zf2/commits/<branch>.atom`
-where <branch> is a branch in the repository.
+where &lt;branch&gt; is a branch in the repository.
To subscribe to git email notifications, send an email to:
View
@@ -28,7 +28,7 @@ prepare for Release Candidate status.
```php
$xml = new Zend\Config\Reader\Xml();
- $config = new Zend\Config\Config($xml->fromFile($filename);
+ $config = new Zend\Config\Config($xml->fromFile($filename));
```
or:
View
@@ -0,0 +1,25 @@
+{
+ "name": "zendframework/zendframework",
+ "description": "Zend Framework 2",
+ "type": "library",
+ "keywords": [
+ "framework"
+ ],
+ "homepage": "http://framework.zend.com/",
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "autoload": {
+ "psr-0": {
+ "Zend": "library/"
+ }
+ },
+ "config": {
+ "bin-dir": "bin"
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0-dev"
+ }
+ }
+}
@@ -32,9 +32,9 @@
</itemizedlist>
<para>
- The basic architecture allows you to attach and detach listeners to named events, both on
- a per-instance basis as well as statically; trigger events; and interrupt execution of
- listeners.
+ The basic architecture allows you to attach and detach listeners to named events, both
+ on a per-instance basis as well as via shared collections; trigger events; and interrupt
+ execution of listeners.
</para>
</section>
@@ -47,18 +47,27 @@
<programlisting language="php"><![CDATA[
use Zend\EventManager\EventCollection,
- Zend\EventManager\EventManager;
+use Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerAware;
-class Foo
+class Foo implements EventManagerAware
{
protected $events;
- public function events(EventCollection $events = null)
+ public function setEventManager(EventCollection $events)
+ {
+ $events->setIdentifiers(array(
+ __CLASS__,
+ get_called_class(),
+ ));
+ $this->events = $events;
+ return $this;
+ }
+
+ public function events()
{
- if (null !== $events) {
- $this->events = $events;
- } elseif (null === $this->events) {
- $this->events = new EventManager(__CLASS__);
+ if (null === $this->events) {
+ $this->setEventManager(new EventManager());
}
return $this->events;
}
@@ -133,23 +142,30 @@ $foo->bar('baz', 'bat');
<para>
Sometimes you may want to specify listeners without yet having an object instance of the
- class composing an <classname>EventManager</classname>. The
- <classname>StaticEventManager</classname> allows you to do this. The call to
+ class composing an <classname>EventManager</classname>. Zend Framework enables this
+ through the concept of a <interfacename>SharedEventCollection</interfacename>. Simply
+ put, you can inject individual <classname>EventManager</classname> instances with a
+ well-known <interfacename>SharedEventCollection</interfacename>, and the
+ <classname>EventManager</classname> instance will query it for additional listeners.
+ Listeners attach to a <interfacename>SharedEventCollection</interfacename> in roughly
+ the same way the do normal event managers; the call to
<methodname>attach</methodname> is identical to the <classname>EventManager</classname>,
but expects an additional parameter at the beginning: a named instance. Remember the
example of composing an <classname>EventManager</classname>, how we passed it
<constant>__CLASS__</constant>? That value, or any strings you provide in an array to
- the constructor, may be used to identify an instance when using the
- <classname>StaticEventManager</classname>. As an example, we could change the above
- example to attach statically:
+ the constructor, may be used to identify an instance when using a
+ <interfacename>SharedEventCollection</interfacename>. As an example, assuming we have a
+ <classname>SharedEventManager</classname> instance that we know has been injected in our
+ <classname>EventManager</classname> instances (for instance, via dependency injection),
+ we could change the above example to attach via the shared collection:
</para>
<programlisting language="php"><![CDATA[
-use Zend\EventManager\StaticEventManager,
- Zend\Log\Factory as LogFactory;
+use Zend\Log\Factory as LogFactory;
+
+// Assume $events is a Zend\EventManager\SharedEventManager instance
$log = LogFactory($someConfig);
-$events = StaticEventManager::getInstance();
$events->attach('Foo', 'bar', function ($e) use ($log) {
$event = $e->getName();
$target = get_class($e->getTarget());
@@ -165,13 +181,33 @@ $events->attach('Foo', 'bar', function ($e) use ($log) {
// Later, instantiate Foo:
$foo = new Foo();
+$foo->events()->setSharedEventCollection($events);
// And we can still trigger the above event:
$foo->bar('baz', 'bat');
// results in log message:
// bar called on Foo, using params {"baz" : "baz", "bat" : "bat"}"
]]></programlisting>
+ <note>
+ <info><title>StaticEventManager</title></info>
+
+ <para>
+ As of 2.0.0beta3, you can use the <classname>StaticEventManager</classname>
+ singleton as a <interfacename>SharedEventCollection</interfacename>. As such, you do
+ not need to worry about where and how to get access to the
+ <interfacename>SharedEventCollection</interfacename>; it's globally available by
+ simply calling <code>StaticEventManager::getInstance()</code>.
+ </para>
+
+ <para>
+ Be aware, however, that its usage is deprecated within the framework, and starting
+ with 2.0.0beta4, you will instead configure a
+ <classname>SharedEventManager</classname> instance that will be injected by the
+ framework into individual <classname>EventManager</classname> instances.
+ </para>
+ </note>
+
<para>
The <classname>EventManager</classname> also provides the ability to detach listeners,
short-circuit execution of an event either from within a listener or by testing return
@@ -184,8 +220,8 @@ $foo->bar('baz', 'bat');
<para>
Sometimes you'll want to attach the same listener to many events or to all events of
- a given instance -- or potentially, with the static manager, many contexts, and many
- events. The <classname>EventManager</classname> component allows for this.
+ a given instance -- or potentially, with a shared event collection, many contexts,
+ and many events. The <classname>EventManager</classname> component allows for this.
</para>
<example xml:id="zend.event-manager.event-manager.quick-start.wildcard.many">
@@ -221,11 +257,11 @@ $events->attach('*', $callback);
</para>
</example>
- <example xml:id="zend.event-manager.event-manager.quick-start.wildcard.static-many">
- <title>Attaching to many events at once via the StaticEventManager</title>
+ <example xml:id="zend.event-manager.event-manager.quick-start.wildcard.shared-many">
+ <title>Attaching to many events at once via a SharedEventManager</title>
<programlisting language="php"><![CDATA[
-$events = StaticEventManager::getInstance();
+$events = new SharedEventManager();
// Attach to many events on the context "foo"
$events->attach('foo', array('these', 'are', 'event', 'names'), $callback);
@@ -239,11 +275,11 @@ $events->attach(array('foo', 'bar'), array('these', 'are', 'event', 'names'), $c
</para>
</example>
- <example xml:id="zend.event-manager.event-manager.quick-start.wildcard.static-wildcard">
- <title>Attaching to many events at once via the StaticEventManager</title>
+ <example xml:id="zend.event-manager.event-manager.quick-start.wildcard.shared-wildcard">
+ <title>Attaching to many events at once via a SharedEventManager</title>
<programlisting language="php"><![CDATA[
-$events = StaticEventManager::getInstance();
+$events = new SharedEventManager();
// Attach to all events on the context "foo"
$events->attach('foo', '*', $callback);
@@ -277,7 +313,7 @@ $events->attach(array('foo', 'bar'), '*', $callback);
<para>
A string or array of strings to which the given
<classname>EventManager</classname> instance can answer when accessed via
- the <classname>StaticEventManager</classname>.
+ a <interfacename>SharedEventManager</interfacename>.
</para>
</listitem>
</varlistentry>
@@ -294,16 +330,12 @@ $events->attach(array('foo', 'bar'), '*', $callback);
</varlistentry>
<varlistentry>
- <term>static_connections</term>
+ <term>shared_collections</term>
<listitem>
<para>
- An instance of a <interfacename>StaticEventCollection</interfacename>
- instance to use when triggering events. By default, this will use
- the global <classname>StaticEventManager</classname> instance, but that can
- be overridden by passing a value to this method. A <constant>null</constant>
- value will prevent the instance from triggering any further statically
- attached listeners.
+ An instance of a <interfacename>SharedEventCollection</interfacename>
+ instance to use when triggering events.
</para>
</listitem>
</varlistentry>
@@ -325,7 +357,7 @@ $events->attach(array('foo', 'bar'), '*', $callback);
</methodsynopsis>
<para>
Constructs a new <classname>EventManager</classname> instance, using the
- given identifier, if provided, for purposes of static attachment.
+ given identifier, if provided, for purposes of shared collections.
</para>
</listitem>
</varlistentry>
@@ -346,42 +378,34 @@ $events->attach(array('foo', 'bar'), '*', $callback);
</listitem>
</varlistentry>
- <varlistentry xml:id="zend.event-manager.event-manager.methods.set-static-connections">
- <term>setStaticConnections</term>
+ <varlistentry xml:id="zend.event-manager.event-manager.methods.set-shared-collections">
+ <term>setSharedCollections</term>
<listitem>
<methodsynopsis>
- <methodname>setStaticConnections</methodname>
+ <methodname>setSharedCollections</methodname>
<methodparam>
- <funcparams>StaticEventCollection $connections = null</funcparams>
+ <funcparams>SharedEventCollection $collections = null</funcparams>
</methodparam>
</methodsynopsis>
<para>
- An instance of a <interfacename>StaticEventCollection</interfacename>
- instance to use when triggering events. By default, this will use
- the global <classname>StaticEventManager</classname> instance, but that can
- be overridden by passing a value to this method. A <constant>null</constant>
- value will prevent the instance from triggering any further statically
- attached listeners.
+ An instance of a <interfacename>SharedEventCollection</interfacename>
+ instance to use when triggering events.
</para>
</listitem>
</varlistentry>
- <varlistentry xml:id="zend.event-manager.event-manager.methods.get-static-connections">
- <term>getStaticConnections</term>
+ <varlistentry xml:id="zend.event-manager.event-manager.methods.get-shared-collections">
+ <term>getSharedCollections</term>
<listitem>
<methodsynopsis>
- <methodname>getStaticConnections</methodname>
+ <methodname>getSharedCollections</methodname>
<void/>
</methodsynopsis>
<para>
Returns the currently attached
- <interfacename>StaticEventCollection</interfacename> instance, lazily
- retrieving the global <classname>StaticEventManager</classname> instance if
- none is attached and usage of static listeners hasn't been disabled by
- passing a <constant>null</constant> value to <link
- linkend="zend.event-manager.event-manager.methods.set-static-connections">setStaticConnections()</link>.
- Returns either a boolean <constant>false</constant> if static listeners are
- disabled, or a <interfacename>StaticEventCollection</interfacename> instance
+ <interfacename>SharedEventCollection</interfacename> instance.
+ Returns either a <constant>null</constant> if no collection is attached,
+ or a <interfacename>SharedEventCollection</interfacename> instance
otherwise.
</para>
</listitem>
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="zend.ldap.api.reference.zend-ldap-attribute"><title>Zend_Ldap_Attribute</title>
-
+<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="zend.ldap.api.reference.zend-ldap-attribute"><title>Zend\Ldap\Attribute</title>
+
<para>
- <classname>Zend_Ldap_Attribute</classname> is a helper class providing only static
+ <classname>Zend\Ldap\Attribute</classname> is a helper class providing only static
methods to manipulate arrays suitable to the structure used in
- <classname>Zend_Ldap</classname> data modification methods and to the data format required
+ <classname>Zend\Ldap\Ldap</classname> data modification methods and to the data format required
by the <acronym>LDAP</acronym> server. <acronym>PHP</acronym> data types are converted the
following way:
</para>
@@ -69,8 +69,8 @@
</varlistentry>
</variablelist>
- <table xml:id="zend.ldap.api.reference.zend-ldap-attribute.table"><title>Zend_Ldap_Attribute API</title>
-
+ <table xml:id="zend.ldap.api.reference.zend-ldap-attribute.table"><title>Zend\Ldap\Attribute API</title>
+
<tgroup cols="2">
<thead>
@@ -223,8 +223,8 @@
<varname>$attribName</varname> defaults to <code>'userPassword'</code>
which is the standard password attribute. The password hash can be
specified with <varname>$hashType</varname>. The default value here is
- <constant>Zend_Ldap_Attribute::PASSWORD_HASH_MD5</constant> with
- <constant>Zend_Ldap_Attribute::PASSWORD_HASH_SHA</constant> as the other
+ <constant>Zend\Ldap\Attribute::PASSWORD_HASH_MD5</constant> with
+ <constant>Zend\Ldap\Attribute::PASSWORD_HASH_SHA</constant> as the other
possibilty.
</entry>
</row>
@@ -238,8 +238,8 @@
<entry>
Creates a <acronym>LDAP</acronym> password. The password hash can be
specified with <varname>$hashType</varname>. The default value here is
- <constant>Zend_Ldap_Attribute::PASSWORD_HASH_MD5</constant> with
- <constant>Zend_Ldap_Attribute::PASSWORD_HASH_SHA</constant> as the other
+ <constant>Zend\Ldap\Attribute::PASSWORD_HASH_MD5</constant> with
+ <constant>Zend\Ldap\Attribute::PASSWORD_HASH_SHA</constant> as the other
possibilty.
</entry>
</row>
@@ -258,7 +258,7 @@
(<constant>FALSE</constant> by default) <varname>$value</varname> will be
appended to the attribute. <varname>$value</varname> can be an integer value
or an array of integers. Date-time-conversion according to
- <methodname>Zend_Ldap_Attribute::convertToLdapDateTimeValue()</methodname>
+ <methodname>Zend\Ldap\Attribute::convertToLdapDateTimeValue()</methodname>
will take place.
</entry>
</row>
@@ -280,7 +280,7 @@
value at the given index will be returned. If the index is out of
bounds, <constant>NULL</constant> will be returned. Date-time-conversion
according to
- <methodname>Zend_Ldap_Attribute::convertFromLdapDateTimeValue()</methodname>
+ <methodname>Zend\Ldap\Attribute::convertFromLdapDateTimeValue()</methodname>
will take place.
</entry>
</row>
Oops, something went wrong.

0 comments on commit 2fabb25

Please sign in to comment.