Skip to content
This repository
Browse code

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...
commit f73a3f7607720750968c8fb57479b14ccf41081e 2 parents 6396493 + 98b6676
Jerry Saravia authored

Showing 761 changed files with 1,626 additions and 755 deletions. Show diff stats Hide diff stats

  1. +135 0 CHANGELOG.md
  2. +77 0 CONTRIBUTING.md
  3. +0 64 README-DEV.md
  4. +108 81 README-GIT.md
  5. +5 11 README.md
  6. +1 1  demos/Zend/ProgressBar/JsPush.php
  7. +0 1  demos/Zend/ProgressBar/ZendForm.php
  8. +1 1  library/Zend/Authentication/Adapter/Ldap.php
  9. +0 1  library/Zend/Authentication/Storage/Session.php
  10. +4 4 library/Zend/Barcode/Object/AbstractObject.php
  11. +0 1  library/Zend/Cache/Storage/Adapter/Apc.php
  12. +0 8 library/Zend/Cache/Storage/Adapter/Filesystem.php
  13. +1 2  library/Zend/Cache/Storage/Adapter/Memcached.php
  14. +0 1  library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
  15. +1 1  library/Zend/Cache/Storage/Capabilities.php
  16. +0 1  library/Zend/Cache/Storage/Plugin/Serializer.php
  17. +0 1  library/Zend/Captcha/Factory.php
  18. +0 1  library/Zend/Code/Reflection/ClassReflection.php
  19. +0 1  library/Zend/Code/Reflection/FileReflection.php
  20. +1 1  library/Zend/Console/Charset/Utf8Heavy.php
  21. +23 0 library/Zend/Console/Console.php
  22. +0 1  library/Zend/Console/Request.php
  23. +0 1  library/Zend/Crypt/Symmetric/SymmetricInterface.php
  24. +0 1  library/Zend/Db/Adapter/Driver/Pdo/Result.php
  25. +1 1  library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
  26. +1 1  library/Zend/Db/Metadata/Object/AbstractTableObject.php
  27. +0 1  library/Zend/Db/Metadata/Source/MysqlMetadata.php
  28. +0 1  library/Zend/Db/Metadata/Source/SqlServerMetadata.php
  29. +0 1  library/Zend/Db/Metadata/Source/SqliteMetadata.php
  30. +0 1  library/Zend/Db/Sql/ExpressionInterface.php
  31. +6 2 library/Zend/Db/Sql/Insert.php
  32. +11 3 library/Zend/Db/Sql/Select.php
  33. +2 2 library/Zend/Db/TableGateway/AbstractTableGateway.php
  34. +32 1 library/Zend/Debug/Debug.php
  35. +6 2 library/Zend/Debug/composer.json
  36. +0 1  library/Zend/EventManager/EventManager.php
  37. +0 1  library/Zend/Feed/Exception/ExceptionInterface.php
  38. +0 1  library/Zend/Feed/PubSubHubbub/HttpResponse.php
  39. +41 7 library/Zend/Feed/PubSubHubbub/PubSubHubbub.php
  40. +1 1  library/Zend/Feed/Reader/AbstractFeed.php
  41. +1 1  library/Zend/Feed/Writer/AbstractFeed.php
  42. +1 0  library/Zend/Feed/composer.json
  43. +1 1  library/Zend/File/Transfer/Adapter/AbstractAdapter.php
  44. +1 1  library/Zend/Filter/Encrypt/Openssl.php
  45. +21 0 library/Zend/Filter/FilterChain.php
  46. +18 0 library/Zend/Form/Element/Csrf.php
  47. +7 0 library/Zend/Form/Element/MultiCheckbox.php
  48. +7 0 library/Zend/Form/Element/Select.php
  49. +1 1  library/Zend/Form/Form.php
  50. +0 1  library/Zend/Form/View/Helper/FormCaptcha.php
  51. +1 1  library/Zend/Form/View/Helper/FormCollection.php
  52. +0 1  library/Zend/Form/View/Helper/FormLabel.php
  53. +8 7 library/Zend/Form/View/Helper/FormMultiCheckbox.php
  54. +6 2 library/Zend/Form/View/Helper/FormRow.php
  55. +2 1  library/Zend/Form/composer.json
  56. +1 1  library/Zend/Http/AbstractMessage.php
  57. +2 2 library/Zend/Http/Client.php
  58. +1 1  library/Zend/Http/Client/Adapter/Test.php
  59. +0 1  library/Zend/Http/Client/Cookies.php
  60. +1 1  library/Zend/Http/ClientStatic.php
  61. +2 2 library/Zend/Http/Cookies.php
  62. +0 1  library/Zend/Http/Header/AcceptEncoding.php
  63. +1 1  library/Zend/Http/PhpEnvironment/Response.php
  64. +0 2  library/Zend/I18n/Translator/Plural/Parser.php
  65. +5 4 library/Zend/I18n/Translator/Translator.php
  66. +7 1 library/Zend/I18n/Validator/Float.php
  67. +143 0 library/Zend/I18n/Validator/Float.php~
  68. +3 3 library/Zend/Json/Decoder.php
  69. +3 3 library/Zend/Json/Encoder.php
  70. +1 1  library/Zend/Json/Json.php
  71. +1 1  library/Zend/Json/Server/Server.php
  72. +0 1  library/Zend/Json/Server/Smd/Service.php
  73. +0 1  library/Zend/Loader/PluginClassLocator.php
  74. +1 1  library/Zend/Log/Formatter/Base.php
  75. +38 4 library/Zend/Log/Formatter/Xml.php
  76. +49 2 library/Zend/Log/Writer/AbstractWriter.php
  77. +1 7 library/Zend/Log/Writer/Stream.php
  78. +1 0  library/Zend/Log/composer.json
  79. +1 1  library/Zend/Mail/Protocol/Imap.php
  80. +0 1  library/Zend/Mail/Storage/Imap.php
  81. +0 1  library/Zend/Math/BigInteger/AdapterPluginManager.php
  82. +1 1  library/Zend/Math/Exception/DomainException.php
  83. +1 1  library/Zend/Math/Exception/ExceptionInterface.php
  84. +1 1  library/Zend/Math/Exception/RuntimeException.php
  85. +1 1  library/Zend/Math/Rand.php
  86. +0 1  library/Zend/Memory/MemoryManager.php
  87. +0 1  library/Zend/Mime/Exception/ExceptionInterface.php
  88. +1 1  library/Zend/ModuleManager/Listener/ConfigListener.php
  89. +4 0 library/Zend/ModuleManager/Listener/LocatorRegistrationListener.php
  90. +0 1  library/Zend/ModuleManager/Listener/ServiceListener.php
  91. +0 1  library/Zend/ModuleManager/ModuleManagerInterface.php
  92. +1 3 library/Zend/Mvc/Controller/AbstractController.php
  93. +0 1  library/Zend/Mvc/Controller/Plugin/PostRedirectGet.php
  94. +1 1  library/Zend/Mvc/MvcEvent.php
  95. +0 2  library/Zend/Mvc/Router/Console/SimpleRouteStack.php
  96. +1 1  library/Zend/Mvc/Router/Http/Segment.php
  97. +4 6 library/Zend/Mvc/Router/Http/TreeRouteStack.php
  98. +0 1  library/Zend/Mvc/Router/RouteStackInterface.php
  99. +0 1  library/Zend/Mvc/Service/ModuleManagerFactory.php
  100. +0 1  library/Zend/Mvc/Service/ViewFeedRendererFactory.php
  101. +3 1 library/Zend/Mvc/Service/ViewHelperManagerFactory.php
  102. +0 1  library/Zend/Mvc/Service/ViewJsonRendererFactory.php
  103. +0 1  library/Zend/Mvc/View/Console/CreateViewModelListener.php
  104. +0 1  library/Zend/Mvc/View/Console/DefaultRenderingStrategy.php
  105. +0 1  library/Zend/Mvc/View/Console/ExceptionStrategy.php
  106. +0 4 library/Zend/Mvc/View/Console/InjectViewModelListener.php
  107. +0 3  library/Zend/Mvc/View/Console/ViewManager.php
  108. +0 1  library/Zend/Mvc/View/Http/ViewManager.php
  109. +3 2 library/Zend/Paginator/Paginator.php
  110. +0 1  library/Zend/Paginator/ScrollingStylePluginManager.php
  111. +2 2 library/Zend/Permissions/Acl/Acl.php
  112. +1 1  library/Zend/Serializer/Adapter/AdapterInterface.php
  113. +1 1  library/Zend/Serializer/Adapter/AdapterOptions.php
  114. +1 1  library/Zend/Serializer/Adapter/Json.php
  115. +15 5 library/Zend/Server/Method/Parameter.php
  116. +3 1 library/Zend/ServiceManager/AbstractPluginManager.php
  117. +3 2 library/Zend/ServiceManager/Config.php
  118. +0 1  library/Zend/ServiceManager/Di/DiServiceInitializer.php
  119. +1 1  library/Zend/Session/AbstractManager.php
  120. +1 1  library/Zend/Session/Config/SessionConfig.php
  121. +1 1  library/Zend/Session/Config/StandardConfig.php
  122. +1 1  library/Zend/Session/Exception/BadMethodCallException.php
  123. +1 1  library/Zend/Session/Exception/ExceptionInterface.php
  124. +1 1  library/Zend/Session/Exception/InvalidArgumentException.php
  125. +1 1  library/Zend/Session/Exception/RuntimeException.php
  126. +1 1  library/Zend/Session/ManagerInterface.php
  127. +2 2 library/Zend/Session/SaveHandler/DbTableGateway.php
  128. +1 1  library/Zend/Session/SaveHandler/DbTableGatewayOptions.php
  129. +1 1  library/Zend/Session/SessionManager.php
  130. +1 1  library/Zend/Session/Storage/ArrayStorage.php
  131. +1 1  library/Zend/Session/Storage/StorageInterface.php
  132. +1 1  library/Zend/Session/Validator/HttpUserAgent.php
  133. +1 1  library/Zend/Session/ValidatorChain.php
  134. +3 3 library/Zend/Soap/AutoDiscover.php
  135. +1 1  library/Zend/Soap/Client.php
  136. +5 5 library/Zend/Soap/Server.php
  137. +0 1  library/Zend/Soap/Server/DocumentLiteralWrapper.php
  138. +0 2  library/Zend/Soap/Wsdl/ComplexTypeStrategy/DefaultComplexType.php
  139. +1 2  library/Zend/Stdlib/Hydrator/Reflection.php
  140. +1 51 library/Zend/Tag/Cloud/Decorator/AbstractCloud.php
  141. +190 0 library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
  142. +1 51 library/Zend/Tag/Cloud/Decorator/AbstractTag.php
  143. +1 45 library/Zend/Tag/Cloud/Decorator/HtmlCloud.php
  144. +4 47 library/Zend/Tag/Cloud/Decorator/HtmlTag.php
  145. +0 1  library/Zend/Tag/Cloud/DecoratorPluginManager.php
  146. +16 0 library/Zend/Tag/Exception/InvalidAttributeNameException.php
  147. +16 0 library/Zend/Tag/Exception/InvalidElementNameException.php
  148. +3 2 library/Zend/Tag/composer.json
  149. +41 7 library/Zend/Uri/Uri.php
  150. +2 1  library/Zend/Uri/composer.json
  151. +1 1  library/Zend/Validator/Csrf.php
  152. +0 1  library/Zend/Validator/DateStep.php
  153. +1 1  library/Zend/Validator/Db/AbstractDb.php
  154. +1 1  library/Zend/Validator/Iban.php
  155. +22 1 library/Zend/Validator/Step.php
  156. +5 4 library/Zend/Validator/ValidatorChain.php
  157. +1 1  library/Zend/Version/Version.php
  158. +1 1  library/Zend/View/Helper/HeadMeta.php
  159. +2 1  library/Zend/View/Helper/HeadStyle.php
  160. +2 8 library/Zend/View/Helper/Navigation/Sitemap.php
  161. +40 11 library/Zend/View/Helper/Placeholder/Container/AbstractStandalone.php
  162. +1 1  library/Zend/View/HelperPluginManager.php
  163. +1 1  library/Zend/View/Renderer/ConsoleRenderer.php
  164. +1 1  library/Zend/View/Renderer/PhpRenderer.php
  165. +0 1  library/Zend/XmlRpc/Server/Fault.php
  166. +0 1  library/Zend/XmlRpc/Value/ArrayValue.php
  167. +0 1  library/Zend/XmlRpc/Value/Nil.php
  168. +1 1  resources/languages/bg/Zend_Captcha.php
  169. +1 1  resources/languages/bg/Zend_Validate.php
  170. +0 1  resources/languages/es/Zend_Validate.php
  171. +1 1  resources/languages/nl/Zend_Validate.php
  172. +0 1  tests/ZendTest/Authentication/Adapter/DbTableTest.php
  173. +1 1  tests/ZendTest/Authentication/Adapter/Http/TestAsset/BasicAuthObjectResolver.php
  174. +0 1  tests/ZendTest/Code/Annotation/DoctrineAnnotationParserTest.php
  175. +0 1  tests/ZendTest/Code/Annotation/GenericAnnotationParserTest.php
  176. +0 1  tests/ZendTest/Code/Annotation/TestAsset/Bar.php
  177. +0 1  tests/ZendTest/Code/Generator/TestAsset/TestSampleSingleClass.php
  178. +0 1  tests/ZendTest/Code/Reflection/MethodReflectionTest.php
  179. +0 1  tests/ZendTest/Code/Reflection/ParameterReflectionTest.php
  180. +0 1  tests/ZendTest/Code/Reflection/TestAsset/TestSampleClass3.php
  181. +0 1  tests/ZendTest/Code/Reflection/TestAsset/TestSampleClass6.php
  182. +0 1  tests/ZendTest/Code/Reflection/TestAsset/TestSampleInterface.php
  183. +0 1  tests/ZendTest/Code/Reflection/TestAsset/functions.php
  184. +0 5 tests/ZendTest/Code/Scanner/TokenArrayScannerTest.php
  185. +0 1  tests/ZendTest/Code/TestAsset/MultipleNamespaces.php
  186. +0 1  tests/ZendTest/Config/ConfigTest.php
  187. +0 1  tests/ZendTest/Config/FactoryTest.php
  188. +0 1  tests/ZendTest/Config/ProcessorTest.php
  189. +0 1  tests/ZendTest/Config/Reader/TestAssets/Xml/array.xml
  190. +1 1  tests/ZendTest/Config/Reader/TestAssets/Xml/include-base.xml
  191. +1 1  tests/ZendTest/Config/Reader/TestAssets/Xml/include-target.xml
  192. +1 1  tests/ZendTest/Config/Reader/TestAssets/Xml/invalid.xml
  193. +1 1  tests/ZendTest/Config/TestAssets/Xml/include-base.xml
  194. +1 1  tests/ZendTest/Config/TestAssets/Xml/include-base2.xml
  195. +1 1  tests/ZendTest/Config/Writer/_files/allsections.xml
  196. +1 1  tests/ZendTest/Db/Adapter/Platform/SqliteTest.php
  197. +21 0 tests/ZendTest/Db/Sql/ExpressionTest.php
  198. +14 0 tests/ZendTest/Db/Sql/InsertTest.php
  199. +0 6 tests/ZendTest/Db/Sql/Platform/SqlServer/SelectDecoratorTest.php
  200. +95 18 tests/ZendTest/Db/Sql/SelectTest.php
  201. +113 0 tests/ZendTest/Db/Sql/SqlTest.php
  202. +46 0 tests/ZendTest/Db/Sql/UpdateTest.php
  203. +1 1  tests/ZendTest/Db/TableGateway/Feature/MetadataFeatureTest.php
  204. +8 0 tests/ZendTest/Db/TableGateway/TableGatewayTest.php
  205. +0 1  tests/ZendTest/Di/ServiceLocatorTest.php
  206. +0 1  tests/ZendTest/Di/_files/config.yml
  207. +1 1  tests/ZendTest/Feed/PubSubHubbub/Subscriber/_files/atom10.xml
  208. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/author/plain/atom03.xml
  209. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/author/plain/atom10.xml
  210. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/commentcount/plain/none/rss20.xml
  211. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/description/plain/atom03.xml
  212. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/description/plain/atom10.xml
  213. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/enclosure/plain/atom03.xml
  214. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/enclosure/plain/atom10.xml
  215. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/id/plain/atom10.xml
  216. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/link/plain/atom03.xml
  217. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/link/plain/atom10-norel.xml
  218. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/links/plain/atom03.xml
  219. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/links/plain/atom10.xml
  220. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/title/plain/atom03.xml
  221. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Atom/title/plain/atom10.xml
  222. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss090.xml
  223. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss091.xml
  224. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss092.xml
  225. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss093.xml
  226. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss094.xml
  227. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss10.xml
  228. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc10/rss20.xml
  229. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss090.xml
  230. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss091.xml
  231. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss092.xml
  232. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss093.xml
  233. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss094.xml
  234. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss10.xml
  235. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/dc11/rss20.xml
  236. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss090.xml
  237. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss091.xml
  238. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss092.xml
  239. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss093.xml
  240. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss094.xml
  241. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss10.xml
  242. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/none/rss20.xml
  243. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss090.xml
  244. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss091.xml
  245. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss092.xml
  246. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss093.xml
  247. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss094.xml
  248. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss10.xml
  249. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/author/plain/rss20.xml
  250. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss090.xml
  251. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss091.xml
  252. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss092.xml
  253. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss093.xml
  254. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss094.xml
  255. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss10.xml
  256. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/category/plain/none/rss20.xml
  257. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss090.xml
  258. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss091.xml
  259. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss092.xml
  260. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss093.xml
  261. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss094.xml
  262. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss10.xml
  263. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentcount/plain/none/rss20.xml
  264. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss090.xml
  265. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss091.xml
  266. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss092.xml
  267. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss093.xml
  268. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss094.xml
  269. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss10.xml
  270. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentfeedlink/plain/none/rss20.xml
  271. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss090.xml
  272. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss091.xml
  273. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss092.xml
  274. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss093.xml
  275. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss094.xml
  276. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss10.xml
  277. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/commentlink/plain/none/rss20.xml
  278. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss090.xml
  279. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss091.xml
  280. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss092.xml
  281. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss093.xml
  282. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss094.xml
  283. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss10.xml
  284. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/description/rss20.xml
  285. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss090.xml
  286. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss091.xml
  287. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss092.xml
  288. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss093.xml
  289. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss094.xml
  290. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss10.xml
  291. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/none/rss20.xml
  292. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss090.xml
  293. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss091.xml
  294. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss092.xml
  295. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss093.xml
  296. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss094.xml
  297. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss10.xml
  298. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/content/plain/rss20.xml
  299. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/datemodified/plain/none/rss090.xml
  300. +1 1  tests/ZendTest/Feed/Reader/Entry/_files/Rss/datemodified/plain/none/rss091.xml
Sorry, we could not display the entire diff because too many files (761) changed.
135 CHANGELOG.md
Source Rendered
... ... @@ -0,0 +1,135 @@
  1 +# CHANGELOG
  2 +
  3 +## 2.0.2:
  4 +
  5 +- 2383: Changed unreserved char definition in Zend\Uri (ZF2-533) and added shell
  6 + escaping to the test runner (https://github.com/zendframework/zf2/pull/2383)
  7 +- 2393: Trying to solve issue ZF2-558
  8 + (https://github.com/zendframework/zf2/pull/2393)
  9 +- 2398: Segment route: add fix for optional groups within optional groups
  10 + (https://github.com/zendframework/zf2/pull/2398)
  11 +- 2400: Use 'Router' in http env and 'HttpRouter' in cli
  12 + (https://github.com/zendframework/zf2/pull/2400)
  13 +- 2401: Better precision for userland fmod algorithm
  14 + (https://github.com/zendframework/zf2/pull/2401)
  15 +
  16 +
  17 +## 2.0.1:
  18 +
  19 +- 2285: Seed RouteMatch params as long as params is set. This permits setting an
  20 + empty array. (https://github.com/zendframework/zf2/pull/2285)
  21 +- 2286: prepareNotFoundViewModel listner - eventResult as ViewModel if set
  22 + (https://github.com/zendframework/zf2/pull/2286)
  23 +- 2290: <span>$label</span> only when filled
  24 + (https://github.com/zendframework/zf2/pull/2290)
  25 +- 2292: Allow (int)0 in coomments count in entry feed
  26 + (https://github.com/zendframework/zf2/pull/2292)
  27 +- 2295: force to check className parameters
  28 + (https://github.com/zendframework/zf2/pull/2295)
  29 +- 2296: mini-fix in controller plugin manager
  30 + (https://github.com/zendframework/zf2/pull/2296)
  31 +- 2297: fixed phpdoc in Zend\Mvc\ApplicationInterface
  32 + (https://github.com/zendframework/zf2/pull/2297)
  33 +- 2298: Update to Date element use statements to make it clearer which DateTime
  34 + (https://github.com/zendframework/zf2/pull/2298)
  35 +- 2300: FormRow translate label fix (#ZF2-516)
  36 + (https://github.com/zendframework/zf2/pull/2300)
  37 +- 2302: Notifications now to #zftalk.dev
  38 + (https://github.com/zendframework/zf2/pull/2302)
  39 +- 2306: Fix several cs (https://github.com/zendframework/zf2/pull/2306)
  40 +- 2307: Removed comment about non existent Zend_Tool
  41 + (https://github.com/zendframework/zf2/pull/2307)
  42 +- 2308: Fix pluginmanager get method error
  43 + (https://github.com/zendframework/zf2/pull/2308)
  44 +- 2309: Add consistency with event name
  45 + (https://github.com/zendframework/zf2/pull/2309)
  46 +- 2310: Update library/Zend/Db/Sql/Select.php
  47 + (https://github.com/zendframework/zf2/pull/2310)
  48 +- 2311: Version update (https://github.com/zendframework/zf2/pull/2311)
  49 +- 2312: Validator Translations (https://github.com/zendframework/zf2/pull/2312)
  50 +- 2313: ZF2-336: Zend\Form adds enctype attribute as multipart/form-data
  51 + (https://github.com/zendframework/zf2/pull/2313)
  52 +- 2317: Make Fieldset constructor consistent with parent Element class
  53 + (https://github.com/zendframework/zf2/pull/2317)
  54 +- 2321: ZF2-534 Zend\Log\Writer\Syslog prevents setting application name
  55 + (https://github.com/zendframework/zf2/pull/2321)
  56 +- 2322: Jump to cache-storing instead of returning
  57 + (https://github.com/zendframework/zf2/pull/2322)
  58 +- 2323: Conditional statements improved(minor changes).
  59 + (https://github.com/zendframework/zf2/pull/2323)
  60 +- 2324: Fix for ZF2-517: Zend\Mail\Header\GenericHeader fails to parse empty
  61 + header (https://github.com/zendframework/zf2/pull/2324)
  62 +- 2328: Wrong \__clone method (https://github.com/zendframework/zf2/pull/2328)
  63 +- 2331: added validation support for optgroups
  64 + (https://github.com/zendframework/zf2/pull/2331)
  65 +- 2332: README-GIT update with optional pre-commit hook
  66 + (https://github.com/zendframework/zf2/pull/2332)
  67 +- 2334: Mail\Message::getSubject() should return value the way it was set
  68 + (https://github.com/zendframework/zf2/pull/2334)
  69 +- 2335: ZF2-511 Updated refactored names and other fixes
  70 + (https://github.com/zendframework/zf2/pull/2335)
  71 +- 2336: ZF-546 Remove duplicate check for time
  72 + (https://github.com/zendframework/zf2/pull/2336)
  73 +- 2337: ZF2-539 Input type of image should not have attribute value
  74 + (https://github.com/zendframework/zf2/pull/2337)
  75 +- 2338: ZF2-543: removed linked but not implemented cache adapters
  76 + (https://github.com/zendframework/zf2/pull/2338)
  77 +- 2341: Updated Zend_Validate.php pt_BR translation to 25.Jul.2011 EN Revision
  78 + (https://github.com/zendframework/zf2/pull/2341)
  79 +- 2342: ZF2-549 Zend\Log\Formatter\ErrorHandler does not handle complex events
  80 + (https://github.com/zendframework/zf2/pull/2342)
  81 +- 2346: updated Page\Mvc::isActive to check if the controller param was
  82 + tinkered (https://github.com/zendframework/zf2/pull/2346)
  83 +- 2349: Zend\Feed Added unittests for more code coverage
  84 + (https://github.com/zendframework/zf2/pull/2349)
  85 +- 2350: Bug in Zend\ModuleManager\Listener\LocatorRegistrationListener
  86 + (https://github.com/zendframework/zf2/pull/2350)
  87 +- 2351: ModuleManagerInterface is never used
  88 + (https://github.com/zendframework/zf2/pull/2351)
  89 +- 2352: Hotfix for AbstractDb and Csrf Validators
  90 + (https://github.com/zendframework/zf2/pull/2352)
  91 +- 2354: Update library/Zend/Feed/Writer/AbstractFeed.php
  92 + (https://github.com/zendframework/zf2/pull/2354)
  93 +- 2355: Allow setting CsrfValidatorOptions in constructor
  94 + (https://github.com/zendframework/zf2/pull/2355)
  95 +- 2356: Update library/Zend/Http/Cookies.php
  96 + (https://github.com/zendframework/zf2/pull/2356)
  97 +- 2357: Update library/Zend/Barcode/Object/AbstractObject.php
  98 + (https://github.com/zendframework/zf2/pull/2357)
  99 +- 2358: Update library/Zend/ServiceManager/AbstractPluginManager.php
  100 + (https://github.com/zendframework/zf2/pull/2358)
  101 +- 2359: Update library/Zend/Server/Method/Parameter.php
  102 + (https://github.com/zendframework/zf2/pull/2359)
  103 +- 2361: Zend\Form Added extra unit tests and some code improvements
  104 + (https://github.com/zendframework/zf2/pull/2361)
  105 +- 2364: Remove unused use statements
  106 + (https://github.com/zendframework/zf2/pull/2364)
  107 +- 2365: Resolve undefined classes and constants
  108 + (https://github.com/zendframework/zf2/pull/2365)
  109 +- 2366: fixed typo in Zend\View\HelperPluginManager
  110 + (https://github.com/zendframework/zf2/pull/2366)
  111 +- 2370: Error handling in AbstractWriter::write using Zend\Stdlib\ErrorHandler
  112 + (https://github.com/zendframework/zf2/pull/2370)
  113 +- 2372: Update library/Zend/ServiceManager/Config.php
  114 + (https://github.com/zendframework/zf2/pull/2372)
  115 +- 2375: zend-inputfilter already requires
  116 + (https://github.com/zendframework/zf2/pull/2375)
  117 +- 2376: Activate the new GitHub feature: Contributing Guidelines
  118 + (https://github.com/zendframework/zf2/pull/2376)
  119 +- 2377: Update library/Zend/Mvc/Controller/AbstractController.php
  120 + (https://github.com/zendframework/zf2/pull/2377)
  121 +- 2379: Typo in property name in Zend/Db/Metadata/Object/AbstractTableObject.php
  122 + (https://github.com/zendframework/zf2/pull/2379)
  123 +- 2382: PHPDoc params in AbstractTableGateway.php
  124 + (https://github.com/zendframework/zf2/pull/2382)
  125 +- 2384: Replace Router with Http router in url view helper
  126 + (https://github.com/zendframework/zf2/pull/2384)
  127 +- 2387: Replace PHP internal fmod function because it gives false negatives
  128 + (https://github.com/zendframework/zf2/pull/2387)
  129 +- 2388: Proposed fix for ZF2-569 validating float with trailing 0's (10.0,
  130 + 10.10) (https://github.com/zendframework/zf2/pull/2388)
  131 +- 2391: clone in Filter\FilterChain
  132 + (https://github.com/zendframework/zf2/pull/2391)
  133 +- Security fix: a number of classes were not using the Escaper component in
  134 + order to perform URL, HTML, and/or HTML attribute escaping. Please see
  135 + http://framework.zend.com/security/advisory/ZF2012-03 for more details.
77 CONTRIBUTING.md
Source Rendered
... ... @@ -0,0 +1,77 @@
  1 +# CONTRIBUTING
  2 +
  3 +## RESOURCES
  4 +
  5 +If you wish to contribute to Zend Framework, please be sure to
  6 +read/subscribe to the following resources:
  7 +
  8 + - Coding Standards:
  9 + http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
  10 + - ZF Git Guide:
  11 + [README-GIT.md](README-GIT.md)
  12 + - Contributor's Guide:
  13 + http://framework.zend.com/participate/contributor-guide
  14 + - ZF Contributor's mailing list:
  15 + Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
  16 + Subscribe: zf-contributors-subscribe@lists.zend.com
  17 + - ZF Contributor's IRC channel:
  18 + #zftalk.dev on Freenode.net
  19 +
  20 +If you are working on new features, or refactoring an existing
  21 +component, please create a proposal. You can do this in on the RFC's
  22 +page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
  23 +
  24 +## RUNNING TESTS
  25 +
  26 +To run tests:
  27 +
  28 +- Make sure you have a recent version of PHPUnit installed; 3.6.0
  29 + minimally.
  30 +- Enter the `tests/` subdirectory.
  31 +- Execute PHPUnit, providing a path to a component directory for which
  32 + you wish to run tests, or a specific test class file.
  33 +
  34 + ```sh
  35 + % phpunit ZendTest/Http
  36 + % phpunit ZendTest/Http/Header/EtagTest.php
  37 + ```
  38 +
  39 +- You may also provide the `--group` switch; in such cases, provide the
  40 + top-level component name:
  41 +
  42 + ```sh
  43 + % phpunit --group Zend_Http
  44 + ```
  45 +
  46 + This will likely lead to errors, so it's usually best to specify a
  47 + specific component in which to run test:
  48 +
  49 + ```sh
  50 + % phpunit --group ZF-XYZ Zend/Http
  51 + ```
  52 +- Alternately, use the `run-tests.php` script. This can be executed with no
  53 + arguments to run all tests:
  54 +
  55 + ```sh
  56 + % php run-tests.php
  57 + ```
  58 +
  59 + You can also provide top-level component names to run tests for individual
  60 + components or several components at a time. The component name is the the
  61 + component namespace, without the `Zend\` prefix:
  62 +
  63 + ```sh
  64 + % php run-tests Mvc
  65 + ```
  66 +
  67 + ```sh
  68 + % php run-tests ModuleManager Mvc View Navigation
  69 + ```
  70 +
  71 +You can turn on conditional tests with the TestConfiguration.php file.
  72 +To do so:
  73 +
  74 + - Enter the `tests/` subdirectory.
  75 + - Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
  76 + - Edit `TestConfiguration.php` to enable any specific functionality you
  77 + want to test, as well as to provide test values to utilize.
64 README-DEV.md
Source Rendered
... ... @@ -1,64 +0,0 @@
1   -# CONTRIBUTING
2   -
3   -## RESOURCES
4   -
5   -If you wish to contribute to Zend Framework, please be sure to
6   -read/subscribe to the following resources:
7   -
8   - - ZF2 Requirements:
9   - http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Requirements
10   - - Coding Standards:
11   - http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
12   - - ZF Git Guide:
13   - [README-GIT.md](README-GIT.md)
14   - - Contributor's Guide:
15   - http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework
16   - - ZF Contributor's mailing list:
17   - Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
18   - Subscribe: zf-contributors-subscribe@lists.zend.com
19   - - ZF Contributor's IRC channel:
20   - #zftalk.2 on Freenode.net
21   -
22   -If you are working on new features, or refactoring an existing
23   -component, please create a proposal. You can do this in on the RFC's
24   -page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
25   -
26   -## RUNNING TESTS
27   -
28   -The full test suite currently does not run! This is due to some
29   -components not yet being migrated to namespaces, as well as to some
30   -issues we've encountered in refactoring.
31   -
32   -To run tests:
33   -
34   - - Make sure you have a recent version of PHPUnit installed; 3.6.0
35   - minimally.
36   - - Enter the `tests/` subdirectory.
37   - - Execute PHPUnit, providing a path to a component directory for which
38   - you wish to run tests, or a specific test class file.
39   -
40   - ```sh
41   - % phpunit Zend/Http
42   - % phpunit Zend/Http/Header/EtagTest.php
43   - ```
44   -
45   - - You may also provide the `--group` switch; in such cases, provide the
46   - top-level component name:
47   -
48   - ```sh
49   - % phpunit --group Zend_Http
50   - ```
51   - This will likely lead to errors, so it's usually best to specify a
52   - specific component in which to run test:
53   -
54   - ```sh
55   - % phpunit --group ZF-XYZ Zend/Http
56   - ```
57   -
58   -You can turn on conditional tests with the TestConfiguration.php file.
59   -To do so:
60   -
61   - - Enter the `tests/` subdirectory.
62   - - Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
63   - - Edit `TestConfiguration.php` to enable any specific functionality you
64   - want to test, as well as to provide test values to utilize.
189 README-GIT.md
Source Rendered
... ... @@ -1,29 +1,19 @@
1 1 # USING THE GIT REPOSITORY
2 2
3   -## Initial Setup
4   -
5   -First, make sure you know the email address associated with your JIRA
6   -credentials. All commits pushed to the master repository are checked
7   -against these addresses, so your repository will need to be configured
8   -to use that address. The following will give you that information:
9   -
10   - 1. Visit the ZF Crowd install: http://framework.zend.com/crowd
11   - 2. Log in, if you aren't.
12   - 3. Find the "My Profile" link in the upper right of the page, and follow
13   - it.
14   - 4. The resulting page will display your profile, including the _email_
15   - address with which you are registered. Make a note of it.
16   -
17 3 ## Setup your own public repository
18 4
19   -Your next step is to establish a public repository from which we can
  5 +Your first step is to establish a public repository from which we can
20 6 pull your work into the master repository. You have two options: use
21   -github or other public site, or setup/use your own repository.
  7 +GitHub or other public site, or setup/use your own repository.
  8 +
  9 +While you can use a private repository and utilize ``git format-patch`` to
  10 +submit patches, this is discouraged as it does not facilitate public peer
  11 +review.
22 12
23 13 ### Option 1: GitHub
24 14
25 15 1. Setup a GitHub account (http://github.com/), if you haven't yet
26   - 2. Fork the ZF2 respository (http://github.com/zendframework/zf2)
  16 + 2. Fork the ZF2 repository (http://github.com/zendframework/zf2)
27 17 3. Clone your fork locally and enter it (use your own GitHub username
28 18 in the statement below)
29 19
@@ -32,14 +22,7 @@ github or other public site, or setup/use your own repository.
32 22 % cd zf2
33 23 ```
34 24
35   - 4. Configure git to use the email address with which you are registered
36   - in JIRA:
37   -
38   - ```sh
39   - % git config user.email <your email address>
40   - ```
41   -
42   - 5. Add a remote to the canonical ZF repository, so you can keep your fork
  25 + 4. Add a remote to the canonical ZF repository, so you can keep your fork
43 26 up-to-date:
44 27
45 28 ```sh
@@ -49,10 +32,10 @@ github or other public site, or setup/use your own repository.
49 32
50 33 ### Option 2: Personal Repository
51 34
52   -We assume you will use gitosis (http://progit.org/book/ch4-7.html) or gitolite
53   -(http://progit.org/book/ch4-8.html) to host your own repository. If
54   -you go this route, we will assume you have the knowledge to do so, or
55   -know where to obtain it. We will not assist you in setting up such a
  35 +We assume you will use gitosis (http://git-scm.com/book/en/Git-on-the-Server-Gitosis)
  36 +or gitolite (http://git-scm.com/book/en/Git-on-the-Server-Gitolite) to host your
  37 +own repository. If you go this route, we will assume you have the knowledge to
  38 +do so, or know where to obtain it. We will not assist you in setting up such a
56 39 repository.
57 40
58 41 1. Create a new repository
@@ -61,33 +44,26 @@ repository.
61 44 % git init
62 45 ```
63 46
64   - 2. Configure git to use the email address with which you are registered
65   - in JIRA:
66   -
67   - ```sh
68   - % git config user.email <your email address>
69   - ```
70   -
71   - 3. Add an "origin" remote pointing to your gitosis/gitolite repo:
  47 + 2. Add an "origin" remote pointing to your gitosis/gitolite repo:
72 48
73 49 ```sh
74 50 % git remote add origin git://yourdomain/yourrepo.git
75 51 ```
76 52
77   - 4. Add a remote for the ZF repository and fetch it
  53 + 3. Add a remote for the ZF repository and fetch it
78 54
79 55 ```sh
80 56 % git remote add zf2 https://github.com/zendframework/zf2.git
81 57 % git fetch zf2
82 58 ```
83 59
84   - 5. Create a new branch for the ZF repository (named "zf/master" here)
  60 + 4. Create a new branch for the ZF repository (named "zf/master" here)
85 61
86 62 ```sh
87 63 % git checkout -b zf/master zf2/master
88 64 ```
89 65
90   - 6. Create your master branch off the ZF branch, and push to your
  66 + 5. Create your master branch off the ZF branch, and push to your
91 67 repository
92 68
93 69 ```sh
@@ -100,29 +76,80 @@ repository.
100 76 The ZF2 Travis-CI will confirm that code style standards are met
101 77 by using ```php-cs-fixer``` (https://github.com/fabpot/PHP-CS-Fixer) during it's build runs.
102 78
103   -To reduce the number of red Travis-CI builds, the following Git pre-commit hook can help catch code style
104   -issues before committing.
105   -
106   -```sh
107   -#!/bin/sh
108   -# Git pre-commit hook to confirm ZF2 code style
109   -# Install under: zf2/.git/hooks/pre-commit (and ensure it is executable)
110   -
111   -PROJECTROOT=`echo $(cd ${0%/*}/../../ && pwd -P)`/
112   -FIXER=php-cs-fixer
113   -
114   -RES=`${FIXER} fix $PROJECTROOT -v --dry-run --level=psr2`
115   -if [ "$RES" != "" ]; then
116   - echo "ZF2 Coding standards are not correct, cancelling your commit."
117   - echo ""
118   - echo $RES
119   - echo ""
120   - echo "To fix, run:"
121   - echo ""
122   - echo " ${FIXER} fix ${PROJECTROOT} -v --level=psr2"
123   - echo ""
124   - exit 1
125   -fi
  79 +To reduce the number of red Travis-CI builds, the following Git pre-commit hook
  80 +can help catch code style issues before committing. Save it as
  81 +```.git/hooks/pre-commit```, and make sure it is executable.
  82 +
  83 +```php
  84 +#!/usr/bin/env php
  85 +<?php
  86 +/**
  87 + * .git/hooks/pre-commit
  88 + *
  89 + * This pre-commit hooks will check for PHP errors (lint), and make sure the
  90 + * code is PSR-2 compliant.
  91 + *
  92 + * Dependecy: PHP-CS-Fixer (https://github.com/fabpot/PHP-CS-Fixer)
  93 + *
  94 + * @author Mardix http://github.com/mardix
  95 + * @author Matthew Weier O'Phinney http://mwop.net/
  96 + * @since 4 Sept 2012
  97 + */
  98 +
  99 +$exit = 0;
  100 +
  101 +/*
  102 + * collect all files which have been added, copied or
  103 + * modified and store them in an array called output
  104 + */
  105 +$output = array();
  106 +exec('git diff --cached --name-status --diff-filter=ACM', $output);
  107 +
  108 +foreach ($output as $file) {
  109 + if ('D' === substr($file, 0, 1)) {
  110 + // deleted file; do nothing
  111 + continue;
  112 + }
  113 +
  114 + $fileName = trim(substr($file, 1));
  115 +
  116 + /*
  117 + * Only PHP files
  118 + */
  119 + $extension = pathinfo($fileName, PATHINFO_EXTENSION);
  120 + if (!preg_match('/^ph(p|tml)$/', $extension)) {
  121 + continue;
  122 + }
  123 +
  124 + /*
  125 + * Check for parse errors
  126 + */
  127 + $output = array();
  128 + $return = 0;
  129 + exec("php -l " . escapeshellarg($fileName), $output, $return);
  130 +
  131 + if ($return != 0) {
  132 + echo "PHP file fails to parse: " . $fileName . ":" . PHP_EOL;
  133 + echo implode(PHP_EOL, $lintOutput) . PHP_EOL;
  134 + $exit = 1;
  135 + continue;
  136 + }
  137 +
  138 + /*
  139 + * PHP-CS-Fixer
  140 + */
  141 + $output = array();
  142 + $return = null;
  143 + exec("php-cs-fixer --dry-run --level=psr2 " . escapeshellarg($fileName), $output, $return);
  144 + if ($return != 0 || !empty($output)) {
  145 + echo "PHP file fails contains CS issues: " . $fileName . ":" . PHP_EOL;
  146 + echo implode(PHP_EOL, $output) . PHP_EOL;
  147 + $exit = 1;
  148 + continue;
  149 + }
  150 +}
  151 +
  152 +exit($exit);
126 153 ```
127 154
128 155 ## Keeping Up-to-Date
@@ -140,6 +167,10 @@ the following:
140 167 % git push origin
141 168 ```
142 169
  170 +If you're tracking other branches -- for example, the "develop" branch, where
  171 +new feature development occurs -- you'll want to do the same operations for that
  172 +branch; simply substibute "develop" for "master".
  173 +
143 174 ## Working on Zend Framework
144 175
145 176 When working on Zend Framework, we recommend you do each new feature or
@@ -199,6 +230,16 @@ email indicating you have changes to pull:
199 230 - The nature of the changes (e.g., `implements
200 231 Zend_Service_Twitter`, `fixes ZF-9295`, etc.)
201 232
  233 +### What branch to issue the pull request against?
  234 +
  235 +Which branch should you issue a pull request against?
  236 +
  237 +- For fixes against the stable release, issue the pull request against the
  238 + "master" branch.
  239 +- For new features, or fixes that introduce new elements to the public API (such
  240 + as new public methods or properties), issue the pull request against the
  241 + "develop" branch.
  242 +
202 243 ## Branch Cleanup
203 244
204 245 As you might imagine, if you are a frequent contributor, you'll start to
@@ -228,24 +269,10 @@ RSS feeds may be found at:
228 269
229 270 where &lt;branch&gt; is a branch in the repository.
230 271
231   -To subscribe to git email notifications, send an email to:
232   -
233   -<zf-git-subscribe@lists.zend.com>
234   -
235   -You will need to reply to the verification email sent to you by this
236   -list.
237   -
238   -Should you wish to filter emails from the list, they will use the
239   -"subject" line of commit messages, preceded by `[branch] `, and come
240   -from <zf-git@lists.zend.com>.
  272 +To subscribe to git email notifications, simply watch or fork the zf2 repository
  273 +on GitHub.
241 274
242 275 ## CONTRIBUTORS AND COMMITTERS
243 276
244   -For the immediate future, and until we create a community process team,
245   -only the Zend team will be committers. If you have a patch or
246   -feature-set you wish to have incorporated into the repository, please
247   -issue a pull request to a committer. A pull request may be done by using
248   -git's "git-send-email" functionality, or by sending a request to a
249   -committer indicating the URL of your repository, the branch that should
250   -be pulled, and/or the specific revision(s) to pull.
251   -
  277 +Both Zend's internal Zend Framework team and the members of the Community Review
  278 +team have push privileges to the ZF2 repository.
16 README.md
Source Rendered
@@ -4,21 +4,15 @@ Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?bran
4 4
5 5 ## RELEASE INFORMATION
6 6
7   -*Zend Framework 2.0.1*
  7 +*Zend Framework 2.0.3dev*
8 8
9   -This is the first maintenance release for the 2.0 series.
  9 +This is the third maintenance release for the 2.0 series.
10 10
11 11 XX YYY 2012
12 12
13   -### UPDATES IN 2.0.1
  13 +### UPDATES IN 2.0.3
14 14
15   -- Zend\Form
16   - - Made value and placeholder form attributes translatable
17   -- Zend\Stdlib
18   - - Adds support for "has" methods to ClassMethods hydrator
19   -
20   -More than XX pull requests for a variety of features and bugfixes were handled
21   -since RC6, as well as almost XX documentation changes!
  15 +Please see [CHANGELOG.md](CHANGELOG.md).
22 16
23 17 ### SYSTEM REQUIREMENTS
24 18
@@ -32,7 +26,7 @@ Please see INSTALL.md.
32 26 ### CONTRIBUTING
33 27
34 28 If you wish to contribute to Zend Framework 2.0, please read both the
35   -README-DEV.md and README-GIT.md file.
  29 +CONTRIBUTING.md and README-GIT.md file.
36 30
37 31 ### QUESTIONS AND FEEDBACK
38 32
2  demos/Zend/ProgressBar/JsPush.php
@@ -155,4 +155,4 @@ function Zend_ProgressBar_Finish()
155 155 <div id="progressDone"></div>
156 156 </div>
157 157 </body>
158   -</html>
  158 +</html>
1  demos/Zend/ProgressBar/ZendForm.php
@@ -216,4 +216,3 @@ function finish()
216 216 </div>
217 217 </body>
218 218 </html>
219   -
2  library/Zend/Authentication/Adapter/Ldap.php
@@ -257,7 +257,7 @@ public function authenticate()
257 257 /* Iterate through each server and try to authenticate the supplied
258 258 * credentials against it.
259 259 */
260   - foreach ($this->options as $name => $options) {
  260 + foreach ($this->options as $options) {
261 261
262 262 if (!is_array($options)) {
263 263 throw new Exception\InvalidArgumentException('Adapter options array not an array');
1  library/Zend/Authentication/Storage/Session.php
@@ -10,7 +10,6 @@
10 10
11 11 namespace Zend\Authentication\Storage;
12 12
13   -use Zend\Authentication\Storage\StorageInterface as AuthenticationStorage;
14 13 use Zend\Session\Container as SessionContainer;
15 14 use Zend\Session\ManagerInterface as SessionManager;
16 15
8 library/Zend/Barcode/Object/AbstractObject.php
@@ -174,27 +174,27 @@
174 174
175 175 /**
176 176 * Fix barcode length (numeric or string like 'even')
177   - * @var $barcodeLength integer | string
  177 + * @var integer | string
178 178 */
179 179 protected $barcodeLength = null;
180 180
181 181 /**
182 182 * Activate automatic addition of leading zeros
183 183 * if barcode length is fixed
184   - * @var $addLeadingZeros boolean
  184 + * @var boolean
185 185 */
186 186 protected $addLeadingZeros = true;
187 187
188 188 /**
189 189 * Activation of mandatory checksum
190 190 * to deactivate unauthorized modification
191   - * @var $mandatoryChecksum boolean
  191 + * @var boolean
192 192 */
193 193 protected $mandatoryChecksum = false;
194 194
195 195 /**
196 196 * Character used to substitute checksum character for validation
197   - * @var $substituteChecksumCharacter mixed
  197 + * @var mixed
198 198 */
199 199 protected $substituteChecksumCharacter = 0;
200 200
1  library/Zend/Cache/Storage/Adapter/Apc.php
@@ -143,7 +143,6 @@ public function getIterator()
143 143 $options = $this->getOptions();
144 144 $prefix = $options->getNamespace() . $options->getNamespaceSeparator();
145 145 $pattern = '/^' . preg_quote($prefix, '/') . '/';
146   - $format = 0;
147 146
148 147 $baseIt = new BaseApcIterator('user', $pattern, 0, 1, \APC_LIST_ACTIVE);
149 148 return new ApcIterator($this, $baseIt, $prefix);
8 library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -193,8 +193,6 @@ public function clearByNamespace($namespace)
193 193 . str_repeat(\DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
194 194 . \DIRECTORY_SEPARATOR . $nsPrefix . '*';
195 195 $glob = new GlobIterator($path, $flags);
196   - $time = time();
197   - $ttl = $options->getTtl();
198 196
199 197 ErrorHandler::start();
200 198 foreach ($glob as $pathname) {
@@ -227,8 +225,6 @@ public function clearByPrefix($prefix)
227 225 . str_repeat(\DIRECTORY_SEPARATOR . $nsPrefix . '*', $options->getDirLevel())
228 226 . \DIRECTORY_SEPARATOR . $nsPrefix . $prefix . '*';
229 227 $glob = new GlobIterator($path, $flags);
230   - $time = time();
231   - $ttl = $options->getTtl();
232 228
233 229 ErrorHandler::start();
234 230 foreach ($glob as $pathname) {
@@ -317,8 +313,6 @@ public function clearByTags(array $tags, $disjunction = false)
317 313 . str_repeat(\DIRECTORY_SEPARATOR . $prefix . '*', $options->getDirLevel())
318 314 . \DIRECTORY_SEPARATOR . $prefix . '*.tag';
319 315 $glob = new GlobIterator($path, $flags);
320   - $time = time();
321   - $ttl = $options->getTtl();
322 316
323 317 foreach ($glob as $pathname) {
324 318 $diff = array_diff($tags, explode("\n", $this->getFileContent($pathname)));
@@ -884,7 +878,6 @@ public function replaceItems(array $keyValuePairs)
884 878 */
885 879 protected function internalSetItem(& $normalizedKey, & $value)
886 880 {
887   - $options = $this->getOptions();
888 881 $filespec = $this->getFileSpec($normalizedKey);
889 882 $this->prepareDirectoryStructure($filespec);
890 883
@@ -903,7 +896,6 @@ protected function internalSetItem(& $normalizedKey, & $value)
903 896 */
904 897 protected function internalSetItems(array & $normalizedKeyValuePairs)
905 898 {
906   - $baseOptions = $this->getOptions();
907 899 $oldUmask = null;
908 900
909 901 // create an associated array of files and contents to write
3  library/Zend/Cache/Storage/Adapter/Memcached.php
@@ -12,7 +12,6 @@
12 12
13 13 use ArrayObject;
14 14 use Memcached as MemcachedResource;
15   -use MemcachedException;
16 15 use stdClass;
17 16 use Traversable;
18 17 use Zend\Cache\Exception;
@@ -302,7 +301,7 @@ protected function internalGetMetadatas(array & $normalizedKeys)
302 301 throw $this->getExceptionByResultCode($this->memcached->getResultCode());
303 302 }
304 303
305   - foreach ($result as $key => & $value) {
  304 + foreach ($result as & $value) {
306 305 $value = array();
307 306 }
308 307
1  library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
@@ -10,7 +10,6 @@
10 10
11 11 namespace Zend\Cache\Storage\Adapter;
12 12
13   -use Memcached as MemcachedResource;
14 13 use Zend\Cache\Exception;
15 14 use Zend\Validator\Hostname;
16 15
2  library/Zend/Cache/Storage/Capabilities.php
@@ -245,7 +245,7 @@ public function setSupportedDatatypes(stdClass $marker, array $datatypes)
245 245 // add missing datatypes as not supported
246 246 $missingTypes = array_diff($allTypes, array_keys($datatypes));
247 247 foreach ($missingTypes as $type) {
248   - $datatypes[type] = false;
  248 + $datatypes[$type] = false;
249 249 }
250 250
251 251 return $this->setCapability($marker, 'supportedDatatypes', $datatypes);
1  library/Zend/Cache/Storage/Plugin/Serializer.php
@@ -218,7 +218,6 @@ public function onIncrementItemsPre(Event $event)
218 218 }
219 219
220 220 $failedKeys = $storage->setItems($keyValuePairs);
221   - $result = array();
222 221 foreach ($failedKeys as $failedKey) {
223 222 unset($keyValuePairs[$failedKey]);
224 223 }
1  library/Zend/Captcha/Factory.php
@@ -88,4 +88,3 @@ public static function factory($options)
88 88 return $captcha;
89 89 }
90 90 }
91   -
1  library/Zend/Code/Reflection/ClassReflection.php
@@ -222,4 +222,3 @@ public function __toString()
222 222 }
223 223
224 224 }
225   -
1  library/Zend/Code/Reflection/FileReflection.php
@@ -10,7 +10,6 @@
10 10
11 11 namespace Zend\Code\Reflection;
12 12
13   -use Zend\Code\NameInformation;
14 13 use Zend\Code\Scanner\CachingFileScanner;
15 14
16 15 /**
2  library/Zend/Console/Charset/Utf8Heavy.php
@@ -29,4 +29,4 @@ class Utf8Heavy extends Utf8
29 29 const LINE_SINGLE_SW = "┗";
30 30 const LINE_SINGLE_CROSS = "╋";
31 31
32   -}
  32 +}
23 library/Zend/Console/Console.php
@@ -25,6 +25,13 @@
25 25 protected static $instance;
26 26
27 27 /**
  28 + * Allow overriding whether or not we're in a console env. If set, and
  29 + * boolean, returns that value from isConsole().
  30 + * @var bool
  31 + */
  32 + protected static $isConsole;
  33 +
  34 + /**
28 35 * Create and return Adapter\AdapterInterface instance.
29 36 *
30 37 * @param null|string $forceAdapter Optional adapter class name. Ccan be absolute namespace or class name
@@ -125,14 +132,30 @@ public static function isAnsicon()
125 132 /**
126 133 * Check if running in a console environment (CLI)
127 134 *
  135 + * By default, returns value of PHP_SAPI global constant. If $isConsole is
  136 + * set, and a boolean value, that value will be returned.
  137 + *
128 138 * @return bool
129 139 */
130 140 public static function isConsole()
131 141 {
  142 + if (null !== static::$isConsole && is_bool(static::$isConsole)) {
  143 + return static::$isConsole;
  144 + }
132 145 return PHP_SAPI == 'cli';
133 146 }
134 147
135 148 /**
  149 + * Override the "is console environment" flag
  150 + *
  151 + * @param null|bool $flag
  152 + */
  153 + public static function overrideIsConsole($flag)
  154 + {
  155 + static::$isConsole = $flag;
  156 + }
  157 +
  158 + /**
136 159 * Try to detect best matching adapter
137 160 * @return string|null
138 161 */
1  library/Zend/Console/Request.php
@@ -12,7 +12,6 @@
12 12
13 13 use Zend\Stdlib\Message;
14 14 use Zend\Stdlib\Parameters;
15   -use Zend\Stdlib\ParametersInterface;
16 15 use Zend\Stdlib\RequestInterface;
17 16
18 17 /**
1  library/Zend/Crypt/Symmetric/SymmetricInterface.php
@@ -42,4 +42,3 @@ public function getMode();
42 42
43 43 public function getSupportedModes();
44 44 }
45   -
1  library/Zend/Db/Adapter/Driver/Pdo/Result.php
@@ -11,7 +11,6 @@
11 11 namespace Zend\Db\Adapter\Driver\Pdo;
12 12
13 13 use Iterator;
14   -use PDO as PDOResource;
15 14 use PDOStatement;
16 15 use Zend\Db\Adapter\Driver\ResultInterface;
17 16 use Zend\Db\Adapter\Exception;
2  library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
@@ -48,7 +48,7 @@ class Statement implements StatementInterface
48 48 protected $parameterReferences = array();
49 49
50 50 /**
51   - * @var Zend\Db\Adapter\ParameterContainer\ParameterContainer
  51 + * @var ParameterContainer
52 52 */
53 53 protected $parameterContainer = null;
54 54
2  library/Zend/Db/Metadata/Object/AbstractTableObject.php
@@ -96,7 +96,7 @@ public function setConstraints($constraints)
96 96 */
97 97 public function getConstraints()
98 98 {
99   - return $this->columns;
  99 + return $this->constraints;
100 100 }
101 101
102 102 /**
1  library/Zend/Db/Metadata/Source/MysqlMetadata.php
@@ -11,7 +11,6 @@
11 11 namespace Zend\Db\Metadata\Source;
12 12
13 13 use Zend\Db\Adapter\Adapter;
14   -use Zend\Db\Metadata\MetadataInterface;
15 14 use Zend\Db\Metadata\Object;
16 15
17 16 /**
1  library/Zend/Db/Metadata/Source/SqlServerMetadata.php
@@ -11,7 +11,6 @@
11 11 namespace Zend\Db\Metadata\Source;
12 12
13 13 use Zend\Db\Adapter\Adapter;
14   -use Zend\Db\Metadata\MetadataInterface;
15 14 use Zend\Db\Metadata\Object;
16 15
17 16 /**
1  library/Zend/Db/Metadata/Source/SqliteMetadata.php
@@ -11,7 +11,6 @@
11 11 namespace Zend\Db\Metadata\Source;
12 12
13 13 use Zend\Db\Adapter\Adapter;
14   -use Zend\Db\Metadata\MetadataInterface;
15 14 use Zend\Db\Metadata\Object;
16 15 use Zend\Db\ResultSet\ResultSetInterface;
17 16
1  library/Zend/Db/Sql/ExpressionInterface.php
@@ -36,4 +36,3 @@
36 36 */
37 37 public function getExpressionData();
38 38 }
39   -
8 library/Zend/Db/Sql/Insert.php
@@ -98,14 +98,18 @@ public function columns(array $columns)
98 98 public function values(array $values, $flag = self::VALUES_SET)
99 99 {
100 100 if ($values == null) {
101   - throw new Exception\InvalidArgumentException('values() expects an array of values');
  101 + throw new \InvalidArgumentException('values() expects an array of values');
102 102 }
103 103
104 104 $keys = array_keys($values);
105 105 $firstKey = current($keys);
106 106
107 107 if (is_string($firstKey)) {
108   - $this->columns($keys);
  108 + if ($flag == self::VALUES_MERGE) {
  109 + $this->columns(array_merge($this->columns, $keys));
  110 + } else {
  111 + $this->columns($keys);
  112 + }
109 113 $values = array_values($values);
110 114 } elseif (is_int($firstKey)) {
111 115 $values = array_values($values);
14 library/Zend/Db/Sql/Select.php
@@ -22,6 +22,7 @@
22 22 * @subpackage Sql
23 23 *
24 24 * @property Where $where
  25 + * @property Having $having
25 26 */
26 27 class Select extends AbstractSql implements SqlInterface, PreparableSqlInterface
27 28 {
@@ -395,6 +396,12 @@ public function reset($part)
395 396