Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'develop' of git://github.com/zendframework/zf2 into string

  • Loading branch information...
commit 4adbb3d2102a7fa0b5fc56cfd348072de05871d4 2 parents 29e0da2 + 791cb40
@marc-mabe authored
Showing with 838 additions and 26,293 deletions.
  1. +3 −1 .gitignore
  2. +8 −3 .travis.yml
  3. +426 −0 CHANGELOG.md
  4. +77 −0 CONTRIBUTING.md
  5. +1 −3 INSTALL.md
  6. +0 −63 README-DEV.md
  7. +115 −58 README-GIT.md
  8. +20 −155 README.md
  9. +8 −19 bin/classmap_generator.php
  10. +4 −8 bin/createAutoloadTestClasses.php
  11. +0 −135 bin/docbook_skeleton.php
  12. +10 −10 bin/pluginmap_generator.php
  13. +14 −39 composer.json
  14. +8 −20 demos/Zend/Feeds/consume-feed.php
  15. +0 −109 demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php
  16. BIN  demos/Zend/Gdata/3LeggedOAuth/data-api-72.png
  17. BIN  demos/Zend/Gdata/3LeggedOAuth/doclist-72.png
  18. +0 −190 demos/Zend/Gdata/3LeggedOAuth/index.php
  19. +0 −43 demos/Zend/Gdata/3LeggedOAuth/style.css
  20. +0 −373 demos/Zend/Gdata/Blogger.php
  21. +0 −136 demos/Zend/Gdata/BooksBrowser/books_browser.css
  22. +0 −155 demos/Zend/Gdata/BooksBrowser/index.php
  23. +0 −81 demos/Zend/Gdata/BooksBrowser/interface.html
  24. +0 −841 demos/Zend/Gdata/Calendar.php
  25. +0 −940 demos/Zend/Gdata/Docs.php
  26. +0 −1,992 demos/Zend/Gdata/Gapps.php
  27. +0 −386 demos/Zend/Gdata/InstallationChecker.php
  28. +0 −226 demos/Zend/Gdata/MyLibrary/demo.php
  29. +0 −904 demos/Zend/Gdata/Photos.php
  30. +0 −454 demos/Zend/Gdata/Spreadsheet-ClientLogin.php
  31. +0 −44 demos/Zend/Gdata/YouTubeVideoApp/README.txt
  32. +0 −193 demos/Zend/Gdata/YouTubeVideoApp/index.php
  33. BIN  demos/Zend/Gdata/YouTubeVideoApp/notfound.jpg
  34. +0 −1,097 demos/Zend/Gdata/YouTubeVideoApp/operations.php
  35. +0 −66 demos/Zend/Gdata/YouTubeVideoApp/session_details.php
  36. +0 −236 demos/Zend/Gdata/YouTubeVideoApp/video_app.css
  37. +0 −582 demos/Zend/Gdata/YouTubeVideoApp/video_app.js
  38. +0 −278 demos/Zend/Gdata/YouTubeVideoBrowser/index.php
  39. +0 −79 demos/Zend/Gdata/YouTubeVideoBrowser/interface.html
  40. +0 −152 demos/Zend/Gdata/YouTubeVideoBrowser/video_browser.css
  41. +0 −228 demos/Zend/Gdata/YouTubeVideoBrowser/video_browser.js
  42. +0 −43 demos/Zend/Locale/AllLanguages.php
  43. +0 −449 demos/Zend/Mail/SimpleMailer.php
  44. BIN  demos/Zend/Mail/maildir/maildir.tar
  45. +0 −100 demos/Zend/Mail/mbox/INBOX
  46. +0 −14 demos/Zend/Mail/mbox/subfolder/test
  47. BIN  demos/Zend/OpenId/login-bg.gif
  48. +0 −64 demos/Zend/OpenId/mvc_auth/application/controllers/ErrorController.php
  49. +0 −112 demos/Zend/OpenId/mvc_auth/application/controllers/IndexController.php
  50. +0 −12 demos/Zend/OpenId/mvc_auth/application/views/scripts/error/404.phtml
  51. +0 −12 demos/Zend/OpenId/mvc_auth/application/views/scripts/error/500.phtml
  52. +0 −17 demos/Zend/OpenId/mvc_auth/application/views/scripts/index/login.phtml
  53. +0 −14 demos/Zend/OpenId/mvc_auth/application/views/scripts/index/welcome.phtml
  54. +0 −2  demos/Zend/OpenId/mvc_auth/html/.htaccess
  55. +0 −1  demos/Zend/OpenId/mvc_auth/html/config.ini
  56. +0 −36 demos/Zend/OpenId/mvc_auth/html/index.php
  57. +0 −9 demos/Zend/OpenId/templates/identity.phtml
  58. +0 −10 demos/Zend/OpenId/templates/identity2.phtml
  59. +0 −83 demos/Zend/OpenId/templates/login.phtml
  60. +0 −14 demos/Zend/OpenId/templates/profile.phtml
  61. +0 −69 demos/Zend/OpenId/templates/register.phtml
  62. +0 −11 demos/Zend/OpenId/templates/registration_complete.phtml
  63. +0 −18 demos/Zend/OpenId/templates/trust.phtml
  64. +0 −68 demos/Zend/OpenId/test_auth.php
  65. +0 −128 demos/Zend/OpenId/test_consumer.php
  66. +0 −268 demos/Zend/OpenId/test_server.php
  67. +0 −268 demos/Zend/Pdf/demo.php
  68. BIN  demos/Zend/Pdf/stamp.jpg
  69. BIN  demos/Zend/Pdf/test.pdf
  70. +21 −28 demos/Zend/ProgressBar/JsPush.php
  71. +28 −32 demos/Zend/ProgressBar/Upload.php
  72. +67 −57 demos/Zend/ProgressBar/ZendForm.php
  73. +0 −57 demos/Zend/Search/Lucene/feed-search/create-index.php
  74. +0 −43 demos/Zend/Search/Lucene/feed-search/search-index.php
  75. +0 −97 demos/Zend/Search/Lucene/indexing/CreateIndex.php
  76. +0 −179 demos/Zend/Search/Lucene/indexing/IndexSource/about-pear.html
  77. +0 −235 demos/Zend/Search/Lucene/indexing/IndexSource/authors.html
  78. +0 −185 demos/Zend/Search/Lucene/indexing/IndexSource/contributing.bugs.html
  79. +0 −165 demos/Zend/Search/Lucene/indexing/IndexSource/contributing.documentation.html
  80. +0 −201 demos/Zend/Search/Lucene/indexing/IndexSource/contributing.html
  81. +0 −151 demos/Zend/Search/Lucene/indexing/IndexSource/contributing.newpackage.html
  82. +0 −274 demos/Zend/Search/Lucene/indexing/IndexSource/contributing.patches.html
  83. +0 −158 demos/Zend/Search/Lucene/indexing/IndexSource/contributing.wishlist.html
  84. +0 −196 demos/Zend/Search/Lucene/indexing/IndexSource/copyright.html
  85. +0 −159 demos/Zend/Search/Lucene/indexing/IndexSource/core.html
  86. +0 −32 demos/Zend/Service/LiveDocx/Bootstrap.php
  87. +0 −53 demos/Zend/Service/LiveDocx/DemoConfiguration.php.dist
  88. +0 −37 demos/Zend/Service/LiveDocx/MailMerge/bitmaps/generate-bitmaps.php
  89. BIN  demos/Zend/Service/LiveDocx/MailMerge/bitmaps/template-screenshot.png
  90. BIN  demos/Zend/Service/LiveDocx/MailMerge/bitmaps/template.docx
  91. BIN  demos/Zend/Service/LiveDocx/MailMerge/conference-pass/dailemaitre.jpg
  92. +0 −39 demos/Zend/Service/LiveDocx/MailMerge/conference-pass/generate-document.php
  93. BIN  demos/Zend/Service/LiveDocx/MailMerge/conference-pass/template.docx
  94. +0 −2  demos/Zend/Service/LiveDocx/MailMerge/constructors/credentials.ini
  95. +0 −35 demos/Zend/Service/LiveDocx/MailMerge/constructors/hosted-licensed.php
  96. +0 −34 demos/Zend/Service/LiveDocx/MailMerge/constructors/public-zend_config.php
  97. +0 −59 demos/Zend/Service/LiveDocx/MailMerge/constructors/public.php
  98. +0 −38 demos/Zend/Service/LiveDocx/MailMerge/convert/convert-document.php
  99. BIN  demos/Zend/Service/LiveDocx/MailMerge/convert/document.doc
  100. +0 −30 demos/Zend/Service/LiveDocx/MailMerge/images/delete-all.php
  101. +0 −31 demos/Zend/Service/LiveDocx/MailMerge/images/download.php
  102. BIN  demos/Zend/Service/LiveDocx/MailMerge/images/image-01.png
  103. BIN  demos/Zend/Service/LiveDocx/MailMerge/images/image-02.png
  104. +0 −30 demos/Zend/Service/LiveDocx/MailMerge/images/image-exists.php
  105. +0 −24 demos/Zend/Service/LiveDocx/MailMerge/images/list.php
  106. +0 −30 demos/Zend/Service/LiveDocx/MailMerge/images/upload.php
  107. +0 −259 demos/Zend/Service/LiveDocx/MailMerge/license-agreement/generate-document-concat.php
  108. +0 −85 demos/Zend/Service/LiveDocx/MailMerge/license-agreement/generate-document.php
  109. BIN  demos/Zend/Service/LiveDocx/MailMerge/license-agreement/template-screenshot.png
  110. BIN  demos/Zend/Service/LiveDocx/MailMerge/license-agreement/template.docx
  111. +0 −37 demos/Zend/Service/LiveDocx/MailMerge/metafiles/generate-metafiles.php
  112. BIN  demos/Zend/Service/LiveDocx/MailMerge/metafiles/template-screenshot.png
  113. BIN  demos/Zend/Service/LiveDocx/MailMerge/metafiles/template.docx
  114. +0 −46 demos/Zend/Service/LiveDocx/MailMerge/pdf-security/generate-document.php
  115. +0 −32 demos/Zend/Service/LiveDocx/MailMerge/pdf-security/show-document-access-options.php
  116. BIN  demos/Zend/Service/LiveDocx/MailMerge/pdf-security/template.docx
  117. +0 −13 demos/Zend/Service/LiveDocx/MailMerge/subtemplates/common.php
  118. BIN  demos/Zend/Service/LiveDocx/MailMerge/subtemplates/maintemplate.docx
  119. BIN  demos/Zend/Service/LiveDocx/MailMerge/subtemplates/maintemplate.png
  120. +0 −52 demos/Zend/Service/LiveDocx/MailMerge/subtemplates/set-ignore-sub-templates.php
  121. +0 −65 demos/Zend/Service/LiveDocx/MailMerge/subtemplates/set-sub-template-ignore-list.php
  122. BIN  demos/Zend/Service/LiveDocx/MailMerge/subtemplates/subtemplate1.docx
  123. BIN  demos/Zend/Service/LiveDocx/MailMerge/subtemplates/subtemplate2.docx
  124. +0 −64 demos/Zend/Service/LiveDocx/MailMerge/supported-fonts/show-supported-fonts-cached.php
  125. +0 −24 demos/Zend/Service/LiveDocx/MailMerge/supported-fonts/show-supported-fonts.php
  126. +0 −73 demos/Zend/Service/LiveDocx/MailMerge/supported-formats/show-supported-formats-cached.php
  127. +0 −33 demos/Zend/Service/LiveDocx/MailMerge/supported-formats/show-supported-formats.php
  128. +0 −82 demos/Zend/Service/LiveDocx/MailMerge/telephone-bill/generate-document.php
  129. BIN  demos/Zend/Service/LiveDocx/MailMerge/telephone-bill/template-screenshot.png
  130. BIN  demos/Zend/Service/LiveDocx/MailMerge/telephone-bill/template.doc
  131. +0 −81 demos/Zend/Service/LiveDocx/MailMerge/template-info/list-template-info.php
  132. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-1-text-field-screenshot.png
  133. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-1-text-field.doc
  134. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-1-text-field.docx
  135. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-2-text-fields-screenshot.png
  136. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-2-text-fields.doc
  137. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-2-text-fields.docx
  138. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-block-fields-screenshot.png
  139. BIN  demos/Zend/Service/LiveDocx/MailMerge/template-info/template-block-fields.doc
  140. +0 −30 demos/Zend/Service/LiveDocx/MailMerge/templates/delete-all.php
  141. +0 −31 demos/Zend/Service/LiveDocx/MailMerge/templates/download.php
  142. +0 −24 demos/Zend/Service/LiveDocx/MailMerge/templates/list.php
  143. BIN  demos/Zend/Service/LiveDocx/MailMerge/templates/template-1.docx
  144. BIN  demos/Zend/Service/LiveDocx/MailMerge/templates/template-2.docx
  145. +0 −30 demos/Zend/Service/LiveDocx/MailMerge/templates/template-exists.php
  146. +0 −30 demos/Zend/Service/LiveDocx/MailMerge/templates/upload.php
  147. +0 −337 demos/Zend/Service/LiveDocx/check-environment.php
  148. +0 −225 demos/Zend/Service/LiveDocx/library/Zend/Service/LiveDocx/Helper.php
  149. +0 −37 demos/Zend/Service/LiveDocx/run-all-demos.php
  150. +0 −214 demos/Zend/WebServices/Amazon/amazon-search.php
  151. +0 −162 demos/Zend/WebServices/Flickr/flickr-composite.php
  152. +0 −41 demos/Zend/WebServices/Flickr/flickr-search.php
  153. +0 −31 demos/Zend/WebServices/Protocols/xmlrpc-upc-lookup.php
  154. +0 −153 demos/Zend/WebServices/Yahoo/yahoo-multi-search.php
  155. +0 −18 demos/Zend/Wildfire/application/controllers/Boot/Zend-Db-Profiler-Firebug/IndexController.php
  156. +0 −13 demos/Zend/Wildfire/application/controllers/Boot/Zend-Log-Writer-Firebug/IndexController.php
  157. +0 −51 demos/Zend/Wildfire/application/controllers/ErrorController.php
  158. +0 −38 demos/Zend/Wildfire/application/controllers/IndexController.php
  159. +0 −91 demos/Zend/Wildfire/application/controllers/ZendDbProfilerFirebugController.php
  160. +0 −79 demos/Zend/Wildfire/application/controllers/ZendLogWriterFirebugController.php
  161. +0 −44 demos/Zend/Wildfire/application/controllers/ZendWildfirePluginFirePhpController.php
  162. +0 −16 demos/Zend/Wildfire/application/views/scripts/error/error.phtml
  163. +0 −57 demos/Zend/Wildfire/application/views/scripts/index/index.phtml
  164. +0 −16 demos/Zend/Wildfire/application/views/scripts/zend-db-profiler-firebug/test-logging.phtml
  165. +0 −16 demos/Zend/Wildfire/application/views/scripts/zend-db-profiler-firebug/test-multiple-databases.phtml
  166. 0  demos/Zend/Wildfire/application/views/scripts/zend-log-writer-firebug/test-error-controller.phtml
  167. +0 −16 demos/Zend/Wildfire/application/views/scripts/zend-log-writer-firebug/test-large-message.phtml
  168. +0 −16 demos/Zend/Wildfire/application/views/scripts/zend-log-writer-firebug/test-logging.phtml
  169. +0 −16 demos/Zend/Wildfire/application/views/scripts/zend-wildfire-plugin-firephp/test-groups.phtml
  170. +0 −6 demos/Zend/Wildfire/public/.htaccess
  171. +0 −51 demos/Zend/Wildfire/public/Boot/Zend-Db-Profiler-Firebug/TestDocExample.php
  172. +0 −41 demos/Zend/Wildfire/public/Boot/Zend-Log-Writer-Firebug/TestDocExample.php
  173. +0 −66 demos/Zend/Wildfire/public/index.php
  174. +28 −0 demos/Zend/XmlRpc/xmlrpc-upc-lookup.php
  175. +0 −21 documentation/manual/.gitignore
  176. +0 −89 documentation/manual/Makefile
  177. +0 −71 documentation/manual/README.txt
  178. +0 −157 documentation/manual/ar/Makefile.in
  179. +0 −88 documentation/manual/ar/README
  180. +0 −87 documentation/manual/ar/configure.in
  181. BIN  documentation/manual/ar/figures/MVC-Flow-Diagram.png
  182. +0 −91 documentation/manual/ar/html/dbstyle.css
  183. +0 −202 documentation/manual/ar/module_specs/Zend_Cache-Backends.xml
  184. +0 −711 documentation/manual/ar/module_specs/Zend_Cache-Frontends.xml
  185. +0 −131 documentation/manual/ar/module_specs/Zend_Cache-Introduction.xml
  186. +0 −127 documentation/manual/ar/module_specs/Zend_Cache-Theory.xml
  187. +0 −54 documentation/manual/ar/module_specs/Zend_Config-Introduction.xml
  188. +0 −54 documentation/manual/ar/module_specs/Zend_Config-TheoryOfOperation.xml
  189. +0 −65 documentation/manual/ar/module_specs/Zend_Config_Ini.xml
  190. +0 −69 documentation/manual/ar/module_specs/Zend_Config_Xml.xml
  191. +0 −61 documentation/manual/ar/module_specs/Zend_Filter.xml
  192. +0 −15 documentation/manual/ar/module_specs/Zend_Json-Basics.xml
  193. +0 −17 documentation/manual/ar/module_specs/Zend_Json-Introduction.xml
  194. +0 −33 documentation/manual/ar/module_specs/Zend_Json-Objects.xml
  195. +0 −24 documentation/manual/ar/module_specs/Zend_Service.xml
  196. +0 −152 documentation/manual/ar/module_specs/Zend_View-Controllers.xml
  197. +0 −171 documentation/manual/ar/module_specs/Zend_View-Scripts.xml
  198. +0 −18 documentation/manual/ar/module_specs/Zend_XmlRpc.xml
  199. +0 −16 documentation/manual/ar/ref/copyrights.xml
  200. +0 −32 documentation/manual/ar/ref/language-snippets.xml
  201. +0 −157 documentation/manual/bg/Makefile.in
  202. +0 −88 documentation/manual/bg/README
  203. +0 −87 documentation/manual/bg/configure.in
  204. BIN  documentation/manual/bg/figures/zend.controller.basics.png
  205. BIN  documentation/manual/bg/figures/zend.db.adapter.example-database.png
  206. +0 −79 documentation/manual/bg/html/dbstyle.css
  207. +0 −96 documentation/manual/bg/module_specs/Zend_Acl-Advanced.xml
  208. +0 −342 documentation/manual/bg/module_specs/Zend_Acl.xml
  209. +0 −32 documentation/manual/bg/ref/language-snippets.xml
  210. +0 −157 documentation/manual/cs/Makefile.in
  211. +0 −88 documentation/manual/cs/README
  212. +0 −87 documentation/manual/cs/configure.in
  213. BIN  documentation/manual/cs/figures/MVC-Flow-Diagram.png
  214. +0 −79 documentation/manual/cs/html/dbstyle.css
  215. +0 −67 documentation/manual/cs/module_specs/Zend_Debug.xml
  216. +0 −31 documentation/manual/cs/module_specs/Zend_Exception.xml
  217. +0 −16 documentation/manual/cs/module_specs/Zend_Json-Basics.xml
  218. +0 −28 documentation/manual/cs/module_specs/Zend_Json-Introduction.xml
  219. +0 −41 documentation/manual/cs/module_specs/Zend_Json-Objects.xml
  220. +0 −113 documentation/manual/cs/module_specs/Zend_Json-xml2json.xml
  221. +0 −21 documentation/manual/cs/module_specs/Zend_Server.xml
  222. +0 −74 documentation/manual/cs/module_specs/Zend_Service.xml
  223. +0 −31 documentation/manual/cs/module_specs/Zend_Version.xml
  224. +0 −16 documentation/manual/cs/ref/copyrights.xml
  225. +0 −84 documentation/manual/cs/ref/installation.xml
  226. +0 −32 documentation/manual/cs/ref/language-snippets.xml
  227. +0 −19 documentation/manual/cs/ref/overview.xml
  228. +0 −954 documentation/manual/cs/ref/requirements.xml
  229. +0 −157 documentation/manual/de/Makefile.in
  230. +0 −55 documentation/manual/de/README
  231. +0 −63 documentation/manual/de/configure.in
  232. BIN  documentation/manual/de/figures/learning.quickstart.create-form.png
  233. BIN  documentation/manual/de/figures/learning.quickstart.create-model.png
  234. BIN  documentation/manual/de/figures/learning.quickstart.intro.mvc.png
  235. BIN  documentation/manual/de/figures/zend.barcode.introduction.example-1.png
  236. BIN  documentation/manual/de/figures/zend.barcode.objects.details.code25.png
  237. BIN  documentation/manual/de/figures/zend.barcode.objects.details.ean13.png
  238. BIN  documentation/manual/de/figures/zend.barcode.objects.details.ean2.png
  239. BIN  documentation/manual/de/figures/zend.barcode.objects.details.ean5.png
  240. BIN  documentation/manual/de/figures/zend.barcode.objects.details.ean8.png
  241. BIN  documentation/manual/de/figures/zend.barcode.objects.details.error.png
  242. BIN  documentation/manual/de/figures/zend.barcode.objects.details.identcode.png
  243. BIN  documentation/manual/de/figures/zend.barcode.objects.details.int25.png
  244. BIN  documentation/manual/de/figures/zend.barcode.objects.details.itf14.png
  245. BIN  documentation/manual/de/figures/zend.barcode.objects.details.leitcode.png
  246. BIN  documentation/manual/de/figures/zend.barcode.objects.details.planet.png
  247. BIN  documentation/manual/de/figures/zend.barcode.objects.details.postnet.png
  248. BIN  documentation/manual/de/figures/zend.barcode.objects.details.royalmail.png
  249. BIN  documentation/manual/de/figures/zend.barcode.objects.details.upca.png
  250. BIN  documentation/manual/de/figures/zend.barcode.objects.details.upce.png
  251. BIN  documentation/manual/de/figures/zend.controller.basics.png
  252. BIN  documentation/manual/de/figures/zend.db.adapter.example-database.png
  253. BIN  documentation/manual/de/figures/zend.layout.quickstart.example.png
  254. BIN  documentation/manual/de/figures/zend.log.writers.zendmonitor-event.png
  255. BIN  documentation/manual/de/figures/zend.log.writers.zendmonitor-events.png
  256. BIN  documentation/manual/de/figures/zend.openid.protocol.jpg
  257. BIN  documentation/manual/de/figures/zend.paginator.usage.rendering.control.png
  258. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.advanced-mergefieldblockformat.png
  259. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.advanced-mergefieldblockformat_zoom.png
  260. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.advanced-mswordblocksdocument.png
  261. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.advanced-mswordblocksdocument_zoom.png
  262. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.advanced-mswordblockstemplate.png
  263. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.advanced-mswordblockstemplate_zoom.png
  264. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.bitmaps-documentpage1.png
  265. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.bitmaps-documentpage1_zoom.png
  266. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.bitmaps-documentpage2.png
  267. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.bitmaps-documentpage2_zoom.png
  268. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.generation-diabasic.png
  269. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.generation-diabasic_zoom.png
  270. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-msworddialog.png
  271. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-msworddialog_zoom.png
  272. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-msworddocument.png
  273. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-msworddocument_zoom.png
  274. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-mswordtemplatecropped.png
  275. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-mswordtemplatecropped_zoom.png
  276. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-mswordtemplatefull.png
  277. BIN  documentation/manual/de/figures/zend.service.livedocx.mailmerge.templates-mswordtemplatefull_zoom.png
  278. BIN  documentation/manual/de/figures/zend.tool.framework.clihelp.png
  279. BIN  documentation/manual/de/figures/zend.tool.framework.cliversionunix.png
  280. BIN  documentation/manual/de/figures/zend.tool.framework.cliversionwin32.png
  281. BIN  documentation/manual/de/figures/zend.wildfire.firebug.console.png
  282. +0 −79 documentation/manual/de/html/dbstyle.css
  283. +0 −100 documentation/manual/de/module_specs/Zend_Acl-Advanced.xml
  284. +0 −187 documentation/manual/de/module_specs/Zend_Acl-Refining.xml
  285. +0 −398 documentation/manual/de/module_specs/Zend_Acl.xml
  286. +0 −797 documentation/manual/de/module_specs/Zend_Amf-Server.xml
  287. +0 −22 documentation/manual/de/module_specs/Zend_Amf.xml
  288. +0 −490 documentation/manual/de/module_specs/Zend_Auth.xml
  289. +0 −360 documentation/manual/de/module_specs/Zend_Auth_Adapter_DbTable.xml
  290. +0 −127 documentation/manual/de/module_specs/Zend_Auth_Adapter_Digest.xml
  291. +0 −329 documentation/manual/de/module_specs/Zend_Auth_Adapter_Http.xml
Sorry, we could not display the entire diff because too many files (11,941) changed.
View
4 .gitignore
@@ -5,4 +5,6 @@ nbproject
.settings/
tmp/
.DS_Store
-composer.lock
+composer.lock
+.*.sw*
+.*.un~
View
11 .travis.yml
@@ -7,11 +7,16 @@ php:
before_install:
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- - curl -s http://getcomposer.org/installer | php
- - php composer.phar install --dev
+ - composer self-update
+ - composer install --dev
+ - wget http://cs.sensiolabs.org/get/php-cs-fixer.phar
script:
- php ./tests/run-tests.php
+ - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 library); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
+ - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 tests); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
+ - output=$(php php-cs-fixer.phar fix -v --dry-run --level=psr2 bin); if [[ $output ]]; then while read -r line; do echo -e "\e[00;31m$line\e[00m"; done <<< "$output"; false; fi;
notifications:
- irc: "irc.freenode.org#zftalk.2"
+ irc: "irc.freenode.org#zftalk.dev"
+ email: false
View
426 CHANGELOG.md
@@ -0,0 +1,426 @@
+# CHANGELOG
+
+## 2.0.4
+
+- 2808: Add serializer better inheritance and extension
+ (https://github.com/zendframework/zf2/issues/2808)
+- 2813: Add test on canonical name with the ServiceManager
+ (https://github.com/zendframework/zf2/issues/2813)
+- 2832: bugfix: The helper DateFormat does not cache correctly when a pattern is
+ set. (https://github.com/zendframework/zf2/issues/2832)
+- 2837: Add empty option before empty check
+ (https://github.com/zendframework/zf2/issues/2837)
+- 2843: change self:: with static:: in call-ing static property/method
+ (https://github.com/zendframework/zf2/issues/2843)
+- 2857: Unnecessary path assembly on return in
+ Zend\Mvc\Router\Http\TreeRouteStack->assemble() line 236
+ (https://github.com/zendframework/zf2/issues/2857)
+- 2867: Enable view sub-directories when using ModuleRouteListener
+ (https://github.com/zendframework/zf2/issues/2867)
+- 2872: Resolve naming conflicts in foreach statements
+ (https://github.com/zendframework/zf2/issues/2872)
+- 2878: Fix : change self:: with static:: in call-ing static property/method()
+ in other components ( all ) (https://github.com/zendframework/zf2/issues/2878)
+- 2879: remove unused const in Zend\Barcode\Barcode.php
+ (https://github.com/zendframework/zf2/issues/2879)
+- 2896: Constraints in Zend\Db\Metadata\Source\AbstractSource::getTable not
+ initalised (https://github.com/zendframework/zf2/issues/2896)
+- 2907: Fixed proxy adapter keys being incorrectly set due Zend\Http\Client
+ (https://github.com/zendframework/zf2/issues/2907)
+- 2909: Change format of Form element DateTime and DateTimeLocal
+ (https://github.com/zendframework/zf2/issues/2909)
+- 2921: Added Chinese translations for zf2 validate/captcha resources
+ (https://github.com/zendframework/zf2/issues/2921)
+- 2924: small speed-up of Zend\EventManager\EventManager::triggerListeners()
+ (https://github.com/zendframework/zf2/issues/2924)
+- 2929: SetCookie::getFieldValue() always uses urlencode() for cookie values,
+ even in case they are already encoded
+ (https://github.com/zendframework/zf2/issues/2929)
+- 2930: Add minor test coverage to MvcEvent
+ (https://github.com/zendframework/zf2/issues/2930)
+- 2932: Sessions: SessionConfig does not allow setting non-directory save path
+ (https://github.com/zendframework/zf2/issues/2932)
+- 2937: preserve matched route name within route match instance while
+ forwarding... (https://github.com/zendframework/zf2/issues/2937)
+- 2940: change 'Cloud\Decorator\Tag' to 'Cloud\Decorator\AbstractTag'
+ (https://github.com/zendframework/zf2/issues/2940)
+- 2941: Logical operator fix : 'or' change to '||' and 'and' change to '&&'
+ (https://github.com/zendframework/zf2/issues/2941)
+- 2952: Various Zend\Mvc\Router\Http routers turn + into a space in path
+ segments (https://github.com/zendframework/zf2/issues/2952)
+- 2957: Make Partial proxy to view render function
+ (https://github.com/zendframework/zf2/issues/2957)
+- 2971: Zend\Http\Cookie undefined self::CONTEXT_REQUEST
+ (https://github.com/zendframework/zf2/issues/2971)
+- 2976: Fix for #2541 (https://github.com/zendframework/zf2/issues/2976)
+- 2981: Controller action HttpResponse is not used by SendResponseListener
+ (https://github.com/zendframework/zf2/issues/2981)
+- 2983: replaced all calls to $this->xpath with $this->getXpath() to always
+ have... (https://github.com/zendframework/zf2/issues/2983)
+- 2986: Add class to file missing a class (fixes #2789)
+ (https://github.com/zendframework/zf2/issues/2986)
+- 2987: fixed Zend\Session\Container::exchangeArray
+ (https://github.com/zendframework/zf2/issues/2987)
+- 2994: Fixes #2993 - Add missing asterisk to method docblock
+ (https://github.com/zendframework/zf2/issues/2994)
+- 2997: Fixing abstract factory instantiation time
+ (https://github.com/zendframework/zf2/issues/2997)
+- 2999: Fix for GitHub issue 2579
+ (https://github.com/zendframework/zf2/issues/2999)
+- 3002: update master's resources/ja Zend_Validate.php message
+ (https://github.com/zendframework/zf2/issues/3002)
+- 3003: Adding tests for zendframework/zf2#2593
+ (https://github.com/zendframework/zf2/issues/3003)
+- 3006: Hotfix for #2497 (https://github.com/zendframework/zf2/issues/3006)
+- 3007: Fix for issue 3001 Zend\Db\Sql\Predicate\Between fails with min and max
+ ... (https://github.com/zendframework/zf2/issues/3007)
+- 3008: Hotfix for #2482 (https://github.com/zendframework/zf2/issues/3008)
+- 3009: Hotfix for #2451 (https://github.com/zendframework/zf2/issues/3009)
+- 3013: Solved Issue 2857 (https://github.com/zendframework/zf2/issues/3013)
+- 3025: Removing the separator between the hidden and the visible inputs. As
+ the... (https://github.com/zendframework/zf2/issues/3025)
+- 3027: Reduced #calls of plugin() in PhpRenderer using a cache mechanism
+ (https://github.com/zendframework/zf2/issues/3027)
+- 3029: Fixed the pre-commit script, missed the fix command
+ (https://github.com/zendframework/zf2/issues/3029)
+- 3030: Mark module as loaded before trigginer EVENT_LOAD_MODULE
+ (https://github.com/zendframework/zf2/issues/3030)
+- 3031: Zend\Db\Sql Fix for Insert's Merge and Set capabilities with simlar keys
+ (https://github.com/zendframework/zf2/issues/3031)
+
+
+## 2.0.3:
+
+- 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)
+
+
+## 2.0.2:
+
+- 2383: Changed unreserved char definition in Zend\Uri (ZF2-533) and added shell
+ escaping to the test runner (https://github.com/zendframework/zf2/pull/2383)
+- 2393: Trying to solve issue ZF2-558
+ (https://github.com/zendframework/zf2/pull/2393)
+- 2398: Segment route: add fix for optional groups within optional groups
+ (https://github.com/zendframework/zf2/pull/2398)
+- 2400: Use 'Router' in http env and 'HttpRouter' in cli
+ (https://github.com/zendframework/zf2/pull/2400)
+- 2401: Better precision for userland fmod algorithm
+ (https://github.com/zendframework/zf2/pull/2401)
+
+
+## 2.0.1:
+
+- 2285: Seed RouteMatch params as long as params is set. This permits setting an
+ empty array. (https://github.com/zendframework/zf2/pull/2285)
+- 2286: prepareNotFoundViewModel listner - eventResult as ViewModel if set
+ (https://github.com/zendframework/zf2/pull/2286)
+- 2290: <span>$label</span> only when filled
+ (https://github.com/zendframework/zf2/pull/2290)
+- 2292: Allow (int)0 in coomments count in entry feed
+ (https://github.com/zendframework/zf2/pull/2292)
+- 2295: force to check className parameters
+ (https://github.com/zendframework/zf2/pull/2295)
+- 2296: mini-fix in controller plugin manager
+ (https://github.com/zendframework/zf2/pull/2296)
+- 2297: fixed phpdoc in Zend\Mvc\ApplicationInterface
+ (https://github.com/zendframework/zf2/pull/2297)
+- 2298: Update to Date element use statements to make it clearer which DateTime
+ (https://github.com/zendframework/zf2/pull/2298)
+- 2300: FormRow translate label fix (#ZF2-516)
+ (https://github.com/zendframework/zf2/pull/2300)
+- 2302: Notifications now to #zftalk.dev
+ (https://github.com/zendframework/zf2/pull/2302)
+- 2306: Fix several cs (https://github.com/zendframework/zf2/pull/2306)
+- 2307: Removed comment about non existent Zend_Tool
+ (https://github.com/zendframework/zf2/pull/2307)
+- 2308: Fix pluginmanager get method error
+ (https://github.com/zendframework/zf2/pull/2308)
+- 2309: Add consistency with event name
+ (https://github.com/zendframework/zf2/pull/2309)
+- 2310: Update library/Zend/Db/Sql/Select.php
+ (https://github.com/zendframework/zf2/pull/2310)
+- 2311: Version update (https://github.com/zendframework/zf2/pull/2311)
+- 2312: Validator Translations (https://github.com/zendframework/zf2/pull/2312)
+- 2313: ZF2-336: Zend\Form adds enctype attribute as multipart/form-data
+ (https://github.com/zendframework/zf2/pull/2313)
+- 2317: Make Fieldset constructor consistent with parent Element class
+ (https://github.com/zendframework/zf2/pull/2317)
+- 2321: ZF2-534 Zend\Log\Writer\Syslog prevents setting application name
+ (https://github.com/zendframework/zf2/pull/2321)
+- 2322: Jump to cache-storing instead of returning
+ (https://github.com/zendframework/zf2/pull/2322)
+- 2323: Conditional statements improved(minor changes).
+ (https://github.com/zendframework/zf2/pull/2323)
+- 2324: Fix for ZF2-517: Zend\Mail\Header\GenericHeader fails to parse empty
+ header (https://github.com/zendframework/zf2/pull/2324)
+- 2328: Wrong \__clone method (https://github.com/zendframework/zf2/pull/2328)
+- 2331: added validation support for optgroups
+ (https://github.com/zendframework/zf2/pull/2331)
+- 2332: README-GIT update with optional pre-commit hook
+ (https://github.com/zendframework/zf2/pull/2332)
+- 2334: Mail\Message::getSubject() should return value the way it was set
+ (https://github.com/zendframework/zf2/pull/2334)
+- 2335: ZF2-511 Updated refactored names and other fixes
+ (https://github.com/zendframework/zf2/pull/2335)
+- 2336: ZF-546 Remove duplicate check for time
+ (https://github.com/zendframework/zf2/pull/2336)
+- 2337: ZF2-539 Input type of image should not have attribute value
+ (https://github.com/zendframework/zf2/pull/2337)
+- 2338: ZF2-543: removed linked but not implemented cache adapters
+ (https://github.com/zendframework/zf2/pull/2338)
+- 2341: Updated Zend_Validate.php pt_BR translation to 25.Jul.2011 EN Revision
+ (https://github.com/zendframework/zf2/pull/2341)
+- 2342: ZF2-549 Zend\Log\Formatter\ErrorHandler does not handle complex events
+ (https://github.com/zendframework/zf2/pull/2342)
+- 2346: updated Page\Mvc::isActive to check if the controller param was
+ tinkered (https://github.com/zendframework/zf2/pull/2346)
+- 2349: Zend\Feed Added unittests for more code coverage
+ (https://github.com/zendframework/zf2/pull/2349)
+- 2350: Bug in Zend\ModuleManager\Listener\LocatorRegistrationListener
+ (https://github.com/zendframework/zf2/pull/2350)
+- 2351: ModuleManagerInterface is never used
+ (https://github.com/zendframework/zf2/pull/2351)
+- 2352: Hotfix for AbstractDb and Csrf Validators
+ (https://github.com/zendframework/zf2/pull/2352)
+- 2354: Update library/Zend/Feed/Writer/AbstractFeed.php
+ (https://github.com/zendframework/zf2/pull/2354)
+- 2355: Allow setting CsrfValidatorOptions in constructor
+ (https://github.com/zendframework/zf2/pull/2355)
+- 2356: Update library/Zend/Http/Cookies.php
+ (https://github.com/zendframework/zf2/pull/2356)
+- 2357: Update library/Zend/Barcode/Object/AbstractObject.php
+ (https://github.com/zendframework/zf2/pull/2357)
+- 2358: Update library/Zend/ServiceManager/AbstractPluginManager.php
+ (https://github.com/zendframework/zf2/pull/2358)
+- 2359: Update library/Zend/Server/Method/Parameter.php
+ (https://github.com/zendframework/zf2/pull/2359)
+- 2361: Zend\Form Added extra unit tests and some code improvements
+ (https://github.com/zendframework/zf2/pull/2361)
+- 2364: Remove unused use statements
+ (https://github.com/zendframework/zf2/pull/2364)
+- 2365: Resolve undefined classes and constants
+ (https://github.com/zendframework/zf2/pull/2365)
+- 2366: fixed typo in Zend\View\HelperPluginManager
+ (https://github.com/zendframework/zf2/pull/2366)
+- 2370: Error handling in AbstractWriter::write using Zend\Stdlib\ErrorHandler
+ (https://github.com/zendframework/zf2/pull/2370)
+- 2372: Update library/Zend/ServiceManager/Config.php
+ (https://github.com/zendframework/zf2/pull/2372)
+- 2375: zend-inputfilter already requires
+ (https://github.com/zendframework/zf2/pull/2375)
+- 2376: Activate the new GitHub feature: Contributing Guidelines
+ (https://github.com/zendframework/zf2/pull/2376)
+- 2377: Update library/Zend/Mvc/Controller/AbstractController.php
+ (https://github.com/zendframework/zf2/pull/2377)
+- 2379: Typo in property name in Zend/Db/Metadata/Object/AbstractTableObject.php
+ (https://github.com/zendframework/zf2/pull/2379)
+- 2382: PHPDoc params in AbstractTableGateway.php
+ (https://github.com/zendframework/zf2/pull/2382)
+- 2384: Replace Router with Http router in url view helper
+ (https://github.com/zendframework/zf2/pull/2384)
+- 2387: Replace PHP internal fmod function because it gives false negatives
+ (https://github.com/zendframework/zf2/pull/2387)
+- 2388: Proposed fix for ZF2-569 validating float with trailing 0's (10.0,
+ 10.10) (https://github.com/zendframework/zf2/pull/2388)
+- 2391: clone in Filter\FilterChain
+ (https://github.com/zendframework/zf2/pull/2391)
+- Security fix: a number of classes were not using the Escaper component in
+ order to perform URL, HTML, and/or HTML attribute escaping. Please see
+ http://framework.zend.com/security/advisory/ZF2012-03 for more details.
View
77 CONTRIBUTING.md
@@ -0,0 +1,77 @@
+# CONTRIBUTING
+
+## RESOURCES
+
+If you wish to contribute to Zend Framework, please be sure to
+read/subscribe to the following resources:
+
+ - Coding Standards:
+ http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
+ - ZF Git Guide:
+ [README-GIT.md](README-GIT.md)
+ - Contributor's Guide:
+ http://framework.zend.com/participate/contributor-guide
+ - ZF Contributor's mailing list:
+ Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
+ Subscribe: zf-contributors-subscribe@lists.zend.com
+ - ZF Contributor's IRC channel:
+ #zftalk.dev on Freenode.net
+
+If you are working on new features, or refactoring an existing
+component, please create a proposal. You can do this in on the RFC's
+page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
+
+## RUNNING TESTS
+
+To run tests:
+
+- Make sure you have a recent version of PHPUnit installed; 3.6.0
+ minimally.
+- Enter the `tests/` subdirectory.
+- Execute PHPUnit, providing a path to a component directory for which
+ you wish to run tests, or a specific test class file.
+
+ ```sh
+ % phpunit ZendTest/Http
+ % phpunit ZendTest/Http/Header/EtagTest.php
+ ```
+
+- You may also provide the `--group` switch; in such cases, provide the
+ top-level component name:
+
+ ```sh
+ % phpunit --group Zend_Http
+ ```
+
+ This will likely lead to errors, so it's usually best to specify a
+ specific component in which to run test:
+
+ ```sh
+ % phpunit --group ZF-XYZ Zend/Http
+ ```
+- Alternately, use the `run-tests.php` script. This can be executed with no
+ arguments to run all tests:
+
+ ```sh
+ % php run-tests.php
+ ```
+
+ You can also provide top-level component names to run tests for individual
+ components or several components at a time. The component name is the the
+ component namespace, without the `Zend\` prefix:
+
+ ```sh
+ % php run-tests Mvc
+ ```
+
+ ```sh
+ % php run-tests ModuleManager Mvc View Navigation
+ ```
+
+You can turn on conditional tests with the TestConfiguration.php file.
+To do so:
+
+ - Enter the `tests/` subdirectory.
+ - Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
+ - Edit `TestConfiguration.php` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
View
4 INSTALL.md
@@ -6,8 +6,6 @@ and add the library directory to your PHP `include_path`. To use
components in the extras library, add the `extras/library` directory to
your PHP `include_path` as well.
-If you would like to use Zend_Tool, simply add `bin/zf.bat` (for Windows)
-or `bin/zf.sh` (for anything else) to your system executable path.
## SYSTEM REQUIREMENTS
-------------------
@@ -59,7 +57,7 @@ http://www.php.net/manual/en/configuration.changes.php
A great place to get up-to-speed quickly is the Zend Framework
QuickStart:
-http://framework.zend.com/manual/en/learning.quickstart.html
+http://framework.zend.com/manual/2.0/en/user-guide/overview.html
The QuickStart covers some of the most commonly used components of ZF.
Since Zend Framework is designed with a use-at-will architecture and
View
63 README-DEV.md
@@ -1,63 +0,0 @@
-# CONTRIBUTING
-
-## RESOURCES
-
-If you wish to contribute to Zend Framework, please be sure to
-read/subscribe to the following resources:
-
- - ZF2 Requirements:
- http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Requirements
- - Coding Standards:
- http://framework.zend.com/wiki/display/ZFDEV2/Coding+Standards
- - ZF Git Guide:
- [README-GIT.md](README-GIT.md)
- - Contributor's Guide:
- http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework
- - ZF Contributor's mailing list:
- Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
- Subscribe: zf-contributors-subscribe@lists.zend.com
- - ZF Contributor's IRC channel:
- #zftalk.2 on Freenode.net
-
-If you are working on new features, or refactoring an existing
-component, please create a proposal. You can do this in on the RFC's
-page, http://framework.zend.com/wiki/display/ZFDEV2/RFC%27s.
-
-## RUNNING TESTS
-
-The full test suite currently does not run! This is due to some
-components not yet being migrated to namespaces, as well as to some
-issues we've encountered in refactoring.
-
-To run tests:
-
- - Make sure you have a recent version of PHPUnit installed; 3.5.0
- minimally.
- - Enter the `tests/` subdirectory.
- - Execute PHPUnit, providing a path to a component directory for which
- you wish to run tests, or a specific test class file.
-
- ```sh
- % phpunit ZendTest/Application
- % phpunit ZendTest/Application/Resource/CacheManagerTest.php
- ```
-
- - You may also provide the `--group` switch; in such cases, provide the
- top-level component name:
-
- ```sh
- % phpunit --group Zend_Application
- ```
- This will likely lead to errors, so it's usually best to specify a
- specific component in which to run test:
-
- ```sh
- % phpunit --group ZF-XYZ Zend/Application
- ```
-You can turn on conditional tests with the TestConfiguration.php file.
-To do so:
-
- - Enter the `tests/` subdirectory.
- - Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
- - Edit `TestConfiguration.php` to enable any specific functionality you
- want to test, as well as to provide test values to utilize.
View
173 README-GIT.md
@@ -1,29 +1,19 @@
# USING THE GIT REPOSITORY
-## Initial Setup
-
-First, make sure you know the email address associated with your JIRA
-credentials. All commits pushed to the master repository are checked
-against these addresses, so your repository will need to be configured
-to use that address. The following will give you that information:
-
- 1. Visit the ZF Crowd install: http://framework.zend.com/crowd
- 2. Log in, if you aren't.
- 3. Find the "My Profile" link in the upper right of the page, and follow
- it.
- 4. The resulting page will display your profile, including the _email_
- address with which you are registered. Make a note of it.
-
## Setup your own public repository
-Your next step is to establish a public repository from which we can
+Your first step is to establish a public repository from which we can
pull your work into the master repository. You have two options: use
-github or other public site, or setup/use your own repository.
+GitHub or other public site, or setup/use your own repository.
+
+While you can use a private repository and utilize ``git format-patch`` to
+submit patches, this is discouraged as it does not facilitate public peer
+review.
### Option 1: GitHub
1. Setup a GitHub account (http://github.com/), if you haven't yet
- 2. Fork the ZF2 respository (http://github.com/zendframework/zf2)
+ 2. Fork the ZF2 repository (http://github.com/zendframework/zf2)
3. Clone your fork locally and enter it (use your own GitHub username
in the statement below)
@@ -32,14 +22,7 @@ github or other public site, or setup/use your own repository.
% cd zf2
```
- 4. Configure git to use the email address with which you are registered
- in JIRA:
-
- ```sh
- % git config user.email <your email address>
- ```
-
- 5. Add a remote to the canonical ZF repository, so you can keep your fork
+ 4. Add a remote to the canonical ZF repository, so you can keep your fork
up-to-date:
```sh
@@ -49,10 +32,10 @@ github or other public site, or setup/use your own repository.
### Option 2: Personal Repository
-We assume you will use gitosis (http://progit.org/book/ch4-7.html) or gitolite
-(http://progit.org/book/ch4-8.html) to host your own repository. If
-you go this route, we will assume you have the knowledge to do so, or
-know where to obtain it. We will not assist you in setting up such a
+We assume you will use gitosis (http://git-scm.com/book/en/Git-on-the-Server-Gitosis)
+or gitolite (http://git-scm.com/book/en/Git-on-the-Server-Gitolite) to host your
+own repository. If you go this route, we will assume you have the knowledge to
+do so, or know where to obtain it. We will not assist you in setting up such a
repository.
1. Create a new repository
@@ -61,33 +44,26 @@ repository.
% git init
```
- 2. Configure git to use the email address with which you are registered
- in JIRA:
-
- ```sh
- % git config user.email <your email address>
- ```
-
- 3. Add an "origin" remote pointing to your gitosis/gitolite repo:
+ 2. Add an "origin" remote pointing to your gitosis/gitolite repo:
```sh
% git remote add origin git://yourdomain/yourrepo.git
```
- 4. Add a remote for the ZF repository and fetch it
+ 3. Add a remote for the ZF repository and fetch it
```sh
% git remote add zf2 https://github.com/zendframework/zf2.git
% git fetch zf2
```
- 5. Create a new branch for the ZF repository (named "zf/master" here)
+ 4. Create a new branch for the ZF repository (named "zf/master" here)
```sh
% git checkout -b zf/master zf2/master
```
- 6. Create your master branch off the ZF branch, and push to your
+ 5. Create your master branch off the ZF branch, and push to your
repository
```sh
@@ -95,6 +71,87 @@ repository.
% git push origin HEAD:master
```
+### Pre-Commit Hook (Optional)
+
+The ZF2 Travis-CI will confirm that code style standards are met
+by using ```php-cs-fixer``` (https://github.com/fabpot/PHP-CS-Fixer) during it's build runs.
+
+To reduce the number of red Travis-CI builds, the following Git pre-commit hook
+can help catch code style issues before committing. Save it as
+```.git/hooks/pre-commit```, and make sure it is executable.
+
+```php
+#!/usr/bin/env php
+<?php
+/**
+ * .git/hooks/pre-commit
+ *
+ * This pre-commit hooks will check for PHP errors (lint), and make sure the
+ * code is PSR-2 compliant.
+ *
+ * Dependecy: PHP-CS-Fixer (https://github.com/fabpot/PHP-CS-Fixer)
+ *
+ * @author Mardix http://github.com/mardix
+ * @author Matthew Weier O'Phinney http://mwop.net/
+ * @since 4 Sept 2012
+ */
+
+$exit = 0;
+
+/*
+ * collect all files which have been added, copied or
+ * modified and store them in an array called output
+ */
+$output = array();
+exec('git diff --cached --name-status --diff-filter=ACM', $output);
+
+foreach ($output as $file) {
+ if ('D' === substr($file, 0, 1)) {
+ // deleted file; do nothing
+ continue;
+ }
+
+ $fileName = trim(substr($file, 1));
+
+ /*
+ * Only PHP files
+ */
+ $extension = pathinfo($fileName, PATHINFO_EXTENSION);
+ if (!preg_match('/^ph(p|tml)$/', $extension)) {
+ continue;
+ }
+
+ /*
+ * Check for parse errors
+ */
+ $output = array();
+ $return = 0;
+ exec("php -l " . escapeshellarg($fileName), $output, $return);
+
+ if ($return != 0) {
+ echo "PHP file fails to parse: " . $fileName . ":" . PHP_EOL;
+ echo implode(PHP_EOL, $lintOutput) . PHP_EOL;
+ $exit = 1;
+ continue;
+ }
+
+ /*
+ * PHP-CS-Fixer
+ */
+ $output = array();
+ $return = null;
+ exec("php-cs-fixer fix --dry-run --level=psr2 " . escapeshellarg($fileName), $output, $return);
+ if ($return != 0 || !empty($output)) {
+ echo "PHP file fails contains CS issues: " . $fileName . ":" . PHP_EOL;
+ echo implode(PHP_EOL, $output) . PHP_EOL;
+ $exit = 1;
+ continue;
+ }
+}
+
+exit($exit);
+```
+
## Keeping Up-to-Date
Periodically, you should update your fork or personal repository to
@@ -110,6 +167,10 @@ the following:
% git push origin
```
+If you're tracking other branches -- for example, the "develop" branch, where
+new feature development occurs -- you'll want to do the same operations for that
+branch; simply substibute "develop" for "master".
+
## Working on Zend Framework
When working on Zend Framework, we recommend you do each new feature or
@@ -169,6 +230,16 @@ email indicating you have changes to pull:
- The nature of the changes (e.g., `implements
Zend_Service_Twitter`, `fixes ZF-9295`, etc.)
+### What branch to issue the pull request against?
+
+Which branch should you issue a pull request against?
+
+- For fixes against the stable release, issue the pull request against the
+ "master" branch.
+- For new features, or fixes that introduce new elements to the public API (such
+ as new public methods or properties), issue the pull request against the
+ "develop" branch.
+
## Branch Cleanup
As you might imagine, if you are a frequent contributor, you'll start to
@@ -198,24 +269,10 @@ RSS feeds may be found at:
where &lt;branch&gt; is a branch in the repository.
-To subscribe to git email notifications, send an email to:
-
-<zf-git-subscribe@lists.zend.com>
-
-You will need to reply to the verification email sent to you by this
-list.
-
-Should you wish to filter emails from the list, they will use the
-"subject" line of commit messages, preceded by `[branch] `, and come
-from <zf-git@lists.zend.com>.
+To subscribe to git email notifications, simply watch or fork the zf2 repository
+on GitHub.
## CONTRIBUTORS AND COMMITTERS
-For the immediate future, and until we create a community process team,
-only the Zend team will be committers. If you have a patch or
-feature-set you wish to have incorporated into the repository, please
-issue a pull request to a committer. A pull request may be done by using
-git's "git-send-email" functionality, or by sending a request to a
-committer indicating the URL of your repository, the branch that should
-be pulled, and/or the specific revision(s) to pull.
-
+Both Zend's internal Zend Framework team and the members of the Community Review
+team have push privileges to the ZF2 repository.
View
175 README.md
@@ -1,155 +1,20 @@
-### Welcome to the *Zend Framework 2.0.0* Release!
+### Welcome to the *Zend Framework 2.1* Release!
Master: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=master)](http://travis-ci.org/zendframework/zf2)
+Develop: [![Build Status](https://secure.travis-ci.org/zendframework/zf2.png?branch=develop)](http://travis-ci.org/zendframework/zf2)
## RELEASE INFORMATION
-*Zend Framework 2.0.0beta5*
-
-6 July 2012
-
-THIS RELEASE IS A DEVELOPMENT RELEASE AND NOT INTENDED FOR PRODUCTION USE.
-PLEASE USE AT YOUR OWN RISK.
-
-This is the fifth and last in a series of planned beta releases. The
-beta release cycle has followed the "gmail" style of betas, whereby new
-features have been added in each new release, and BC has not been
-guaranteed.
-
-Following this release, we plan to perform some repository cleanup, a
-standards audit, and documentation migration. Once these tasks are
-complete, we will prepare our first Release Candidate (RC).
-
-### NEW FEATURES IN BETA5
-
-PLEASE NOTE: this beta includes a number of breaks from the previous
-beta. Please read the notes below prefixed with "BC BREAK" for specific
-breakages. The ZendSkeletonApplication typically reflects any BC changes
-that have been made, and is a good resource.
-
- - Escaper component (Padraic Brady)
- - Provides context-specific escaping mechanisms for HTML content,
- HTML attributes, URLs, CSS, and JavaScript.
- - BC BREAK: The escape() view helper was removed, and replaced with
- escapeHtml(), escapeHtmlAttr(), escapeJs(), escapeCss(), and
- escapeUrl() implementations.
- - New I18n component (Ben Scholzen, Chris Martin, Dennis Portnov,
- Matthew Weier O'Phinney)
- - New component leveraging PHP's ext/intl extension to provide
- internationalization (i18n) and localization (L10n) features and
- capabilities to applications.
- - LEVERAGES:
- - DateTime, DateTimezone, IntlDateFormatter
- - Locale
- - NumberFormatter
- - BC BREAK: REMOVES the following components:
- - Zend\Currency
- - Zend\Date
- - Zend\Locale
- - Zend\Measure
- - Zend\Translator
- - All filters, validators, and view helpers that relied on the
- above.
- - PROVIDES:
- - Zend\I18n\Translator, including support for gettext and
- PHP-array-based translations (more are planned).
- - Zend\I18n\Filter, containing localized filtering capabilites
- for Alnum (alphanumeric), Alpha (alphabetic), and NumberFormat
- (numerical strings).
- - Zend\I18n\Validator, containing localized validation
- capabilities for Alnum (alphanumeric), Alpha (alphabetic),
- Iban (international bank account number standard), Int
- (integer), and PostCode (localized postal codes).
- - Zend\I18n\View, containing localized view helpers for
- CurrencyFormat, DateFormat, NumberFormat, Translate, and
- TranslatePlural.
- - Db layer additions (Ralph Schindler, Rob Allen, Guillaume Metayer,
- Sascha Howe, Chris Testroet, Evan Coury, Ben Youngblood)
- - Metadata support
- - Postgresql adapter/driver
- - New HydratingResultSet, allowing the ability to specify a custom
- hydrator (from Zend\Stdlib\Hydrator) for hydrating row objects.
- - Many bugfixes and stabilizations
- - Form additions (Matthew Weier O'Phinney, Michaël Gallego, Yanick Rochon)
- - Annotations support: Ability to use annotations with a domain
- object in order to define a form, fieldsets, elements, inputs and
- input filters, and more.
- - Hydration of fieldsets; fieldsets may compose their own hydrators
- if desired.
- - Collection support; allows multiple instances of the same
- fieldset. As an example, you might have an interface that
- allows adding a set of form elements via an XHR call; on the
- backend, these would be defined as a collection, allowing
- arbitrary numbers of these fieldsets to be submitted.
- - New view helpers covering most HTML5-specific element types, most
- XHTML-specific element types. Additionally, a number of the
- HTML5-specific element types now have Element implementations to
- create turn-key solutions that include validation and filtering.
- - BC BREAK: Options support. Many attributes were being used not as
- HTML attributes but to define behavior. The ElementInterface now
- has an accessor and mutator for options. Examples of options
- include labels for non-radio/checkbox/select elements, the CAPTCHA
- adapter for CAPTCHA elements, CSRF tokens, etc. If you were
- defining labels in your forms, please move the label and label
- attributes definitions from the "attributes" to the "options" of
- the element, fieldset, or form.
- - BC BREAK: new interface, ElementPrepareAwareInterface, defining
- the method "prepareElement(Form $form)". The FieldsetInterface,
- and, by extension, FormInterface, extend this new interface. It is
- used to allow preparing elements prior to creating a
- representation.
- - MVC additions (Kyle Spraggs, Evan Coury, Matthew Weier O'Phinney)
- - New "Params" controller plugin. Allows retrieving query, post,
- cookie, header, and route parameters. Usage is
- $this->params()->fromQuery($name, $default).
- - New listener, Zend\Mvc\ModuleRouteListener. When enabled, if a
- route match contains a "\__NAMESPACE__" key, that namespace value
- will be prepended to the value of the "controller" key. This
- should typically be used in the root route for a given module, to
- ensure controller names do not clash.
- - Bootstrap simplification. A new "init()" method was created that
- accepts the path to a configuration file, and then creates and
- bootstraps the application; this eliminates all common boilerplate
- for the bootstrap scripts.
- - Hydrator changes (Adam Lundrigan)
- - BC BREAK: the ClassMethods hydrator now assumes by default that
- it should convert between underscore_separated names and
- camelCase.
- - BC BREAK: Doctrine Annotations Parser (Matthew Weier O'Phinney, Marco
- Pivetta, Guilherme Blanco)
- - Zend\Code\Annotation now has a dependency on Doctrine\Common for
- its annotation parser.
- - Annotations now conform to Doctrine's standards by default, but
- the AnnotationManager in ZF2 allows attaching alternate parsers
- for specific annotation types.
- - BC BREAK: Removal of Plugin Broker usage (Matthew Weier O'Phinney,
- Evan Coury)
- - All uses of the Plugin Broker / Plugin Class Locator combination
- were removed. A new class, Zend\ServiceManager\AbstractPluginManager,
- was created and used to replace all previous usages of the plugin
- broker. This provides more flexibility in creation of plugins, as
- well as reduces the number of APIs developers need to learn.
- - Configuration of plugin managers is now done at the top-level. All
- plugin manager configuration follows the format utilized by
- Zend\ServiceManager\ServiceConfiguration, and
- Zend\ModuleManager\Listener\ServiceListener has been updated to
- allow informing it of plugin manager instances it should manage,
- as well as the configuration key to utilize.
- - BC BREAK: Coding Standards (Maks3w, Sascha Prolic, Rob Allen)
- - Renamed most abstract classes to prefix them with the term
- "Abstract". In particular, ActionController and RestfulController
- are now AbstractActionController and AbstractRestfulController.
- - Renamed getters in HTTP, EventManager, and Mail components. These
- components were using accessors such as "events()", "query()",
- "headers()", etc. All such accessors were renamed to prepend
- "get", and, in the case of "events()", renamed to indicate the
- actual object retrieved ("getEventManager()").
- - SECURITY FIX: XmlRpc (Matthew Weier O'Phinney)
- - A security issue arising from XML eXternal Entity (XXE) injection
- was patched; see http://framework.zend.com/security/advisory/ZF2012-01
-
-Over *400* pull requests for a variety of features and bugfixes were handled
-since beta4!
+*Zend Framework 2.1.0dev*
+
+This is the first minor (feature) release for the 2.0 series.
+
+20 Nov 2012
+
+### UPDATES IN 2.1.0
+
+
+Please see CHANGELOG.md.
### SYSTEM REQUIREMENTS
@@ -158,12 +23,12 @@ latest PHP version whenever possible.
### INSTALLATION
-Please see [INSTALL.md](INSTALL.md).
+Please see INSTALL.md.
### CONTRIBUTING
-If you wish to contribute to Zend Framework 2.0, please read both the
-[README-DEV.md](README-DEV.md) and [README-GIT.md](README-GIT.md) file.
+If you wish to contribute to Zend Framework, please read both the
+CONTRIBUTING.md and README-GIT.md file.
### QUESTIONS AND FEEDBACK
@@ -171,13 +36,13 @@ Online documentation can be found at http://framework.zend.com/manual.
Questions that are not addressed in the manual should be directed to the
appropriate mailing list:
-http://framework.zend.com/wiki/display/ZFDEV/Mailing+Lists
+http://framework.zend.com/archives/subscribe/
If you find code in this release behaving in an unexpected manner or
-contrary to its documented behavior, please create an issue in the Zend
-Framework issue tracker at:
+contrary to its documented behavior, please create an issue in our GitHub
+issue tracker:
-http://framework.zend.com/issues/browse/ZF2
+https://github.com/zendframework/zf2/issues
If you would like to be notified of new releases, you can subscribe to
the fw-announce mailing list by sending a blank message to
@@ -186,7 +51,7 @@ the fw-announce mailing list by sending a blank message to
### LICENSE
The files in this archive are released under the Zend Framework license.
-You can find a copy of this license in [LICENSE.txt](LICENSE.txt).
+You can find a copy of this license in LICENSE.txt.
### ACKNOWLEDGEMENTS
View
27 bin/classmap_generator.php
@@ -1,23 +1,11 @@
#!/usr/bin/env php
<?php
/**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
*
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Loader
- * @subpackage Exception
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
*/
use Zend\Console;
@@ -159,17 +147,18 @@
// Get the ClassFileLocator, and pass it the library path
$l = new ClassFileLocator($libraryPath);
-// Iterate over each element in the path, and create a map of
+// Iterate over each element in the path, and create a map of
// classname => filename, where the filename is relative to the library path
$map = new stdClass;
foreach ($l as $file) {
- $namespace = empty($file->namespace) ? '' : $file->namespace . '\\';
$filename = str_replace($libraryPath . '/', '', str_replace(DIRECTORY_SEPARATOR, '/', $file->getPath()) . '/' . $file->getFilename());
// Add in relative path to library
$filename = $relativePathForClassmap . $filename;
- $map->{$namespace . $file->classname} = $filename;
+ foreach ($file->getClasses() as $class) {
+ $map->{$class} = $filename;
+ }
}
if ($appending) {
View
12 bin/createAutoloadTestClasses.php
@@ -2,9 +2,9 @@
/**
* createAutoloadTestClasses.php
*
- * A script for creating a hierarchy of classes for use with testing
- * autoloading. Each directory has classes from a to p; additional classes are
- * generated 2 levels deep, giving a total of 16^3 classes to use in
+ * A script for creating a hierarchy of classes for use with testing
+ * autoloading. Each directory has classes from a to p; additional classes are
+ * generated 2 levels deep, giving a total of 16^3 classes to use in
* autoloading tests.
*/
@@ -12,11 +12,7 @@ function createClasses($depth, $namespace)
{
foreach (range('a', 'p') as $letter) {
// Create content for namespaced class
- $content =<<<EOT
-<?php
-namespace $namespace;
-class $letter { }
-EOT;
+ $content = "<?php\nnamespace $namespace;\nclass $letter { }";
// Write content to disk
$dir = str_replace('\\', DIRECTORY_SEPARATOR, $namespace);
View
135 bin/docbook_skeleton.php
@@ -1,135 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_DocBook
- * @subpackage Exception
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-use Zend\Console;
-use Zend\DocBook\ClassParser;
-use Zend\DocBook\SkeletonGenerator;
-use Zend\Code\Reflection\ClassReflection as ReflectionClass;
-use Zend\Loader\StandardAutoloader;
-
-/**
- * Generate Docbook XML skeleton for a given class as a documentation stub.
- *
- * Additionally, it parses all public methods of the class and creates stub
- * documentation for each in the "Available Methods" section of the class
- * documentation.
- *
- * Usage:
- * --help|-h Get usage message
- * --class|-c [ <string> ] Class name for which to provide documentation
- * --output|-o [ <string> ] Where to write generated documentation. By default,
- * assumes documentation/manual/en/module_specs, in a
- * file named after the provided class (in the form of
- * "zend.component.class-name.xml")
- */
-
-$libPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
-if (!is_dir($libPath)) {
- // Try to load StandardAutoloader from include_path
- if (false === include('Zend/Loader/StandardAutoloader.php')) {
- echo "Unable to locate autoloader via include_path; aborting" . PHP_EOL;
- exit(2);
- }
-} else {
- // Try to load StandardAutoloader from library
- if (false === include($libPath . '/Zend/Loader/StandardAutoloader.php')) {
- echo "Unable to locate autoloader via library; aborting" . PHP_EOL;
- exit(2);
- }
-}
-
-// Setup autoloading
-$loader = new StandardAutoloader(array('autoregister_zf' => true));
-$loader->register();
-
-$rules = array(
- 'help|h' => 'Get usage message',
- 'class|c=s' => 'Class for which to create a docbook skeleton',
- 'output|o-s' => 'Where to write skeleton file; if not provided, assumes documentation/manual/en/module_specs/<class id>.xml"',
-);
-
-$docbookPath = __DIR__ . '/../documentation/manual/en/module_specs';
-$docbookFile = false;
-
-// Parse options
-try {
- $opts = new Zend\Console\Getopt($rules);
- $opts->parse();
-} catch (Console\Exception\RuntimeException $e) {
- // Error creating or parsing options; show usage message
- echo $e->getUsageMessage();
- exit(2);
-}
-
-// Help requested
-if ($opts->getOption('h')) {
- echo $opts->getUsageMessage();
- exit();
-}
-
-// Were we provided a class name?
-if (!isset($opts->c)) {
- // No class name == no execution
- echo "Must provide a class via the -c or --class option\n\n";
- echo $opts->getUsageMessage();
- exit(2);
-}
-// Valid class name?
-$class = $opts->c;
-if (!class_exists($class) && !interface_exists($class)) {
- // Invalid class name == no execution
- printf("Invalid class '%s' provided' class not found\n\n", $class);
- echo $opts->getUsageMessage();
- exit(2);
-}
-
-// Was a specific filename provided for the generated output?
-if (isset($opts->o)) {
- $docbookPath = dirname($opts->o);
- $docbookFile = basename($opts->o);
-}
-
-$parser = new ClassParser(new ReflectionClass($class));
-$generator = new SkeletonGenerator($parser);
-$xml = $generator->generate();
-
-// Normalize per CS
-$xml = strtr($xml, array(
- ' ' => ' ', // 4 space tabs
- '</info>' => "</info>\n", // Extra newline between blocks
- '</section>' => "</section>\n",
- '</term>' => "</term>\n",
- '</varlistentry>' => "</varlistentry>\n",
-));
-
-// Strip extra whitespace at end of document
-$xml = str_replace("</section>\n\n</section>\n", "</section>\n</section>", $xml);
-
-// Write file
-if (!$docbookFile) {
- // Auto-generate filename based on class ID
- $docbookFile = $parser->getId() . '.xml';
-}
-$path = $docbookPath . DIRECTORY_SEPARATOR . $docbookFile;
-file_put_contents($path, $xml);
-
-echo "[DONE] Wrote Docbook XML skeleton to $path\n";
View
20 bin/pluginmap_generator.php
@@ -28,25 +28,25 @@
*
* Usage:
* --help|-h Get usage message
- * --library|-l [ <string> ] Library to parse; if none provided, assumes
+ * --library|-l [ <string> ] Library to parse; if none provided, assumes
* current directory
- * --output|-o [ <string> ] Where to write autoload file; if not provided,
+ * --output|-o [ <string> ] Where to write autoload file; if not provided,
* assumes "autoload_classmap.php" in library directory
* --append|-a Append to autoload file if it exists
- * --overwrite|-w Whether or not to overwrite existing autoload
+ * --overwrite|-w Whether or not to overwrite existing autoload
* file
*/
$libPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
if (!is_dir($libPath)) {
// Try to load StandardAutoloader from include_path
- if (false === include('Zend/Loader/StandardAutoloader.php')) {
+ if (false === (include 'Zend/Loader/StandardAutoloader.php')) {
echo "Unable to locate autoloader via include_path; aborting" . PHP_EOL;
exit(2);
}
} else {
// Try to load StandardAutoloader from library
- if (false === include($libPath . '/Zend/Loader/StandardAutoloader.php')) {
+ if (false === (include $libPath . '/Zend/Loader/StandardAutoloader.php')) {
echo "Unable to locate autoloader via library; aborting" . PHP_EOL;
exit(2);
}
@@ -109,7 +109,7 @@
} elseif (file_exists($output)) {
if (!$opts->getOption('w') && !$appending) {
echo "Plugin map file already exists at '$output'," . PHP_EOL
- . "but 'overwrite' flag was not specified; aborting." . PHP_EOL
+ . "but 'overwrite' flag was not specified; aborting." . PHP_EOL
. PHP_EOL
. $opts->getUsageMessage();
exit(2);
@@ -128,9 +128,9 @@
// Get the ClassFileLocator, and pass it the library path
$l = new \Zend\File\ClassFileLocator($path);
-// Iterate over each element in the path, and create a map of pluginname => classname
+// Iterate over each element in the path, and create a map of pluginname => classname
$map = new \stdClass;
-foreach($l as $file) {
+foreach ($l as $file) {
$namespace = empty($file->namespace) ? '' : $file->namespace . '\\';
$plugin = strtolower($file->classname);
$class = $namespace . $file->classname;
@@ -151,7 +151,7 @@
// Load existing class map file and remove the closing "bracket ");" from it
$existing = file($output, FILE_IGNORE_NEW_LINES);
- array_pop($existing);
+ array_pop($existing);
// Merge
$content = implode(PHP_EOL, $existing + $content);
@@ -159,7 +159,7 @@
// Create a file with the class/file map.
// Stupid syntax highlighters make separating < from PHP declaration necessary
$content = '<' . "?php\n\n"
- . "// plugin class map\n"
+ . "// plugin class map\n"
. "// auto-generated using "
. basename($_SERVER['argv'][0]) . ', ' . date('Y-m-d H:i:s') . "\n\n"
. 'return ' . var_export((array) $map, true) . ';';
View
53 composer.json
@@ -12,35 +12,37 @@
"php": ">=5.3.3"
},
"require-dev": {
- "doctrine/common": ">=2.1"
+ "doctrine/common": ">=2.1",
+ "phpunit/PHPUnit": "3.7.*"
},
"suggest": {
- "doctrine/common": "Doctrine\\Common >=2.1 for annotation features"
+ "doctrine/common": "Doctrine\\Common >=2.1 for annotation features",
+ "ext-intl": "ext/intl for i18n features",
+ "pecl-weakref": "Implementation of weak references for Zend\\Stdlib\\CallbackHandler",
+ "zendframework/zendpdf": "ZendPdf for creating PDF representations of barcodes",
+ "zendframework/zendservice-recaptcha": "ZendService\\ReCaptcha for rendering ReCaptchas in Zend\\Captcha and/or Zend\\Form"
},
"autoload": {
"psr-0": {
- "Zend": "library/"
+ "Zend\\": "library/",
+ "ZendTest\\": "tests/"
}
},
- "config": {
- "bin-dir": "bin"
- },
+ "bin": [
+ "bin/classmap_generator.php"
+ ],
"replace": {
"zendframework/zend-acl": "self.version",
- "zendframework/zend-amf": "self.version",
"zendframework/zend-authentication": "self.version",
"zendframework/zend-barcode": "self.version",
"zendframework/zend-cache": "self.version",
"zendframework/zend-captcha": "self.version",
- "zendframework/zend-cloud": "self.version",
"zendframework/zend-code": "self.version",
"zendframework/zend-config": "self.version",
"zendframework/zend-console": "self.version",
"zendframework/zend-crypt": "self.version",
"zendframework/zend-db": "self.version",
"zendframework/zend-di": "self.version",
- "zendframework/zend-docbook": "self.version",
- "zendframework/zend-dojo": "self.version",
"zendframework/zend-dom": "self.version",
"zendframework/zend-escaper": "self.version",
"zendframework/zend-eventmanager": "self.version",
@@ -48,10 +50,8 @@
"zendframework/zend-file": "self.version",
"zendframework/zend-filter": "self.version",
"zendframework/zend-form": "self.version",
- "zendframework/zend-gdata": "self.version",
"zendframework/zend-http": "self.version",
"zendframework/zend-i18n": "self.version",
- "zendframework/zend-infocard": "self.version",
"zendframework/zend-inputfilter": "self.version",
"zendframework/zend-json": "self.version",
"zendframework/zend-ldap": "self.version",
@@ -65,50 +65,25 @@
"zendframework/zend-modulemanager": "self.version",
"zendframework/zend-mvc": "self.version",
"zendframework/zend-navigation": "self.version",
- "zendframework/zend-oauth": "self.version",
- "zendframework/zend-openid": "self.version",
"zendframework/zend-paginator": "self.version",
- "zendframework/zend-pdf": "self.version",
"zendframework/zend-progressbar": "self.version",
- "zendframework/zend-queue": "self.version",
- "zendframework/zend-rest": "self.version",
- "zendframework/zend-search-lucene": "self.version",
"zendframework/zend-serializer": "self.version",
"zendframework/zend-server": "self.version",
- "zendframework/zend-service-agilezen": "self.version",
- "zendframework/zend-service-akismet": "self.version",
- "zendframework/zend-service-amazon": "self.version",
- "zendframework/zend-service-audioscrobbler": "self.version",
- "zendframework/zend-service-delicious": "self.version",
- "zendframework/zend-service-developergarden": "self.version",
- "zendframework/zend-service-flickr": "self.version",
- "zendframework/zend-service-gogrid": "self.version",
- "zendframework/zend-service-livedocx": "self.version",
- "zendframework/zend-service-nirvanix": "self.version",
- "zendframework/zend-service-rackspace": "self.version",
- "zendframework/zend-service-recaptcha": "self.version",
- "zendframework/zend-service-slideshare": "self.version",
- "zendframework/zend-service-strikeiron": "self.version",
- "zendframework/zend-service-technorati": "self.version",
- "zendframework/zend-service-twitter": "self.version",
- "zendframework/zend-service-windowsazure": "self.version",
"zendframework/zend-servicemanager": "self.version",
"zendframework/zend-session": "self.version",
"zendframework/zend-soap": "self.version",
"zendframework/zend-stdlib": "self.version",
"zendframework/zend-tag": "self.version",
- "zendframework/zend-test": "self.version",
"zendframework/zend-text": "self.version",
- "zendframework/zend-timesync": "self.version",
"zendframework/zend-uri": "self.version",
"zendframework/zend-validator": "self.version",
"zendframework/zend-view": "self.version",
- "zendframework/zend-wildfire": "self.version",
"zendframework/zend-xmlrpc": "self.version"
},
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "2.0-dev",
+ "dev-develop": "2.1-dev"
}
}
}
View
28 demos/Zend/Feeds/consume-feed.php
@@ -1,22 +1,11 @@
<?php
/**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
*
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Feed
- * @subpackage Demos
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @link http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ * @package Zend_Feed
*/
use Zend\Loader\StandardAutoloader;
@@ -28,14 +17,13 @@
*/
require_once dirname(dirname(dirname(__DIR__))).'/library/Zend/Loader/StandardAutoloader.php';
-$loader = new StandardAutoloader;
+$loader = new StandardAutoloader(array('autoregister_zf' => true));
$loader->register();
$rss = Reader::import('http://news.google.com/?output=rss');
foreach ($rss as $item) {
-
- echo "<p>" . $item->getTitle() . "<br />", "\n";
- echo $item->getLink() . "</p>";
+ echo '<p>' . $item->getTitle() . '<br />', "\n";
+ echo $item->getLink() . '</p>';
}
View
109 demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php
@@ -1,109 +0,0 @@
-<?php
-require_once 'Zend/Oauth/Consumer.php';
-require_once 'Zend/Gdata/Query.php';
-
-/**
- * Wrapper class for Google's OAuth implementation. In particular, this helper
- * bundles the token endpoints and manages the Google-specific parameters such
- * as the hd and scope parameter.
- *
- * @category Zend
- * @package Zend_Gdata
- * @subpackage Demos
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-class Gdata_OAuth_Helper extends Zend_Oauth_Consumer {
- // Google's default oauth parameters/constants.
- private $_defaultOptions = array(
- 'requestScheme' => Zend_Oauth::REQUEST_SCHEME_HEADER,
- 'version' => '1.0',
- 'requestTokenUrl' => 'https://www.google.com/accounts/OAuthGetRequestToken',
- 'userAuthorizationUrl' => 'https://www.google.com/accounts/OAuthAuthorizeToken',
- 'accessTokenUrl' => 'https://www.google.com/accounts/OAuthGetAccessToken'
- );
-
- /**
- * Create Gdata_OAuth_Helper object
- *
- * @param string $consumerKey OAuth consumer key (domain).
- * @param string $consumerSecret (optional) OAuth consumer secret. Required if
- * using HMAC-SHA1 for a signature method.
- * @param string $sigMethod (optional) The oauth_signature method to use.
- * Defaults to HMAC-SHA1. RSA-SHA1 is also supported.
- */
- public function __construct($consumerKey, $consumerSecret=null,
- $sigMethod='HMAC-SHA1') {
- $this->_defaultOptions['consumerKey'] = $consumerKey;
- $this->_defaultOptions['consumerSecret'] = $consumerSecret;
- $this->_defaultOptions['signatureMethod'] = $sigMethod;
- parent::__construct($this->_defaultOptions);
- }
-
- /**
- * Getter for the oauth options array.
- *
- * @return array
- */
- public function getOauthOptions() {
- return $this->_defaultOptions;
- }
-
- /**
- * Fetches a request token.
- *
- * @param string $scope The API scope or scopes separated by spaces to
- * restrict data access to.
- * @param mixed $callback The URL to redirect the user to after they have
- * granted access on the approval page. Either a string or
- * Zend_Gdata_Query object.
- * @return Zend_OAuth_Token_Request|null
- */
- public function fetchRequestToken($scope, $callback) {
- if ($callback instanceof Zend_Gdata_Query) {
- $uri = $callback->getQueryUrl();
- } else {
- $uri = $callback;
- }
-
- $this->_defaultOptions['callbackUrl'] = $uri;
- $this->_config->setCallbackUrl($uri);
- if (!isset($_SESSION['ACCESS_TOKEN'])) {
- return parent::getRequestToken(array('scope' => $scope));
- }
- return null;
- }
-
- /**
- * Redirects the user to the approval page
- *
- * @param string $domain (optional) The Google Apps domain to logged users in
- * under or 'default' for Google Accounts. Leaving this parameter off
- * will give users the universal login to choose an account to login
- * under.
- * @return void
- */
- public function authorizeRequestToken($domain=null) {
- $params = array();
- if ($domain != null) {
- $params = array('hd' => $domain);
- }
- $this->redirect($params);
- }
-
- /**
- * Upgrades an authorized request token to an access token.
- *
- * @return Zend_OAuth_Token_Access||null
- */
- public function fetchAccessToken() {
- if (!isset($_SESSION['ACCESS_TOKEN'])) {
- if (!empty($_GET) && isset($_SESSION['REQUEST_TOKEN'])) {
- return parent::getAccessToken(
- $_GET, unserialize($_SESSION['REQUEST_TOKEN']));
- }
- }
- return null;
- }
-}
View
BIN  demos/Zend/Gdata/3LeggedOAuth/data-api-72.png
Deleted file not rendered
View
BIN  demos/Zend/Gdata/3LeggedOAuth/doclist-72.png
Deleted file not rendered
View
190 demos/Zend/Gdata/3LeggedOAuth/index.php
@@ -1,190 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category Zend
- * @package Zend_Gdata
- * @subpackage Demos
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- */
-
-/**
- * Sample code to demonstrate accessing a Google Data feed using OAuth for
- * authorization. Utilizes the Zend Framework Zend_OAuth components to
- * communicate with the API(s).
- *
- * NOTE: As this is sample code, not all of the functions do full error
- * handling.
- */
-
-require_once 'Zend/Gdata/Docs.php';
-require_once 'Zend/Gdata/Spreadsheets.php';
-
-require_once 'Gdata_OAuth_Helper.php';
-
-session_start();
-
-// Application constants. Replace these values with your own.
-$APP_NAME = 'google-ZendGData3LOSample-1.0';
-$APP_URL = getAppURL();
-$scopes = array(
- 'https://docs.google.com/feeds/',
- 'http://spreadsheets.google.com/feeds/'
-);
-
-// Setup OAuth consumer. Thes values should be replaced with your registered
-// app's consumer key/secret.
-$CONSUMER_KEY = 'anonymous';
-$CONSUMER_SECRET = 'anonymous';
-$consumer = new Gdata_OAuth_Helper($CONSUMER_KEY, $CONSUMER_SECRET);
-
-// Main controller logic.
-switch (@$_REQUEST['action']) {
- case 'logout':
- logout($APP_URL);
- break;
- case 'request_token':
- $_SESSION['REQUEST_TOKEN'] = serialize($consumer->fetchRequestToken(
- implode(' ', $scopes), $APP_URL . '?action=access_token'));
- $consumer->authorizeRequestToken();
- break;
- case 'access_token':
- $_SESSION['ACCESS_TOKEN'] = serialize($consumer->fetchAccessToken());
- header('Location: ' . $APP_URL);
- break;
- default:
- if (isset($_SESSION['ACCESS_TOKEN'])) {
- $accessToken = unserialize($_SESSION['ACCESS_TOKEN']);
-
- $httpClient = $accessToken->getHttpClient(
- $consumer->getOauthOptions());
- $docsService = new Zend_Gdata_Docs($httpClient, $APP_NAME);
- $spreadsheetsService = new Zend_Gdata_Spreadsheets($httpClient,
- $APP_NAME);
-
- // Retrieve user's list of Google Docs and spreadsheet list.
- $docsFeed = $docsService->getDocumentListFeed();
- $spreadsheetFeed = $spreadsheetsService->getSpreadsheetFeed(
- 'http://spreadsheets.google.com/feeds/spreadsheets/private/full?max-results=100');
-
- renderHTML($accessToken, array($docsFeed, $spreadsheetFeed));
- } else {
- renderHTML();
- }
-}
-
-/**
- * Returns a the base URL of the current running web app.
- *
- * @return string
- */
-function getAppURL() {
- $pageURL = 'http';
- if ($_SERVER['HTTPS'] == 'on') {
- $pageURL .= 's';
- }
- $pageURL .= '://';
- if ($_SERVER['SERVER_PORT'] != '80') {
- $pageURL .= $_SERVER['SERVER_NAME'] . ':' .
- $_SERVER['SERVER_PORT'] . $_SERVER['PHP_SELF'];
- } else {
- $pageURL .= $_SERVER['SERVER_NAME'] . $_SERVER['PHP_SELF'];
- }
- return $pageURL;
-}
-
-/**
- * Removes session data and redirects the user to a URL.
- *
- * @param string $redirectUrl The URL to direct the user to after session data
- * is destroyed.
- * @return void
- */