Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…e_em

Conflicts:
	library/Zend/Cache/Exception.php
	library/Zend/Cache/Exception/BadMethodCallException.php
	library/Zend/Cache/Exception/ExtensionNotLoadedException.php
	library/Zend/Cache/Exception/InvalidArgumentException.php
	library/Zend/Cache/Exception/ItemNotFoundException.php
	library/Zend/Cache/Exception/LogicException.php
	library/Zend/Cache/Exception/MissingDependencyException.php
	library/Zend/Cache/Exception/MissingKeyException.php
	library/Zend/Cache/Exception/RuntimeException.php
	library/Zend/Cache/Exception/UnexpectedValueException.php
	library/Zend/Cache/Manager.php
	library/Zend/Cache/Pattern.php
	library/Zend/Cache/Pattern/AbstractPattern.php
	library/Zend/Cache/Pattern/CallbackCache.php
	library/Zend/Cache/Pattern/CaptureCache.php
	library/Zend/Cache/Pattern/ClassCache.php
	library/Zend/Cache/Pattern/ObjectCache.php
	library/Zend/Cache/Pattern/OutputCache.php
	library/Zend/Cache/PatternBroker.php
	library/Zend/Cache/PatternFactory.php
	library/Zend/Cache/PatternLoader.php
	library/Zend/Cache/Storage/Adapter.php
	library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
	library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
	library/Zend/Cache/Storage/Adapter/Apc.php
	library/Zend/Cache/Storage/Adapter/Filesystem.php
	library/Zend/Cache/Storage/Adapter/Memcached.php
	library/Zend/Cache/Storage/Adapter/Memory.php
	library/Zend/Cache/Storage/Adapter/Sqlite.php
	library/Zend/Cache/Storage/Adapter/ZendPlatform.php
	library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
	library/Zend/Cache/Storage/Adapter/ZendServerShm.php
	library/Zend/Cache/Storage/AdapterBroker.php
	library/Zend/Cache/Storage/AdapterLoader.php
	library/Zend/Cache/Storage/Capabilities.php
	library/Zend/Cache/Storage/Event.php
	library/Zend/Cache/Storage/Plugin.php
	library/Zend/Cache/Storage/Plugin/AbstractPlugin.php
	library/Zend/Cache/Storage/Plugin/ClearByFactor.php
	library/Zend/Cache/Storage/Plugin/ExceptionHandler.php
	library/Zend/Cache/Storage/Plugin/IgnoreUserAbort.php
	library/Zend/Cache/Storage/Plugin/OptimizeByFactor.php
	library/Zend/Cache/Storage/Plugin/Serializer.php
	library/Zend/Cache/Storage/PluginBroker.php
	library/Zend/Cache/Storage/PluginLoader.php
	library/Zend/Cache/Storage/PostEvent.php
	library/Zend/Cache/StorageFactory.php
	library/Zend/Cache/Utils.php
	library/Zend/Memory/MemoryManager.php
	tests/TestConfiguration.php.dist
	tests/Zend/Cache/FactoryException.php
	tests/Zend/Cache/ManagerTest.php
	tests/Zend/Cache/Pattern/CallbackCacheTest.php
	tests/Zend/Cache/Pattern/ClassCacheTest.php
	tests/Zend/Cache/Pattern/CommonPatternTest.php
	tests/Zend/Cache/Pattern/ObjectCacheTest.php
	tests/Zend/Cache/Pattern/OutputCacheTest.php
	tests/Zend/Cache/Pattern/PageCacheTest.php
	tests/Zend/Cache/PatternFactoryTest.php
	tests/Zend/Cache/Storage/Adapter/AbstractAdapterTest.php
	tests/Zend/Cache/Storage/Adapter/AbstractZendServerTest.php
	tests/Zend/Cache/Storage/Adapter/ApcTest.php
	tests/Zend/Cache/Storage/Adapter/CommonAdapterTest.php
	tests/Zend/Cache/Storage/Adapter/FilesystemTest.php
	tests/Zend/Cache/Storage/Adapter/MemcachedTest.php
	tests/Zend/Cache/Storage/Adapter/MemoryTest.php
	tests/Zend/Cache/Storage/Adapter/SqliteTest.php
	tests/Zend/Cache/Storage/Adapter/XCacheTest.php
	tests/Zend/Cache/Storage/Adapter/ZendPlatformTest.php
	tests/Zend/Cache/Storage/Adapter/ZendServerDiskTest.php
	tests/Zend/Cache/Storage/Adapter/ZendServerShmTest.php
	tests/Zend/Cache/Storage/CapabilitiesTest.php
	tests/Zend/Cache/Storage/Plugin/AbstractPluginTest.php
	tests/Zend/Cache/Storage/Plugin/ClearByFactorTest.php
	tests/Zend/Cache/Storage/Plugin/CommonPluginTest.php
	tests/Zend/Cache/Storage/Plugin/IgnoreUserAbortTest.php
	tests/Zend/Cache/Storage/Plugin/LevelsTest.php
	tests/Zend/Cache/Storage/Plugin/OptimizeByFactorTest.php
	tests/Zend/Cache/Storage/Plugin/SerializerTest.php
	tests/Zend/Cache/Storage/TestAsset/MockPlugin.php
	tests/Zend/Cache/StorageFactoryTest.php
	tests/Zend/Locale/LocaleTest.php
	tests/Zend/Memory/AccessControllerTest.php
	tests/Zend/Memory/MemoryManagerTest.php
  • Loading branch information...
commit 683d477be1e9c4bbf22fe60684a4b27e325896d7 2 parents fa821fb + a221757
Marc Bennewitz authored

Showing 4,638 changed files with 19,178 additions and 5,477 deletions. Show diff stats Hide diff stats

  1. +47 40 README.txt
  2. +16 6 bin/classmap_generator.php
  3. +3 3 bin/docbook_skeleton.php
  4. +1 1  bin/pluginmap_generator.php
  5. +2 2 bin/zf.php
  6. +1 1  demos/Zend/Feeds/consume-feed.php
  7. +1 1  demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php
  8. +1 1  demos/Zend/Gdata/3LeggedOAuth/index.php
  9. +2 2 demos/Zend/Gdata/Blogger.php
  10. +1 1  demos/Zend/Gdata/BooksBrowser/index.php
  11. +1 1  demos/Zend/Gdata/Calendar.php
  12. +1 1  demos/Zend/Gdata/Docs.php
  13. +1 1  demos/Zend/Gdata/Gapps.php
  14. +1 1  demos/Zend/Gdata/Gbase.php
  15. +1 1  demos/Zend/Gdata/Health.php
  16. +1 1  demos/Zend/Gdata/InstallationChecker.php
  17. +1 1  demos/Zend/Gdata/MyLibrary/demo.php
  18. +1 1  demos/Zend/Gdata/Photos.php
  19. +2 2 demos/Zend/Gdata/Spreadsheet-ClientLogin.php
  20. +1 1  demos/Zend/Gdata/YouTubeVideoApp/index.php
  21. +1 1  demos/Zend/Gdata/YouTubeVideoApp/operations.php
  22. +1 1  demos/Zend/Gdata/YouTubeVideoApp/session_details.php
  23. +1 1  demos/Zend/Gdata/YouTubeVideoBrowser/index.php
  24. +1 1  demos/Zend/Locale/AllLanguages.php
  25. +2 2 demos/Zend/Mail/SimpleMailer.php
  26. +2 2 demos/Zend/OpenId/mvc_auth/application/controllers/ErrorController.php
  27. +2 2 demos/Zend/OpenId/mvc_auth/application/controllers/IndexController.php
  28. +1 1  demos/Zend/OpenId/mvc_auth/html/index.php
  29. +1 1  demos/Zend/OpenId/test_auth.php
  30. +1 1  demos/Zend/OpenId/test_consumer.php
  31. +1 1  demos/Zend/OpenId/test_server.php
  32. +1 1  demos/Zend/Pdf/demo.php
  33. +1 1  demos/Zend/ProgressBar/JsPush.php
  34. +1 1  demos/Zend/ProgressBar/Upload.php
  35. +1 1  demos/Zend/ProgressBar/ZendForm.php
  36. +1 1  demos/Zend/Search/Lucene/feed-search/create-index.php
  37. +1 1  demos/Zend/Search/Lucene/feed-search/search-index.php
  38. +2 2 demos/Zend/Search/Lucene/indexing/CreateIndex.php
  39. +2 2 demos/Zend/Service/LiveDocx/library/Zend/Service/LiveDocx/Helper.php
  40. +1 1  demos/Zend/WebServices/Amazon/amazon-search.php
  41. +1 1  demos/Zend/WebServices/Flickr/flickr-composite.php
  42. +1 1  demos/Zend/WebServices/Flickr/flickr-search.php
  43. +1 1  demos/Zend/WebServices/Protocols/xmlrpc-upc-lookup.php
  44. +1 1  demos/Zend/WebServices/Yahoo/yahoo-multi-search.php
  45. +2 2 demos/Zend/Wildfire/application/controllers/ErrorController.php
  46. +2 2 demos/Zend/Wildfire/application/controllers/IndexController.php
  47. +2 2 demos/Zend/Wildfire/application/controllers/ZendDbProfilerFirebugController.php
  48. +2 2 demos/Zend/Wildfire/application/controllers/ZendLogWriterFirebugController.php
  49. +2 2 demos/Zend/Wildfire/application/controllers/ZendWildfirePluginFirePhpController.php
  50. +1 1  demos/Zend/Wildfire/public/index.php
  51. +3 2 documentation/manual/de/tutorials/quickstart-create-form.xml
  52. +9 1 documentation/manual/en/Makefile.in
  53. +1 1  documentation/manual/en/manual-lint.xml.in
  54. +0 1  documentation/manual/en/manual-print2.xml.in
  55. +86 12 documentation/manual/en/manual.xml.in
  56. +4 3 documentation/manual/en/module_specs/Zend_EventManager-EventManager.xml
  57. +1 1  documentation/manual/en/module_specs/Zend_Gdata_Calendar.xml
  58. +66 0 documentation/manual/en/module_specs/Zend_Module-Best-Practices.xml
  59. +65 433 documentation/manual/en/module_specs/Zend_Module-Intro.xml
  60. +189 0 documentation/manual/en/module_specs/Zend_Module-Module-Autoloader.xml
  61. +209 0 documentation/manual/en/module_specs/Zend_Module-Module-Class.xml
  62. +177 0 documentation/manual/en/module_specs/Zend_Module-Module-Manager.xml
  63. +12 8 documentation/manual/en/module_specs/Zend_Mvc-Examples.xml
  64. +70 65 documentation/manual/en/module_specs/Zend_Mvc-Intro.xml
  65. +21 31 documentation/manual/en/module_specs/Zend_Mvc-QuickStart.xml
  66. +2 2 documentation/manual/en/module_specs/Zend_Mvc-Routing.xml
  67. +0 6 documentation/manual/en/module_specs/Zend_Service.xml
  68. +0 320 documentation/manual/en/module_specs/Zend_Service_Simpy.xml
  69. +71 147 documentation/manual/en/module_specs/Zend_Soap_AutoDiscovery.xml
  70. +21 0 documentation/manual/en/module_specs/Zend_Soap_Server.xml
  71. +57 53 documentation/manual/en/module_specs/Zend_Soap_Wsdl.xml
  72. +13 10 documentation/manual/en/module_specs/Zend_Validate-Hostname.xml
  73. +941 0 documentation/manual/en/module_specs/zend.cache.pattern.xml
  74. +921 0 documentation/manual/en/module_specs/zend.cache.storage.adapter.xml
  75. +579 0 documentation/manual/en/module_specs/zend.cache.storage.capabilities.xml
  76. +392 0 documentation/manual/en/module_specs/zend.cache.storage.plugin.xml
  77. +180 0 documentation/manual/en/module_specs/zend.cache.utils.xml
  78. +184 0 documentation/manual/en/module_specs/zend.mail.file-options.xml
  79. +699 0 documentation/manual/en/module_specs/zend.mail.message.xml
  80. +365 0 documentation/manual/en/module_specs/zend.mail.smtp-options.xml
  81. +180 0 documentation/manual/en/module_specs/zend.mail.transport.xml
  82. +0 15 documentation/manual/en/ref/requirements-dependencies-table.xml
  83. +0 7 documentation/manual/en/ref/requirements-php-extensions-table.xml
  84. +0 13 documentation/manual/en/ref/requirements-zendcomponents-table.xml
  85. +2,605 0 documentation/manual/it/manual.xml.in
  86. +51 0 documentation/manual/it/module_specs/Zend_Di-Configuration.xml
  87. +157 0 documentation/manual/it/module_specs/Zend_Di-Debugging-and-Complex-Use.xml
  88. +213 0 documentation/manual/it/module_specs/Zend_Di-Definitions.xml
  89. +239 0 documentation/manual/it/module_specs/Zend_Di-InstanceManager.xml
  90. +67 0 documentation/manual/it/module_specs/Zend_Di-Introduction.xml
  91. +171 0 documentation/manual/it/module_specs/Zend_Di-Quickstart.xml
  92. +512 0 documentation/manual/it/module_specs/Zend_Mvc-Controllers.xml
  93. +186 0 documentation/manual/it/module_specs/Zend_Mvc-Examples.xml
  94. +535 0 documentation/manual/it/module_specs/Zend_Mvc-Intro.xml
  95. +139 0 documentation/manual/it/module_specs/Zend_Mvc-MvcEvent.xml
  96. +372 0 documentation/manual/it/module_specs/Zend_Mvc-Plugins.xml
  97. +1 1  documentation/manual/ja/module_specs/Zend_Gdata_Calendar.xml
  98. +2 2 library/Zend/Acl/Acl.php
  99. +2 2 library/Zend/Acl/Assertion.php
  100. +2 2 library/Zend/Acl/Exception.php
  101. +2 2 library/Zend/Acl/Resource.php
  102. +2 2 library/Zend/Acl/Resource/GenericResource.php
  103. +2 2 library/Zend/Acl/Role.php
  104. +2 2 library/Zend/Acl/Role/GenericRole.php
  105. +2 2 library/Zend/Acl/Role/Registry.php
  106. +2 2 library/Zend/Amf/AbstractAuthentication.php
  107. +28 27 library/Zend/Amf/Adobe/Authentication.php
  108. +2 2 library/Zend/Amf/Adobe/DbInspector.php
  109. +2 2 library/Zend/Amf/Adobe/Introspector.php
  110. +2 2 library/Zend/Amf/Constants.php
  111. +2 2 library/Zend/Amf/Exception.php
  112. +2 2 library/Zend/Amf/Parser/AbstractDeserializer.php
  113. +2 2 library/Zend/Amf/Parser/AbstractSerializer.php
  114. +2 2 library/Zend/Amf/Parser/Amf0/Deserializer.php
  115. +2 2 library/Zend/Amf/Parser/Amf0/Serializer.php
  116. +2 2 library/Zend/Amf/Parser/Amf3/Deserializer.php
  117. +2 2 library/Zend/Amf/Parser/Amf3/Serializer.php
  118. +2 2 library/Zend/Amf/Parser/Deserializer.php
  119. +2 2 library/Zend/Amf/Parser/InputStream.php
  120. +2 2 library/Zend/Amf/Parser/OutputStream.php
  121. +2 2 library/Zend/Amf/Parser/ParserBroker.php
  122. +2 2 library/Zend/Amf/Parser/ParserLoader.php
  123. +2 2 library/Zend/Amf/Parser/Resource/MysqlResult.php
  124. +2 2 library/Zend/Amf/Parser/Resource/MysqliResult.php
  125. +2 2 library/Zend/Amf/Parser/Resource/Stream.php
  126. +2 2 library/Zend/Amf/Parser/Serializer.php
  127. +2 2 library/Zend/Amf/Parser/TypeLoader.php
  128. +2 2 library/Zend/Amf/Request.php
  129. +2 2 library/Zend/Amf/Request/HttpRequest.php
  130. +2 2 library/Zend/Amf/Request/StreamRequest.php
  131. +2 2 library/Zend/Amf/Response.php
  132. +2 2 library/Zend/Amf/Response/HttpResponse.php
  133. +2 2 library/Zend/Amf/Response/StreamResponse.php
  134. +48 11 library/Zend/Amf/Server.php
  135. +2 2 library/Zend/Amf/Util/BinaryStream.php
  136. +2 2 library/Zend/Amf/Value/ByteArray.php
  137. +2 2 library/Zend/Amf/Value/MessageBody.php
  138. +2 2 library/Zend/Amf/Value/MessageHeader.php
  139. +2 2 library/Zend/Amf/Value/Messaging/AbstractMessage.php
  140. +2 2 library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
  141. +2 2 library/Zend/Amf/Value/Messaging/ArrayCollection.php
  142. +2 2 library/Zend/Amf/Value/Messaging/AsyncMessage.php
  143. +2 2 library/Zend/Amf/Value/Messaging/CommandMessage.php
  144. +2 2 library/Zend/Amf/Value/Messaging/ErrorMessage.php
  145. +2 2 library/Zend/Amf/Value/Messaging/RemotingMessage.php
  146. +2 2 library/Zend/Amf/Value/TraitsInfo.php
  147. +2 2 library/Zend/Authentication/Adapter.php
  148. +2 2 library/Zend/Authentication/Adapter/DbTable.php
  149. +2 2 library/Zend/Authentication/Adapter/Digest.php
  150. +2 2 library/Zend/Authentication/Adapter/Exception.php
  151. +2 2 library/Zend/Authentication/Adapter/Http.php
  152. +2 2 library/Zend/Authentication/Adapter/Http/Exception.php
  153. +2 2 library/Zend/Authentication/Adapter/Http/FileResolver.php
  154. +2 2 library/Zend/Authentication/Adapter/Http/Resolver.php
  155. +2 2 library/Zend/Authentication/Adapter/InfoCard.php
  156. +2 2 library/Zend/Authentication/Adapter/Ldap.php
  157. +2 2 library/Zend/Authentication/AuthenticationService.php
  158. +2 2 library/Zend/Authentication/Exception.php
  159. +2 2 library/Zend/Authentication/Result.php
  160. +2 2 library/Zend/Authentication/Storage.php
  161. +2 2 library/Zend/Authentication/Storage/NonPersistent.php
  162. +2 2 library/Zend/Authentication/Storage/Session.php
  163. +2 2 library/Zend/Barcode/Barcode.php
  164. +2 2 library/Zend/Barcode/Exception.php
  165. +2 2 library/Zend/Barcode/Exception/InvalidArgumentException.php
  166. +2 2 library/Zend/Barcode/Exception/RendererCreationException.php
  167. +2 2 library/Zend/Barcode/Object.php
  168. +2 2 library/Zend/Barcode/Object/AbstractObject.php
  169. +2 2 library/Zend/Barcode/Object/Codabar.php
  170. +2 2 library/Zend/Barcode/Object/Code128.php
  171. +2 2 library/Zend/Barcode/Object/Code25.php
  172. +2 2 library/Zend/Barcode/Object/Code25interleaved.php
  173. +2 2 library/Zend/Barcode/Object/Code39.php
  174. +2 2 library/Zend/Barcode/Object/Ean13.php
  175. +2 2 library/Zend/Barcode/Object/Ean2.php
  176. +2 2 library/Zend/Barcode/Object/Ean5.php
  177. +2 2 library/Zend/Barcode/Object/Ean8.php
  178. +2 2 library/Zend/Barcode/Object/Error.php
  179. +2 2 library/Zend/Barcode/Object/Exception.php
  180. +2 2 library/Zend/Barcode/Object/Exception/BarcodeValidationException.php
  181. +2 2 library/Zend/Barcode/Object/Exception/ExtensionNotLoadedException.php
  182. +2 2 library/Zend/Barcode/Object/Exception/InvalidArgumentException.php
  183. +2 2 library/Zend/Barcode/Object/Exception/OutOfRangeException.php
  184. +2 2 library/Zend/Barcode/Object/Exception/RuntimeException.php
  185. +2 2 library/Zend/Barcode/Object/Identcode.php
  186. +2 2 library/Zend/Barcode/Object/Itf14.php
  187. +2 2 library/Zend/Barcode/Object/Leitcode.php
  188. +2 2 library/Zend/Barcode/Object/Planet.php
  189. +2 2 library/Zend/Barcode/Object/Postnet.php
  190. +2 2 library/Zend/Barcode/Object/Royalmail.php
  191. +2 2 library/Zend/Barcode/Object/Upca.php
  192. +2 2 library/Zend/Barcode/Object/Upce.php
  193. +2 2 library/Zend/Barcode/ObjectBroker.php
  194. +2 2 library/Zend/Barcode/ObjectLoader.php
  195. +2 2 library/Zend/Barcode/Renderer.php
  196. +2 2 library/Zend/Barcode/Renderer/AbstractRenderer.php
  197. +2 2 library/Zend/Barcode/Renderer/Exception.php
  198. +2 2 library/Zend/Barcode/Renderer/Exception/InvalidArgumentException.php
  199. +2 2 library/Zend/Barcode/Renderer/Exception/OutOfRangeException.php
  200. +2 2 library/Zend/Barcode/Renderer/Exception/RuntimeException.php
  201. +2 2 library/Zend/Barcode/Renderer/Exception/UnexpectedValueException.php
  202. +2 2 library/Zend/Barcode/Renderer/Image.php
  203. +2 2 library/Zend/Barcode/Renderer/Pdf.php
  204. +2 2 library/Zend/Barcode/Renderer/Svg.php
  205. +2 2 library/Zend/Barcode/RendererBroker.php
  206. +2 2 library/Zend/Barcode/RendererLoader.php
  207. +9 2 library/Zend/Cache/Exception.php
  208. +29 2 library/Zend/Cache/Exception/BadMethodCallException.php
  209. +29 2 library/Zend/Cache/Exception/ExtensionNotLoadedException.php
  210. +29 2 library/Zend/Cache/Exception/InvalidArgumentException.php
  211. +26 1 library/Zend/Cache/Exception/ItemNotFoundException.php
  212. +31 0 library/Zend/Cache/Exception/LockedException.php
  213. +29 2 library/Zend/Cache/Exception/LogicException.php
  214. +27 2 library/Zend/Cache/Exception/MissingDependencyException.php
  215. +26 1 library/Zend/Cache/Exception/MissingKeyException.php
  216. +33 0 library/Zend/Cache/Exception/OutOfCapacityException.php
  217. +29 2 library/Zend/Cache/Exception/RuntimeException.php
  218. +29 2 library/Zend/Cache/Exception/UnexpectedValueException.php
  219. +33 0 library/Zend/Cache/Exception/UnsupportedMethodCallException.php
  220. +28 13 library/Zend/Cache/Pattern.php
  221. +67 19 library/Zend/Cache/Pattern/AbstractPattern.php
  222. +67 100 library/Zend/Cache/Pattern/CallbackCache.php
  223. +132 218 library/Zend/Cache/Pattern/CaptureCache.php
  224. +63 183 library/Zend/Cache/Pattern/ClassCache.php
  225. +91 287 library/Zend/Cache/Pattern/ObjectCache.php
  226. +55 67 library/Zend/Cache/Pattern/OutputCache.php
  227. +880 0 library/Zend/Cache/Pattern/PatternOptions.php
  228. +7 8 library/Zend/Cache/PatternBroker.php
  229. +61 20 library/Zend/Cache/PatternFactory.php
  230. +3 3 library/Zend/Cache/PatternLoader.php
  231. +158 135 library/Zend/Cache/Storage/Adapter.php
  232. +503 473 library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
  233. +506 176 library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
  234. +336 0 library/Zend/Cache/Storage/Adapter/AdapterOptions.php
  235. +1,134 381 library/Zend/Cache/Storage/Adapter/Apc.php
  236. +63 0 library/Zend/Cache/Storage/Adapter/ApcOptions.php
  237. +1,234 828 library/Zend/Cache/Storage/Adapter/Filesystem.php
  238. +595 0 library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
  239. +826 1,055 library/Zend/Cache/Storage/Adapter/Memcached.php
  240. +828 0 library/Zend/Cache/Storage/Adapter/MemcachedOptions.php
Sorry, we could not display the entire diff because too many files (4,638) changed.
87 README.txt
@@ -2,57 +2,64 @@ Welcome to the Zend Framework 2.0.0 Release!
2 2
3 3 RELEASE INFORMATION
4 4 ---------------
5   -Zend Framework 2.0.0beta1
  5 +Zend Framework 2.0.0beta2
6 6
7 7 THIS RELEASE IS A DEVELOPMENT RELEASE AND NOT INTENDED FOR PRODUCTION USE.
8 8 PLEASE USE AT YOUR OWN RISK.
9 9
10   -This is the first in a series of planned beta releases. The beta release
  10 +This is the second in a series of planned beta releases. The beta release
11 11 cycle will follow the "gmail" style of betas, whereby new features will
12 12 be added in each new release, and BC will not be guaranteed; beta
13   -releases will happen no less than every six weeks.
  13 +releases will happen approximately every six weeks.
14 14
15 15 Once the established milestones have been reached and the featureset has
16 16 reached maturity and reasonable stability, we will freeze the API and
17 17 prepare for Release Candidate status.
18 18
19   -NEW FEATURES
20   -------------
21   -
22   -- New and refactored autoloaders:
23   - - Zend\Loader\StandardAutoloader
24   - - Zend\Loader\ClassMapAutoloader
25   - - Zend\Loader\AutoloaderFactory
26   -- New plugin broker strategy
27   - - Zend\Loader\Broker and Zend\Loader\PluginBroker
28   -- Reworked Exception system
29   - - Allow catching by specific Exception type
30   - - Allow catching by component Exception type
31   - - Allow catching by SPL Exception type
32   - - Allow catching by base Exception type
33   -- Rewritten Session component
34   -- Refactored View component
35   - - Split helpers into a PluginBroker
36   - - Split variables into a Variables container
37   - - Split script paths into a TemplateResolver
38   - - Renamed base View class "PhpRenderer"
39   - - Refactored helpers to utilize __invoke() when possible
40   -- Refactored HTTP component
41   -- New Zend\Cloud\Infrastructure component
42   -- New EventManager component
43   -- New Dependency Injection (Zend\Di) component
44   -- New Code component
45   - - Incorporates refactored versions of former Reflection and
46   - CodeGenerator components.
47   - - Introduces Scanner component.
48   - - Introduces annotation system.
49   -- New MVC layer
50   - - Zend\Module, for developing modular application architectures.
51   - - Zend\Mvc, a completely reworked MVC layer built on top of HTTP,
52   - EventManager, and Di.
53   -- Introduces new packaging system, allowing the usage of Pyrus
54   - (http://pear2.php.net) to install individual components and/or groups
55   - of components.
  19 +NEW FEATURES IN BETA2
  20 +---------------------
  21 +
  22 +- Refactored Mail component
  23 + - Does not change existing Storage API, except:
  24 + - Zend\Mail\MailMessage was moved to Zend\Mail\Storage\MailMessage
  25 + - Zend\Mail\MailPart was moved to Zend\Mail\Storage\MailPart
  26 + - Zend\Mail\Message was moved to Zend\Mail\Storage\Message
  27 + - Zend\Mail\Part was moved to Zend\Mail\Storage\Part
  28 + - Zend\Mail\Mail was renamed to Zend\Mail\Message
  29 + - Encapsulates a mail message and all headers
  30 + - MIME messages are created by attaching a Zend\Mime\Message object as the
  31 + mail message body
  32 + - Added Zend\Mail\Address and Zend\Mail\AddressList
  33 + - Used to represent single addresses and address collections, particularly
  34 + within mail headers
  35 + - Added Zend\Mail\Header\* and Zend\Mail\Headers
  36 + - Representations of mail headers
  37 + - Zend\Mail\Transport interface defines simply "send(Message $message)"
  38 + - Smtp, File, and Sendmail transports rewritten to consume Message objects,
  39 + and to introduce Options classes.
  40 +- Refactored Zend\Cache
  41 + - Completely rewritten component.
  42 + - New API features storage adapters and adapter plugins for implementing cache
  43 + storage and features such as serialization, clearing, and optimizing.
  44 + - Current adapters include filesystem, APC, memcached, and memory.
  45 + - All adapters can describe capabilities.
  46 + - Plugins are implemented as event listeners.
  47 + - New "Pattern" API created to simplify things like method, class, object, and
  48 + output caching.
  49 +- MVC updates
  50 + - Zend\Module\Manager was stripped of most functionality; it now simply
  51 + iterates requested modules and triggers events.
  52 + - Former manager functionality such as class loading and instantiation,
  53 + "init()" triggering, configuration gathering, and autoloader seeding were
  54 + moved to event listeners.
  55 + - Post-module loading configuration globbing support was added.
  56 + - Simplifies story of overriding module configuration.
  57 + - Recommended filesystem no longer uses plurals for directory names.
  58 + - Recommendations now include a chdir(__DIR__ . '/../') from the
  59 + public/index.php file, and specifying configuration paths to be relative to
  60 + application directory.
  61 +
  62 +In addition, over 100 bug and feature requests were handled since beta1.
56 63
57 64 SYSTEM REQUIREMENTS
58 65 -------------------
22 bin/classmap_generator.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Loader
17 17 * @subpackage Exception
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -33,7 +33,7 @@
33 33 * file
34 34 */
35 35
36   -$libPath = __DIR__ . '/../library';
  36 +$libPath = getenv('LIB_PATH') ? getenv('LIB_PATH') : __DIR__ . '/../library';
37 37 if (!is_dir($libPath)) {
38 38 // Try to load StandardAutoloader from include_path
39 39 if (false === include('Zend/Loader/StandardAutoloader.php')) {
@@ -42,7 +42,7 @@
42 42 }
43 43 } else {
44 44 // Try to load StandardAutoloader from library
45   - if (false === include(__DIR__ . '/../library/Zend/Loader/StandardAutoloader.php')) {
  45 + if (false === include($libPath . '/Zend/Loader/StandardAutoloader.php')) {
46 46 echo "Unable to locate autoloader via library; aborting" . PHP_EOL;
47 47 exit(2);
48 48 }
@@ -95,8 +95,17 @@
95 95 // If both library path and classmap path are absolute, we have to make
96 96 // it relative to the classmap file.
97 97 $libraryPathCompare = rtrim(str_replace('\\', '/', realpath($libraryPath)), '/');
98   - $classmapPathCompare = rtrim(str_replace('\\', '/', realpath($opts->o)), '/');
99   -
  98 +
  99 + if (file_exists($opts->o) ) {
  100 + $classmapPathCompare = rtrim(str_replace('\\', '/', realpath($opts->o)), '/');
  101 + } else {
  102 + // realpath() won't work for unexisting files
  103 + $newFilePath = explode('/', str_replace('\\', '/', $opts->o));
  104 + // stip filename
  105 + array_pop($newFilePath);
  106 + $classmapPathCompare = rtrim(realpath(implode('/', $newFilePath)), '/');
  107 + }
  108 +
100 109 if (is_file($libraryPathCompare)) {
101 110 $libraryPathCompare = str_replace('\\', '/', dirname($libraryPathCompare));
102 111 }
@@ -210,11 +219,12 @@
210 219 array_pop($existing);
211 220
212 221 // Merge
213   - $content = implode(PHP_EOL, $existing + $content);
  222 + $content = implode(PHP_EOL, array_merge($existing, $content));
214 223 } else {
215 224 // Create a file with the class/file map.
216 225 // Stupid syntax highlighters make separating < from PHP declaration necessary
217 226 $content = '<' . "?php\n"
  227 + . "// Generated by ZF2's ./bin/classmap_generator.php\n"
218 228 . 'return ' . var_export((array) $map, true) . ';';
219 229
220 230 // Prefix with __DIR__; modify the generated content
6 bin/docbook_skeleton.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Docbook
17 17 * @subpackage Exception
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -38,7 +38,7 @@
38 38 use Zend\Console\Getopt,
39 39 Zend\Docbook\ClassParser,
40 40 Zend\Docbook\SkeletonGenerator,
41   - Zend\Reflection\ReflectionClass;
  41 + Zend\Code\Reflection\ClassReflection as ReflectionClass;
42 42
43 43 $libPath = __DIR__ . '/../library';
44 44 if (!is_dir($libPath)) {
@@ -93,7 +93,7 @@
93 93 }
94 94 // Valid class name?
95 95 $class = $opts->c;
96   -if (!class_exists($class)) {
  96 +if (!class_exists($class) && !interface_exists($class)) {
97 97 // Invalid class name == no execution
98 98 printf("Invalid class '%s' provided' class not found\n\n", $class);
99 99 echo $opts->getUsageMessage();
2  bin/pluginmap_generator.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Loader
17 17 * @subpackage Exception
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
4 bin/zf.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Tool
17 17 * @subpackage Framework
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -25,7 +25,7 @@
25 25 * @category Zend
26 26 * @package Zend_Tool
27 27 * @subpackage Framework
28   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  28 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
29 29 * @license http://framework.zend.com/license/new-bsd New BSD License
30 30 */
31 31 use Zend\Loader;
2  demos/Zend/Feeds/consume-feed.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Feed
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/3LeggedOAuth/Gdata_OAuth_Helper.php
@@ -10,7 +10,7 @@
10 10 * @category Zend
11 11 * @package Zend_Gdata
12 12 * @subpackage Demos
13   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  13 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
14 14 * @license http://framework.zend.com/license/new-bsd New BSD License
15 15 */
16 16
2  demos/Zend/Gdata/3LeggedOAuth/index.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
4 demos/Zend/Gdata/Blogger.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -58,7 +58,7 @@
58 58 * @category Zend
59 59 * @package Zend_Gdata
60 60 * @subpackage Demos
61   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  61 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
62 62 * @license http://framework.zend.com/license/new-bsd New BSD License
63 63 */
64 64 class SimpleCRUD
2  demos/Zend/Gdata/BooksBrowser/index.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/Calendar.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/Docs.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/Gapps.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/Gbase.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/Health.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/InstallationChecker.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/MyLibrary/demo.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Gdata/Photos.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
4 demos/Zend/Gdata/Spreadsheet-ClientLogin.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -56,7 +56,7 @@
56 56 * @category Zend
57 57 * @package Zend_Gdata
58 58 * @subpackage Demos
59   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  59 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
60 60 * @license http://framework.zend.com/license/new-bsd New BSD License
61 61 */
62 62 class SimpleCRUD
2  demos/Zend/Gdata/YouTubeVideoApp/index.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Gdata
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
2  demos/Zend/Gdata/YouTubeVideoApp/operations.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Gdata
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
2  demos/Zend/Gdata/YouTubeVideoApp/session_details.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Gdata
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
2  demos/Zend/Gdata/YouTubeVideoBrowser/index.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Gdata
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Locale/AllLanguages.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Locale
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
4 demos/Zend/Mail/SimpleMailer.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Mail
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -47,7 +47,7 @@
47 47 * @category Zend
48 48 * @package Zend_Mail
49 49 * @subpackage Demos
50   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  50 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
51 51 * @license http://framework.zend.com/license/new-bsd New BSD License
52 52 */
53 53 class Demo_Zend_Mail_SimpleMailer
4 demos/Zend/OpenId/mvc_auth/application/controllers/ErrorController.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_OpenId
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -31,7 +31,7 @@
31 31 * @package Zend_OpenId
32 32 * @subpackage Demos
33 33 * @uses Zend_Controller_Action
34   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  34 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
35 35 * @license http://framework.zend.com/license/new-bsd New BSD License
36 36 */
37 37 class ErrorController extends Zend_Controller_Action
4 demos/Zend/OpenId/mvc_auth/application/controllers/IndexController.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_OpenId
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -34,7 +34,7 @@
34 34 * @package Zend_OpenId
35 35 * @subpackage Demos
36 36 * @uses Zend_Controller_Action
37   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  37 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
38 38 * @license http://framework.zend.com/license/new-bsd New BSD License
39 39 */
40 40 class IndexController extends Zend_Controller_Action
2  demos/Zend/OpenId/mvc_auth/html/index.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_OpenId
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/OpenId/test_auth.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_OpenId
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/OpenId/test_consumer.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_OpenId
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/OpenId/test_server.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_OpenId
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Pdf/demo.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Pdf
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/ProgressBar/JsPush.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_ProgressBar
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/ProgressBar/Upload.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_ProgressBar
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/ProgressBar/ZendForm.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_ProgressBar
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Search/Lucene/feed-search/create-index.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Search_Lucene
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/Search/Lucene/feed-search/search-index.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Search_Lucene
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
4 demos/Zend/Search/Lucene/indexing/CreateIndex.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Search_Lucene
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -29,7 +29,7 @@
29 29 * @package Zend_Search_Lucene
30 30 * @subpackage Demos
31 31 * @uses Zend_Search_Lucene_Document
32   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  32 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
33 33 * @license http://framework.zend.com/license/new-bsd New BSD License
34 34 */
35 35 class FileDocument extends Zend_Search_Lucene_Document
4 demos/Zend/Service/LiveDocx/library/Zend/Service/LiveDocx/Helper.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Service
17 17 * @subpackage LiveDocx
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
@@ -29,7 +29,7 @@
29 29 * @category Demos
30 30 * @package Demos_Zend_Service
31 31 * @subpackage LiveDocx
32   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  32 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
33 33 * @license http://framework.zend.com/license/new-bsd New BSD License
34 34 */
35 35 class Helper
2  demos/Zend/WebServices/Amazon/amazon-search.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Service_Amazon
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/WebServices/Flickr/flickr-composite.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Service_Flickr
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/WebServices/Flickr/flickr-search.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Service_Flickr
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/WebServices/Protocols/xmlrpc-upc-lookup.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_XmlRpc
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
2  demos/Zend/WebServices/Yahoo/yahoo-multi-search.php
@@ -15,7 +15,7 @@
15 15 * @category Zend
16 16 * @package Zend_Service_Yahoo
17 17 * @subpackage Demos
18   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  18 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
19 19 * @license http://framework.zend.com/license/new-bsd New BSD License
20 20 */
21 21
4 demos/Zend/Wildfire/application/controllers/ErrorController.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Wildfire
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
@@ -23,7 +23,7 @@
23 23 *
24 24 * @category Zend
25 25 * @package Zend_Wildfire
26   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  26 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
27 27 * @license http://framework.zend.com/license/new-bsd New BSD License
28 28 */
29 29 class ErrorController extends Zend_Controller_Action
4 demos/Zend/Wildfire/application/controllers/IndexController.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Wildfire
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
@@ -26,7 +26,7 @@
26 26 *
27 27 * @category Zend
28 28 * @package Zend_Wildfire
29   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  29 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
30 30 * @license http://framework.zend.com/license/new-bsd New BSD License
31 31 */
32 32 class IndexController extends Zend_Controller_Action
4 demos/Zend/Wildfire/application/controllers/ZendDbProfilerFirebugController.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Wildfire
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
@@ -26,7 +26,7 @@
26 26 *
27 27 * @category Zend
28 28 * @package Zend_Wildfire
29   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  29 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
30 30 * @license http://framework.zend.com/license/new-bsd New BSD License
31 31 */
32 32 class ZendDbProfilerFirebugController extends Zend_Controller_Action
4 demos/Zend/Wildfire/application/controllers/ZendLogWriterFirebugController.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Wildfire
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
@@ -26,7 +26,7 @@
26 26 *
27 27 * @category Zend
28 28 * @package Zend_Wildfire
29   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  29 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
30 30 * @license http://framework.zend.com/license/new-bsd New BSD License
31 31 */
32 32 class ZendLogWriterFirebugController extends Zend_Controller_Action
4 demos/Zend/Wildfire/application/controllers/ZendWildfirePluginFirePhpController.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Wildfire
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
@@ -26,7 +26,7 @@
26 26 *
27 27 * @category Zend
28 28 * @package Zend_Wildfire
29   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  29 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
30 30 * @license http://framework.zend.com/license/new-bsd New BSD License
31 31 */
32 32 class ZendWildfirePluginFirePhpController extends Zend_Controller_Action
2  demos/Zend/Wildfire/public/index.php
@@ -14,7 +14,7 @@
14 14 *
15 15 * @category Zend
16 16 * @package Zend_Wildfire
17   - * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
  17 + * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
18 18 * @license http://framework.zend.com/license/new-bsd New BSD License
19 19 */
20 20
5 documentation/manual/de/tutorials/quickstart-create-form.xml
@@ -130,8 +130,9 @@ class GuestbookController extends Zend_Controller_Action
130 130
131 131 if ($this->getRequest()->isPost()) {
132 132 if ($form->isValid($request->getPost())) {
133   - $model = new Application_Model_Guestbook($form->getValues());
134   - $model->save();
  133 + $comment = new Application_Model_Guestbook($form->getValues());
  134 + $mapper = new Application_Model_GuestbookMapper();
  135 + $mapper->save($comment);
135 136 return $this->_helper->redirector('index');
136 137 }
137 138 }
10 documentation/manual/en/Makefile.in
@@ -38,9 +38,17 @@ FOP=@FOP@
38 38 ECSRC=@ECSRC@
39 39 HERE=@HERE@
40 40
41   -DOCBOOK_DTD?=http://framework.zend.com/docbook/xml/4.5/docbookx.dtd
  41 +# Docbook 5 DTD
  42 +DOCBOOK_DTD?=http://www.docbook.org/xml/5.0/dtd/docbook.dtd
  43 +
  44 +# You should grab the docbook-xsl-ns HTML chunk.xsl stylesheet and add it
  45 +# via an environment variable for best results.
42 46 DOCBOOK_XSL?=http://framework.zend.com/docbook-xsl/htmlhelp/htmlhelp.xsl
  47 +
  48 +# For rendering PDF
43 49 DOCBOOK_FO_XSL?=http://framework.zend.com/docbook-xsl/fo/docbook.xsl
  50 +
  51 +# Local modifications
44 52 HTML_XSL=html.xsl
45 53 MANUAL_XML=manual.xml
46 54 MANUAL_PRINT1_XML=manual-print1.xml
2  documentation/manual/en/manual-lint.xml.in
... ... @@ -1,5 +1,5 @@
1 1 <?xml version='1.0' encoding='UTF-8' ?>
2   -<!DOCTYPE book [
  2 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5//EN" "-" [
3 3 <!-- Add translated specific definitions and snippets -->
4 4 <!ENTITY % language-snippets SYSTEM "./ref/language-snippets.xml">
5 5 %language-snippets;
1  documentation/manual/en/manual-print2.xml.in
@@ -192,7 +192,6 @@
192 192 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service_Flickr.xml" parse="xml"/>
193 193 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service_Nirvanix.xml" parse="xml"/>
194 194 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service-ReCaptcha.xml" parse="xml"/>
195   - <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service_Simpy.xml" parse="xml"/>
196 195 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service_SlideShare.xml" parse="xml"/>
197 196 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service_StrikeIron-Overview.xml" parse="xml"/>
198 197 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Service_StrikeIron-BundledServices.xml" parse="xml"/>
98 documentation/manual/en/manual.xml.in
... ... @@ -1,5 +1,5 @@
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<!DOCTYPE book [
  2 +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5//EN" "-" [
3 3 <!-- Add translated specific definitions and snippets -->
4 4 <!ENTITY % language-snippets SYSTEM "./ref/language-snippets.xml">
5 5 %language-snippets;
@@ -444,8 +444,38 @@
444 444 <!--</xi:include>-->
445 445 <!--</chapter>-->
446 446
447   - <!--<chapter xml:id="zend.cache"><info><title>Zend_Cache</title></info>-->
448   - <!---->
  447 + <chapter xml:id="zend.cache"><info><title>Zend\Cache</title></info>
  448 +
  449 + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/zend.cache.storage.adapter.xml" parse="xml">
  450 + <xi:fallback>
  451 + <xi:include href="../en/module_specs/zend.cache.storage.adapter.xml" parse="xml"/>
  452 + </xi:fallback>
  453 + </xi:include>
  454 +
  455 + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/zend.cache.storage.plugin.xml" parse="xml">
  456 + <xi:fallback>
  457 + <xi:include href="../en/module_specs/zend.cache.storage.plugin.xml" parse="xml"/>
  458 + </xi:fallback>
  459 + </xi:include>
  460 +
  461 + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/zend.cache.storage.capabilities.xml" parse="xml">
  462 + <xi:fallback>
  463 + <xi:include href="../en/module_specs/zend.cache.storage.capabilities.xml" parse="xml"/>
  464 + </xi:fallback>
  465 + </xi:include>
  466 +
  467 + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/zend.cache.pattern.xml" parse="xml">
  468 + <xi:fallback>
  469 + <xi:include href="../en/module_specs/zend.cache.pattern.xml" parse="xml"/>
  470 + </xi:fallback>
  471 + </xi:include>
  472 +
  473 + <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/zend.cache.utils.xml" parse="xml">
  474 + <xi:fallback>
  475 + <xi:include href="../en/module_specs/zend.cache.utils.xml" parse="xml"/>
  476 + </xi:fallback>
  477 + </xi:include>
  478 +
449 479 <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module_specs/Zend_Cache-Introduction.xml" parse="xml">-->
450 480 <!--<xi:fallback>-->
451 481 <!--<xi:include href="../en/module_specs/Zend_Cache-Introduction.xml" parse="xml"/>-->
@@ -471,7 +501,7 @@
471 501 <!--<xi:include href="../en/module_specs/Zend_Cache-Cache_Manager.xml" parse="xml"/>-->
472 502 <!--</xi:fallback>-->
473 503 <!--</xi:include>-->
474   - <!--</chapter>-->
  504