Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'zf2phpunit35' of http://github.com/billkarwin/zf2 into …

…merges/karwin-phpunit35

Conflicts:
	library/Zend/Filter/Encrypt/Openssl.php
	library/Zend/Service/Akismet/Akismet.php
	library/Zend/Service/Amazon/Amazon.php
	library/Zend/Service/Amazon/Exception.php
	library/Zend/Service/Amazon/Query.php
	library/Zend/Service/Audioscrobbler/Audioscrobbler.php
	library/Zend/Service/SlideShare/Exception.php
	tests/Zend/Layout/FunctionalTest.php
	tests/Zend/Markup/ParserIntegrityTest.php
	tests/Zend/Server/ReflectionTest.php
	tests/Zend/Service/Akismet/AkismetTest.php
	tests/Zend/Service/Audioscrobbler/AlbumDataTest.php
	tests/Zend/Service/Audioscrobbler/AudioscrobblerTestCase.php
	tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
	tests/Zend/Tag/ItemListTest.php
	tests/Zend/Tag/ItemTest.php
	tests/Zend/Text/MultiByteTest.php
	tests/Zend/Text/TableTest.php
	tests/Zend/Translate/Adapter/XmlTmTest.php
	tests/Zend/Validator/BarcodeTest.php
	tests/Zend/Validator/CallbackTest.php
	tests/Zend/Validator/File/FilesSizeTest.php
	tests/Zend/Validator/File/ImageSizeTest.php
	tests/Zend/Validator/File/SizeTest.php
	tests/Zend/Validator/File/UploadTest.php
	tests/Zend/Validator/File/WordCountTest.php
	tests/Zend/Validator/IbanTest.php
	tests/Zend/Validator/MessageTest.php
	tests/Zend/Validator/PostCodeTest.php
	tests/Zend/Validator/RegexTest.php
	tests/Zend/Validator/ValidateTest.php
  • Loading branch information...
commit d4ec1fd05e858b23447062fc5f2d8ee5c3af0158 2 parents 5417a4a + 7815b03
Matthew Weier O'Phinney authored November 02, 2010

Showing 302 changed files with 1,427 additions and 2,899 deletions. Show diff stats Hide diff stats

  1. 2  library/Zend/Captcha/ReCaptcha.php
  2. 2  library/Zend/Filter/Encrypt/Openssl.php
  3. 2  library/Zend/Mail/AbstractProtocol.php
  4. 2  library/Zend/OAuth/Token.php
  5. 2  library/Zend/OAuth/Token/Request.php
  6. 14  library/Zend/Service/Akismet/Akismet.php
  7. 2  library/Zend/Service/Audioscrobbler/Audioscrobbler.php
  8. 2  library/Zend/Service/Delicious/Exception.php
  9. 2  library/Zend/Service/DeveloperGarden/Client/Soap.php
  10. 1  library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
  11. 4  library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
  12. 1  library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
  13. 4  library/Zend/Service/DeveloperGarden/Exception.php
  14. 4  library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
  15. 12  library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
  16. 76  library/Zend/Service/Flickr.php
  17. 2  library/Zend/Service/Nirvanix.php
  18. 4  library/Zend/Service/Nirvanix/Exception.php
  19. 4  library/Zend/Service/Nirvanix/Namespace/Base.php
  20. 4  library/Zend/Service/Nirvanix/Namespace/Imfs.php
  21. 10  library/Zend/Service/Simpy.php
  22. 3  library/Zend/Service/SlideShare/Exception.php
  23. 4  library/Zend/Service/StrikeIron/Exception.php
  24. 4  library/Zend/Service/Technorati/Exception.php
  25. 2  library/Zend/Service/Technorati/ResultSet.php
  26. 4  library/Zend/Service/WindowsAzure/Exception.php
  27. 14  library/Zend/Service/WindowsAzure/Storage.php
  28. 44  library/Zend/Service/WindowsAzure/Storage/Blob.php
  29. 122  library/Zend/Service/Yahoo.php
  30. 6  library/Zend/Service/Yahoo/ResultSet.php
  31. 2  library/Zend/Validator/Alnum.php
  32. 2  library/Zend/Validator/Alpha.php
  33. 2  library/Zend/Validator/Between.php
  34. 2  library/Zend/Validator/Callback.php
  35. 2  library/Zend/Validator/Ccnum.php
  36. 2  library/Zend/Validator/CreditCard.php
  37. 2  library/Zend/Validator/Date.php
  38. 2  library/Zend/Validator/Db/AbstractDb.php
  39. 2  library/Zend/Validator/Digits.php
  40. 4  library/Zend/Validator/EmailAddress.php
  41. 2  library/Zend/Validator/File/Count.php
  42. 2  library/Zend/Validator/File/Crc32.php
  43. 2  library/Zend/Validator/File/ExcludeExtension.php
  44. 2  library/Zend/Validator/File/ExcludeMimeType.php
  45. 2  library/Zend/Validator/File/Exists.php
  46. 2  library/Zend/Validator/File/Extension.php
  47. 2  library/Zend/Validator/File/FilesSize.php
  48. 2  library/Zend/Validator/File/Hash.php
  49. 2  library/Zend/Validator/File/ImageSize.php
  50. 2  library/Zend/Validator/File/Md5.php
  51. 2  library/Zend/Validator/File/NotExists.php
  52. 2  library/Zend/Validator/File/Sha1.php
  53. 2  library/Zend/Validator/File/Size.php
  54. 2  library/Zend/Validator/File/Upload.php
  55. 2  library/Zend/Validator/File/WordCount.php
  56. 2  library/Zend/Validator/Float.php
  57. 2  library/Zend/Validator/GreaterThan.php
  58. 2  library/Zend/Validator/Hex.php
  59. 2  library/Zend/Validator/Hostname.php
  60. 2  library/Zend/Validator/Iban.php
  61. 4  library/Zend/Validator/Identical.php
  62. 2  library/Zend/Validator/InArray.php
  63. 2  library/Zend/Validator/Int.php
  64. 2  library/Zend/Validator/Ip.php
  65. 2  library/Zend/Validator/Isbn.php
  66. 2  library/Zend/Validator/LessThan.php
  67. 2  library/Zend/Validator/NotEmpty.php
  68. 2  library/Zend/Validator/PostCode.php
  69. 2  library/Zend/Validator/Regex.php
  70. 2  library/Zend/Validator/StringLength.php
  71. 4  library/Zend/Validator/ValidatorChain.php
  72. 4  library/Zend/View/Helper/Navigation/Sitemap.php
  73. 6  tests/Zend/Amf/AuthTest.php
  74. 27  tests/Zend/Amf/TestAsset/IntrospectorTest.php
  75. 30  tests/Zend/Amf/TestAsset/ReferenceTest.php
  76. 1  tests/Zend/Amf/TestAsset/ZendAmfAdobeIntrospectorTest.php
  77. 11  tests/Zend/Amf/Value/MessageBodyTest.php
  78. 20  tests/Zend/Amf/Value/MessageHeaderTest.php
  79. 3  tests/Zend/Application/TestAsset/appconfig.inc
  80. 28  tests/Zend/Barcode/Object/TestAsset/BarcodeTest.php
  81. 4  tests/Zend/Cache/CoreTest.php
  82. 11  tests/Zend/Cache/ManagerTest.php
  83. 7  tests/Zend/Cache/SkipTests.php
  84. 19  tests/Zend/Cache/StaticBackendTest.php
  85. 4  tests/Zend/CodeGenerator/Php/PhpDocblockTagTest.php
  86. 4  tests/Zend/CodeGenerator/Php/PhpDocblockTest.php
  87. 7  tests/Zend/Controller/Action/Helper/CacheTest.php
  88. 5  tests/Zend/Controller/Action/Helper/ViewRendererTest.php
  89. 25  tests/Zend/Controller/Plugin/PutHandlerTest.php
  90. 24  tests/Zend/Controller/Request/Apache404Test.php
  91. 21  tests/Zend/Controller/Request/HttpTestCaseTest.php
  92. 25  tests/Zend/Controller/Request/SimpleTest.php
  93. 21  tests/Zend/Controller/Response/HttpTestCaseTest.php
  94. 2  tests/Zend/Controller/_files/modules/bar/views/scripts/index/test.phtml
  95. 2  tests/Zend/Controller/_files/modules/bar/views/scripts/test.phtml
  96. 2  tests/Zend/Controller/views/scripts/foo-bar/baz-bat.phtml
  97. 2  tests/Zend/Controller/views/scripts/site.phtml
  98. 2  tests/Zend/Controller/views/scripts/view/index.phtml
  99. 2  tests/Zend/Controller/views/scripts/view/name.phtml
  100. 6  tests/Zend/Db/Adapter/AbstractPdoTest.php
  101. 5  tests/Zend/Db/Adapter/AbstractTest.php
  102. 6  tests/Zend/Db/Adapter/SqlsrvTest.php
  103. 12  tests/Zend/Db/Adapter/TestAsset/Test/Db2Statement.php
  104. 12  tests/Zend/Db/Adapter/TestAsset/Test/MysqliStatement.php
  105. 12  tests/Zend/Db/Adapter/TestAsset/Test/OracleStatement.php
  106. 8  tests/Zend/Db/Profiler/FirebugTest.php
  107. 4  tests/Zend/Db/Select/AbstractTest.php
  108. 2  tests/Zend/Db/Table/Rowset/StaticTest.php
  109. 5  tests/Zend/Db/Table/Select/AbstractTest.php
  110. 6  tests/Zend/Db/Table/Table/AbstractTest.php
  111. 12  tests/Zend/Db/TestUtil/Common.php
  112. 2  tests/Zend/Db/TestUtil/Db2.php
  113. 7  tests/Zend/Db/TestUtil/Oracle.php
  114. 8  tests/Zend/Db/TestUtil/Pdo/Common.php
  115. 6  tests/Zend/Db/TestUtil/Pdo/Ibm.php
  116. 6  tests/Zend/Db/TestUtil/Pdo/Mssql.php
  117. 6  tests/Zend/Db/TestUtil/Pdo/Oci.php
  118. 6  tests/Zend/Db/TestUtil/Pdo/Pgsql.php
  119. 6  tests/Zend/Db/TestUtil/Pdo/Sqlite.php
  120. 11  tests/Zend/File/Transfer/Adapter/AbstractTest.php
  121. 3  tests/Zend/Form/TestAsset/decorators/Label.php
  122. 3  tests/Zend/Form/TestAsset/decorators/TableRow.php
  123. 5  tests/Zend/Http/CookieJarTest.php
  124. 4  tests/Zend/Json/Server/CacheTest.php
  125. 24  tests/Zend/Json/Server/ErrorTest.php
  126. 1  tests/Zend/Layout/FunctionalTest.php
  127. 3  tests/Zend/Loader/AutoloadableClass.php
  128. 3  tests/Zend/Loader/AutoloaderMultiVersionTest.php
  129. 2  tests/Zend/Loader/LoaderTest.php
  130. 7  tests/Zend/Loader/MyLoader.php
  131. 7  tests/Zend/Loader/MyOverloader.php
  132. 2  tests/Zend/Loader/_files/ZfTest/CacheTest.php
  133. 2  tests/Zend/Loader/_files/ZfTest/FormSubmit.php
  134. 3  tests/Zend/Loader/_files/_testDir1/Class1.php
  135. 3  tests/Zend/Loader/_files/_testDir1/Class1/Subclass2.php
  136. 3  tests/Zend/Loader/_files/_testDir1/Class3.php
  137. 3  tests/Zend/Loader/_files/_testDir1/Class4.php
  138. 3  tests/Zend/Loader/_files/_testDir1/ClassNonexistent.php
  139. 3  tests/Zend/Loader/_files/_testDir1/Interface1.php
  140. 3  tests/Zend/Loader/_files/_testDir2/Class2.php
  141. 3  tests/Zend/Memory/AccessControllerTest.php
  142. 17  tests/Zend/Navigation/NavigationTest.php
  143. 28  tests/Zend/OAuth/ConsumerTest.php
  144. 28  tests/Zend/OAuth/Http/AccessTokenTest.php
  145. 27  tests/Zend/OAuth/Http/RequestTokenTest.php
  146. 29  tests/Zend/OAuth/Http/UserAuthorizationTest.php
  147. 29  tests/Zend/OAuth/Http/UtilityTest.php
  148. 29  tests/Zend/OAuth/OAuthTest.php
  149. 29  tests/Zend/OAuth/Signature/AbstractTest.php
  150. 29  tests/Zend/OAuth/Signature/HMACTest.php
  151. 29  tests/Zend/OAuth/Signature/PlaintextTest.php
  152. 29  tests/Zend/OAuth/Signature/RSATest.php
  153. 29  tests/Zend/OAuth/Token/AccessTest.php
  154. 29  tests/Zend/OAuth/Token/AuthorizedRequestTest.php
  155. 29  tests/Zend/OAuth/Token/RequestTest.php
  156. 772  tests/Zend/OpenId/ResponseHelper.php
  157. BIN  tests/Zend/Paginator/_files/test.sqlite
  158. 1  tests/Zend/Serializer/Adapter/Amf0Test.php
  159. 1  tests/Zend/Serializer/Adapter/Amf3Test.php
  160. 1  tests/Zend/Serializer/Adapter/IgBinaryTest.php
  161. 1  tests/Zend/Serializer/Adapter/JsonTest.php
  162. 1  tests/Zend/Serializer/Adapter/PhpCodeTest.php
  163. 1  tests/Zend/Serializer/Adapter/PhpSerializeTest.php
  164. 1  tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol0Test.php
  165. 1  tests/Zend/Serializer/Adapter/PythonPickleSerializeProtocol1Test.php
  166. 1  tests/Zend/Serializer/Adapter/PythonPickleUnserializeTest.php
  167. 1  tests/Zend/Serializer/Adapter/WddxTest.php
  168. 1  tests/Zend/Serializer/SerializerTest.php
  169. 4  tests/Zend/Server/ReflectionTest.php
  170. 18  tests/Zend/Service/DeveloperGarden/AllOfflineTests.php
  171. 18  tests/Zend/Service/DeveloperGarden/AllOnlineTests.php
  172. 20  tests/Zend/Service/DeveloperGarden/BaseUserServiceTest.php
  173. 19  tests/Zend/Service/DeveloperGarden/ConferenceCallTest.php
  174. 20  tests/Zend/Service/DeveloperGarden/IpLocationTest.php
  175. 20  tests/Zend/Service/DeveloperGarden/LocalSearchTest.php
  176. 20  tests/Zend/Service/DeveloperGarden/OfflineBaseUserServiceTest.php
  177. 20  tests/Zend/Service/DeveloperGarden/OfflineClientTest.php
  178. 20  tests/Zend/Service/DeveloperGarden/OfflineConferenceCallTest.php
  179. 20  tests/Zend/Service/DeveloperGarden/OfflineCredentialTest.php
  180. 20  tests/Zend/Service/DeveloperGarden/OfflineIpLocationTest.php
  181. 20  tests/Zend/Service/DeveloperGarden/OfflineLocalSearchParametersTest.php
  182. 36  tests/Zend/Service/DeveloperGarden/OfflineSecurityTokenServerTest.php
  183. 20  tests/Zend/Service/DeveloperGarden/SecurityTokenServerTest.php
  184. 20  tests/Zend/Service/DeveloperGarden/SendSmsTest.php
  185. 20  tests/Zend/Service/DeveloperGarden/SmsValidationTest.php
  186. 20  tests/Zend/Service/DeveloperGarden/VoiceCallTest.php
  187. 4  tests/Zend/Service/Flickr/OfflineTest.php
  188. 14  tests/Zend/Service/LiveDocx/LiveDocxTest.php
  189. 14  tests/Zend/Service/LiveDocx/MailMergeTest.php
  190. 4  tests/Zend/Service/Nirvanix/FunctionalTestCase.php
  191. 8  tests/Zend/Service/Nirvanix/Namespace/BaseTest.php
  192. 1  tests/Zend/Service/StrikeIron/StrikeIronTest.php
  193. 10  tests/Zend/Service/Technorati/AuthorTest.php
  194. 15  tests/Zend/Service/Technorati/TestCase.php
  195. 24  tests/Zend/Service/Twitter/AllTests.php
  196. 33  tests/Zend/Service/Twitter/TwitterSearchTest.php
  197. 63  tests/Zend/Service/WindowsAzure/BlobStorageSharedAccessTest.php
  198. 21  tests/Zend/Service/WindowsAzure/BlobStorageTest.php
  199. 23  tests/Zend/Service/WindowsAzure/BlobStreamTest.php
  200. 22  tests/Zend/Service/WindowsAzure/Credentials/SharedAccessSignatureTest.php
  201. 21  tests/Zend/Service/WindowsAzure/Credentials/SharedKeyLiteTest.php
  202. 21  tests/Zend/Service/WindowsAzure/Credentials/SharedKeyTest.php
  203. 21  tests/Zend/Service/WindowsAzure/DynamicTableEntityTest.php
  204. 21  tests/Zend/Service/WindowsAzure/QueueStorageTest.php
  205. 21  tests/Zend/Service/WindowsAzure/RetryPolicyTest.php
  206. 21  tests/Zend/Service/WindowsAzure/SessionHandlerTest.php
  207. 21  tests/Zend/Service/WindowsAzure/StorageTest.php
  208. 21  tests/Zend/Service/WindowsAzure/TableEntityQueryTest.php
  209. 21  tests/Zend/Service/WindowsAzure/TableEntityTest.php
  210. 21  tests/Zend/Service/WindowsAzure/TableStorageTest.php
  211. 8  tests/Zend/Service/Yahoo/OfflineTest.php
  212. 28  tests/Zend/Session/ContainerTest.php
  213. 28  tests/Zend/Session/SessionConfigurationTest.php
  214. 28  tests/Zend/Session/SessionManagerTest.php
  215. 28  tests/Zend/Session/SessionStorageTest.php
  216. 28  tests/Zend/Session/StandardConfigurationTest.php
  217. 28  tests/Zend/Session/StorageTest.php
  218. 12  tests/Zend/SignalSlot/GlobalSignalsTest.php
  219. 26  tests/Zend/SignalSlot/SignalsTest.php
  220. 26  tests/Zend/Stdlib/FilterChainTest.php
  221. 26  tests/Zend/Stdlib/SignalHandlerTest.php
  222. 29  tests/Zend/Stdlib/SplPriorityQueueTest.php
  223. 29  tests/Zend/Stdlib/SplQueueTest.php
  224. 29  tests/Zend/Stdlib/SplStackTest.php
  225. 12  tests/Zend/Tag/Cloud/Decorator/HtmlTagTest.php
  226. 1  tests/Zend/Tag/ItemListTest.php
  227. 1  tests/Zend/Tag/ItemTest.php
  228. 5  tests/Zend/Text/FigletTest.php
  229. 1  tests/Zend/Text/MultiByteTest.php
  230. 6  tests/Zend/Text/TableTest.php
  231. 8  tests/Zend/Tool/Framework/Client/RequestTest.php
  232. 10  tests/Zend/Translator/Adapter/ArrayTest.php
  233. 12  tests/Zend/Translator/Adapter/GettextTest.php
  234. 15  tests/Zend/Translator/Adapter/QtTest.php
  235. 28  tests/Zend/Uri/UrlTest.php
  236. 18  tests/Zend/Validator/AbstractTest.php
  237. 14  tests/Zend/Validator/AlnumTest.php
  238. 14  tests/Zend/Validator/AlphaTest.php
  239. 10  tests/Zend/Validator/BarcodeTest.php
  240. 8  tests/Zend/Validator/BetweenTest.php
  241. 7  tests/Zend/Validator/CallbackTest.php
  242. 14  tests/Zend/Validator/CcnumTest.php
  243. 8  tests/Zend/Validator/CreditCardTest.php
  244. 14  tests/Zend/Validator/DateTest.php
  245. 6  tests/Zend/Validator/Db/NoRecordExistsTest.php
  246. 6  tests/Zend/Validator/Db/RecordExistsTest.php
  247. 14  tests/Zend/Validator/DigitsTest.php
  248. 10  tests/Zend/Validator/EmailAddressTest.php
  249. 30  tests/Zend/Validator/File/CountTest.php
  250. 35  tests/Zend/Validator/File/Crc32Test.php
  251. 35  tests/Zend/Validator/File/ExcludeExtensionTest.php
  252. 8  tests/Zend/Validator/File/ExcludeMimeTypeTest.php
  253. 34  tests/Zend/Validator/File/ExistsTest.php
  254. 35  tests/Zend/Validator/File/ExtensionTest.php
  255. 10  tests/Zend/Validator/File/FilesSizeTest.php
  256. 35  tests/Zend/Validator/File/HashTest.php
  257. 9  tests/Zend/Validator/File/ImageSizeTest.php
  258. 19  tests/Zend/Validator/File/IsCompressedTest.php
  259. 19  tests/Zend/Validator/File/IsImageTest.php
  260. 35  tests/Zend/Validator/File/Md5Test.php
  261. 8  tests/Zend/Validator/File/MimeTypeTest.php
  262. 35  tests/Zend/Validator/File/NotExistsTest.php
  263. 35  tests/Zend/Validator/File/Sha1Test.php
  264. 11  tests/Zend/Validator/File/SizeTest.php
  265. 10  tests/Zend/Validator/File/UploadTest.php
  266. 9  tests/Zend/Validator/File/WordCountTest.php
  267. 14  tests/Zend/Validator/FloatTest.php
  268. 8  tests/Zend/Validator/GreaterThanTest.php
  269. 14  tests/Zend/Validator/HexTest.php
  270. 10  tests/Zend/Validator/HostnameTest.php
  271. 7  tests/Zend/Validator/IbanTest.php
  272. 14  tests/Zend/Validator/IdenticalTest.php
  273. 8  tests/Zend/Validator/InArrayTest.php
  274. 14  tests/Zend/Validator/IntTest.php
  275. 14  tests/Zend/Validator/IpTest.php
  276. 5  tests/Zend/Validator/IsbnTest.php
  277. 8  tests/Zend/Validator/LessThanTest.php
  278. 10  tests/Zend/Validator/MessageTest.php
  279. 12  tests/Zend/Validator/NotEmptyTest.php
  280. 23  tests/Zend/Validator/PostCodeTest.php
  281. 8  tests/Zend/Validator/RegexTest.php
  282. 12  tests/Zend/Validator/Sitemap/ChangefreqTest.php
  283. 10  tests/Zend/Validator/Sitemap/LastmodTest.php
  284. 10  tests/Zend/Validator/Sitemap/LocTest.php
  285. 10  tests/Zend/Validator/Sitemap/PriorityTest.php
  286. 6  tests/Zend/Validator/StaticValidatorTest.php
  287. 12  tests/Zend/Validator/StringLengthTest.php
  288. 15  tests/Zend/Validator/ValidateTest.php
  289. 5  tests/Zend/View/Helper/BaseUrlTest.php
  290. 25  tests/Zend/View/Helper/DeclareVarsTest.php
  291. 6  tests/Zend/View/Helper/FormCheckboxTest.php
  292. 5  tests/Zend/View/Helper/FormErrorsTest.php
  293. 4  tests/Zend/View/Helper/FormFileTest.php
  294. 4  tests/Zend/View/Helper/FormImageTest.php
  295. 4  tests/Zend/View/Helper/FormLabelTest.php
  296. 4  tests/Zend/View/Helper/HeadLinkTest.php
  297. 4  tests/Zend/View/Helper/HeadMetaTest.php
  298. 4  tests/Zend/View/Helper/HeadScriptTest.php
  299. 4  tests/Zend/View/Helper/HeadStyleTest.php
  300. 4  tests/Zend/View/Helper/PaginationControlTest.php
  301. 4  tests/Zend/View/Helper/PartialLoopTest.php
2  library/Zend/Captcha/ReCaptcha.php
@@ -216,7 +216,7 @@ public function generate()
216 216
     /**
217 217
      * Validate captcha
218 218
      *
219  
-     * @see    Zend_Validate_Interface::isValid()
  219
+     * @see    Zend\Validator::isValid()
220 220
      * @param  mixed $value
221 221
      * @return boolean
222 222
      */
2  library/Zend/Filter/Encrypt/Openssl.php
@@ -474,7 +474,7 @@ public function decrypt($value)
474 474
         // decompress after decryption
475 475
         if (!empty($this->_compression)) {
476 476
             require_once 'Zend/Filter/Decompress.php';
477  
-            $decompress = new \Zend\Filter\Decompress($this->_compression);
  477
+            $decompress = new Decompress($this->_compression);
478 478
             $decrypted  = $decompress->filter($decrypted);
479 479
         }
480 480
 
2  library/Zend/Mail/AbstractProtocol.php
@@ -79,7 +79,7 @@
79 79
 
80 80
 
81 81
     /**
82  
-     * Instance of Zend_Validate to check hostnames
  82
+     * Instance of Zend\Validator\ValidatorChain to check hostnames
83 83
      * @var \Zend\Validator\ValidatorChain
84 84
      */
85 85
     protected $_validHost;
2  library/Zend/OAuth/Token.php
@@ -36,7 +36,7 @@
36 36
      * @param  HTTPUtility $utility 
37 37
      * @return void
38 38
      */
39  
-    public function __construct($response = null, HTTPUtility $utility = null);
  39
+    public function __construct(HTTPResponse $response = null, HTTPUtility $utility = null);
40 40
 
41 41
     /**
42 42
      * Retrieve an arbitrary named parameter from the token
2  library/Zend/OAuth/Token/Request.php
@@ -46,7 +46,7 @@ class Request extends AbstractToken
46 46
      * @param null|Zend\OAuth\Http\Utility $utility
47 47
      */
48 48
     public function __construct(
49  
-        $response = null,
  49
+        HTTPResponse $response = null,
50 50
         HTTPUtility $utility = null
51 51
     ) {
52 52
         parent::__construct($response, $utility);
14  library/Zend/Service/Akismet/Akismet.php
@@ -31,7 +31,7 @@
31 31
  *
32 32
  * @uses       Zend_Http_Client
33 33
  * @uses       Zend\Service\AbstractService
34  
- * @uses       Zend_Service_Exception
  34
+ * @uses       Zend\Service\Exception
35 35
  * @uses       Zend_Uri
36 36
  * @uses       Zend_Version
37 37
  * @category   Zend
@@ -101,7 +101,7 @@ public function getBlogUrl()
101 101
      *
102 102
      * @param string $blogUrl
103 103
      * @return Zend_Service_Akismet
104  
-     * @throws Zend_Service_Exception if invalid URL provided
  104
+     * @throws Zend\Service\Exception if invalid URL provided
105 105
      */
106 106
     public function setBlogUrl($blogUrl)
107 107
     {
@@ -172,7 +172,7 @@ public function getPort()
172 172
      *
173 173
      * @param int $port
174 174
      * @return Zend_Service_Akismet
175  
-     * @throws Zend_Service_Exception if non-integer value provided
  175
+     * @throws Zend\Service\Exception if non-integer value provided
176 176
      */
177 177
     public function setPort($port)
178 178
     {
@@ -201,7 +201,7 @@ public function getUserAgent()
201 201
      *
202 202
      * @param string $userAgent
203 203
      * @return Zend_Service_Akismet
204  
-     * @throws Zend_Service_Exception with invalid user agent string
  204
+     * @throws Zend\Service\Exception with invalid user agent string
205 205
      */
206 206
     public function setUserAgent($userAgent)
207 207
     {
@@ -273,7 +273,7 @@ public function verifyKey($key = null, $blog = null)
273 273
      * @param string $path
274 274
      * @param array $params
275 275
      * @return Zend_Http_Response
276  
-     * @throws Zend_Service_Exception if missing user_ip or user_agent fields
  276
+     * @throws Zend\Service\Exception if missing user_ip or user_agent fields
277 277
      */
278 278
     protected function _makeApiCall($path, $params)
279 279
     {
@@ -312,7 +312,7 @@ protected function _makeApiCall($path, $params)
312 312
      *
313 313
      * @param array $params
314 314
      * @return boolean
315  
-     * @throws Zend_Service_Exception with invalid API key
  315
+     * @throws Zend\Service\Exception with invalid API key
316 316
      */
317 317
     public function isSpam($params)
318 318
     {
@@ -342,7 +342,7 @@ public function isSpam($params)
342 342
      *
343 343
      * @param array $params
344 344
      * @return void
345  
-     * @throws Zend_Service_Exception with invalid API key
  345
+     * @throws Zend\Service\Exception with invalid API key
346 346
      */
347 347
     public function submitSpam($params)
348 348
     {
2  library/Zend/Service/Audioscrobbler/Audioscrobbler.php
@@ -29,7 +29,7 @@
29 29
 /**
30 30
  * @uses       Zend_Http_Client
31 31
  * @uses       Zend_Http_Client_Exception
32  
- * @uses       Zend_Service_Exception
  32
+ * @uses       Zend\Service\Exception
33 33
  * @category   Zend
34 34
  * @package    Zend_Service
35 35
  * @subpackage Audioscrobbler
2  library/Zend/Service/Delicious/Exception.php
@@ -25,7 +25,7 @@
25 25
 namespace Zend\Service\Delicious;
26 26
 
27 27
 /**
28  
- * @uses       Zend_Service_Exception
  28
+ * @uses       Zend\Service\Exception
29 29
  * @category   Zend
30 30
  * @package    Zend_Service
31 31
  * @subpackage Delicious
2  library/Zend/Service/DeveloperGarden/Client/Soap.php
@@ -31,7 +31,7 @@
31 31
  * @author     Marco Kaiser
32 32
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
33 33
  */
34  
-class Zend_Service_DeveloperGarden_Client_Soap extends Zend_Soap_Client
  34
+class Zend_Service_DeveloperGarden_Client_Soap extends Zend\Soap\Client
35 35
 {
36 36
     /**
37 37
      * class with credential interface
1  library/Zend/Service/DeveloperGarden/ConferenceCall/Participant.php
@@ -20,7 +20,6 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Validate_Ip
24 23
  * @category   Zend
25 24
  * @package    Zend_Service
26 25
  * @subpackage DeveloperGarden
4  library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantDetail.php
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Validate_EmailAddress
  23
+ * @uses       Zend\Validator\EmailAddress
24 24
  * @uses       Zend_Service_DeveloperGarden_Exception
25 25
  * @category   Zend
26 26
  * @package    Zend_Service
@@ -158,7 +158,7 @@ public function getEmail()
158 158
      */
159 159
     public function setEmail($email)
160 160
     {
161  
-        $validator = new Zend_Validate_EmailAddress();
  161
+        $validator = new Zend\Validator\EmailAddress();
162 162
 
163 163
         if (!$validator->isValid($email)) {
164 164
             throw new Zend_Service_DeveloperGarden_Exception('Not a valid e-mail address.');
1  library/Zend/Service/DeveloperGarden/ConferenceCall/ParticipantStatus.php
@@ -20,7 +20,6 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Validate_Ip
24 23
  * @category   Zend
25 24
  * @package    Zend_Service
26 25
  * @subpackage DeveloperGarden
4  library/Zend/Service/DeveloperGarden/Exception.php
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Service_Exception
  23
+ * @uses       Zend\Service\Exception
24 24
  * @category   Zend
25 25
  * @package    Zend_Service
26 26
  * @subpackage DeveloperGarden
@@ -28,6 +28,6 @@
28 28
  * @author     Marco Kaiser
29 29
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
30 30
  */
31  
-class Zend_Service_DeveloperGarden_Exception extends Zend_Service_Exception
  31
+class Zend_Service_DeveloperGarden_Exception extends Zend\Service\Exception
32 32
 {
33 33
 }
4  library/Zend/Service/DeveloperGarden/IpLocation/IpAddress.php
@@ -20,7 +20,7 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Validate_Ip
  23
+ * @uses       Zend\Validator\Ip
24 24
  * @uses       Zend_Service_DeveloperGarden_Exception
25 25
  * @category   Zend
26 26
  * @package    Zend_Service
@@ -75,7 +75,7 @@ public function __construct($ip, $version = 4)
75 75
      */
76 76
     public function setIp($ip)
77 77
     {
78  
-        $validator = new Zend_Validate_Ip();
  78
+        $validator = new Zend\Validator\Ip();
79 79
 
80 80
         if (!$validator->isValid($ip)) {
81 81
             $message = $validator->getMessages();
12  library/Zend/Service/DeveloperGarden/LocalSearch/SearchParameters.php
@@ -21,9 +21,9 @@
21 21
 
22 22
 /**
23 23
  * @uses       Zend_Service_DeveloperGarden_LocalSearch_Exception
24  
- * @uses       Zend_Validate_Between
25  
- * @uses       Zend_Validate_Int
26  
- * @uses       Zend_Validate_NotEmpty
  24
+ * @uses       Zend\Validator\Between
  25
+ * @uses       Zend\Validator\Int
  26
+ * @uses       Zend\Validator\NotEmpty
27 27
  * @category   Zend
28 28
  * @package    Zend_Service
29 29
  * @subpackage DeveloperGarden
@@ -178,7 +178,7 @@ public function disableDidYouMeanRelated()
178 178
      */
179 179
     public function setHits($hits = 10)
180 180
     {
181  
-        $validator = new Zend_Validate_Between(0, 1000);
  181
+        $validator = new Zend\Validator\Between(0, 1000);
182 182
         if (!$validator->isValid($hits)) {
183 183
             $message = $validator->getMessages();
184 184
             throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
@@ -221,7 +221,7 @@ public function setCollapse($value)
221 221
      */
222 222
     public function setWhere($where)
223 223
     {
224  
-        $validator = new Zend_Validate_NotEmpty();
  224
+        $validator = new Zend\Validator\NotEmpty();
225 225
         if (!$validator->isValid($where)) {
226 226
             $message = $validator->getMessages();
227 227
             throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
@@ -270,7 +270,7 @@ public function disableSpatial()
270 270
      */
271 271
     public function setRadius($radius)
272 272
     {
273  
-        $validator = new Zend_Validate_Int();
  273
+        $validator = new Zend\Validator\Int();
274 274
         if (!$validator->isValid($radius)) {
275 275
             $message = $validator->getMessages();
276 276
             throw new Zend_Service_DeveloperGarden_LocalSearch_Exception(current($message));
76  library/Zend/Service/Flickr.php
@@ -23,11 +23,11 @@
23 23
  * @uses       DOMDocument
24 24
  * @uses       DOMXPath
25 25
  * @uses       Zend_Rest_Client
26  
- * @uses       Zend_Service_Exception
  26
+ * @uses       Zend\Service\Exception
27 27
  * @uses       Zend_Service_Flickr_Image
28 28
  * @uses       Zend_Service_Flickr_ResultSet
29  
- * @uses       Zend_Validate_Between
30  
- * @uses       Zend_Validate_Int
  29
+ * @uses       Zend\Validator\Between
  30
+ * @uses       Zend\Validator\Int
31 31
  * @category   Zend
32 32
  * @package    Zend_Service
33 33
  * @subpackage Flickr
@@ -88,7 +88,7 @@ public function __construct($apiKey)
88 88
      * @param  string|array $query   A single tag or an array of tags.
89 89
      * @param  array        $options Additional parameters to refine your query.
90 90
      * @return Zend_Service_Flickr_ResultSet
91  
-     * @throws Zend_Service_Exception
  91
+     * @throws Zend\Service\Exception
92 92
      */
93 93
     public function tagSearch($query, array $options = array())
94 94
     {
@@ -110,7 +110,7 @@ public function tagSearch($query, array $options = array())
110 110
         $response = $restClient->restGet('/services/rest/', $options);
111 111
 
112 112
         if ($response->isError()) {
113  
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
  113
+            throw new Zend\Service\Exception('An error occurred sending request. Status code: '
114 114
                                            . $response->getStatus());
115 115
         }
116 116
 
@@ -138,7 +138,7 @@ public function tagSearch($query, array $options = array())
138 138
      * @param  string $query   username or email
139 139
      * @param  array  $options Additional parameters to refine your query.
140 140
      * @return Zend_Service_Flickr_ResultSet
141  
-     * @throws Zend_Service_Exception
  141
+     * @throws Zend\Service\Exception
142 142
      */
143 143
     public function userSearch($query, array $options = null)
144 144
     {
@@ -166,7 +166,7 @@ public function userSearch($query, array $options = null)
166 166
         $response = $restClient->restGet('/services/rest/', $options);
167 167
 
168 168
         if ($response->isError()) {
169  
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
  169
+            throw new Zend\Service\Exception('An error occurred sending request. Status code: '
170 170
                                            . $response->getStatus());
171 171
         }
172 172
 
@@ -184,7 +184,7 @@ public function userSearch($query, array $options = null)
184 184
      * @param  string $query   group id
185 185
      * @param  array  $options Additional parameters to refine your query.
186 186
      * @return Zend_Service_Flickr_ResultSet
187  
-     * @throws Zend_Service_Exception
  187
+     * @throws Zend\Service\Exception
188 188
      */
189 189
     public function groupPoolGetPhotos($query, array $options = array())
190 190
     {
@@ -194,7 +194,7 @@ public function groupPoolGetPhotos($query, array $options = array())
194 194
                                        'extras'   => 'license, date_upload, date_taken, owner_name, icon_server');
195 195
 
196 196
         if (empty($query) || !is_string($query)) {
197  
-            throw new Zend_Service_Exception('You must supply a group id');
  197
+            throw new Zend\Service\Exception('You must supply a group id');
198 198
         }
199 199
 
200 200
         $options['group_id'] = $query;
@@ -209,7 +209,7 @@ public function groupPoolGetPhotos($query, array $options = array())
209 209
         $response = $restClient->restGet('/services/rest/', $options);
210 210
 
211 211
         if ($response->isError()) {
212  
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
  212
+            throw new Zend\Service\Exception('An error occurred sending request. Status code: '
213 213
                                            . $response->getStatus());
214 214
         }
215 215
 
@@ -230,7 +230,7 @@ public function groupPoolGetPhotos($query, array $options = array())
230 230
      *
231 231
      * @param  string $username the username
232 232
      * @return string the NSID (userid)
233  
-     * @throws Zend_Service_Exception
  233
+     * @throws Zend\Service\Exception
234 234
      */
235 235
     public function getIdByUsername($username)
236 236
     {
@@ -239,7 +239,7 @@ public function getIdByUsername($username)
239 239
         $options = array('api_key' => $this->apiKey, 'method' => $method, 'username' => (string) $username);
240 240
 
241 241
         if (empty($username)) {
242  
-            throw new Zend_Service_Exception('You must supply a username');
  242
+            throw new Zend\Service\Exception('You must supply a username');
243 243
         }
244 244
 
245 245
         $restClient = $this->getRestClient();
@@ -247,7 +247,7 @@ public function getIdByUsername($username)
247 247
         $response = $restClient->restGet('/services/rest/', $options);
248 248
 
249 249
         if ($response->isError()) {
250  
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
  250
+            throw new Zend\Service\Exception('An error occurred sending request. Status code: '
251 251
                                            . $response->getStatus());
252 252
         }
253 253
 
@@ -266,14 +266,14 @@ public function getIdByUsername($username)
266 266
      *
267 267
      * @param  string $email the email
268 268
      * @return string the NSID (userid)
269  
-     * @throws Zend_Service_Exception
  269
+     * @throws Zend\Service\Exception
270 270
      */
271 271
     public function getIdByEmail($email)
272 272
     {
273 273
         static $method = 'flickr.people.findByEmail';
274 274
 
275 275
         if (empty($email)) {
276  
-            throw new Zend_Service_Exception('You must supply an e-mail address');
  276
+            throw new Zend\Service\Exception('You must supply an e-mail address');
277 277
         }
278 278
 
279 279
         $options = array('api_key' => $this->apiKey, 'method' => $method, 'find_email' => (string) $email);
@@ -283,7 +283,7 @@ public function getIdByEmail($email)
283 283
         $response = $restClient->restGet('/services/rest/', $options);
284 284
 
285 285
         if ($response->isError()) {
286  
-            throw new Zend_Service_Exception('An error occurred sending request. Status code: '
  286
+            throw new Zend\Service\Exception('An error occurred sending request. Status code: '
287 287
                                            . $response->getStatus());
288 288
         }
289 289
 
@@ -300,14 +300,14 @@ public function getIdByEmail($email)
300 300
      *
301 301
      * @param  string $id the NSID
302 302
      * @return array of Zend_Service_Flickr_Image, details for the specified image
303  
-     * @throws Zend_Service_Exception
  303
+     * @throws Zend\Service\Exception
304 304
      */
305 305
     public function getImageDetails($id)
306 306
     {
307 307
         static $method = 'flickr.photos.getSizes';
308 308
 
309 309
         if (empty($id)) {
310  
-            throw new Zend_Service_Exception('You must supply a photo ID');
  310
+            throw new Zend\Service\Exception('You must supply a photo ID');
311 311
         }
312 312
 
313 313
         $options = array('api_key' => $this->apiKey, 'method' => $method, 'photo_id' => $id);
@@ -338,7 +338,7 @@ public function getImageDetails($id)
338 338
     public function getRestClient()
339 339
     {
340 340
         if (null === $this->_restClient) {
341  
-            $this->_restClient = new Zend_Rest_Client(self::URI_BASE);
  341
+            $this->_restClient = new Zend\Rest\Client\RestClient(self::URI_BASE);
342 342
         }
343 343
 
344 344
         return $this->_restClient;
@@ -350,7 +350,7 @@ public function getRestClient()
350 350
      *
351 351
      * @param  array $options
352 352
      * @return void
353  
-     * @throws Zend_Service_Exception
  353
+     * @throws Zend\Service\Exception
354 354
      */
355 355
     protected function _validateUserSearch(array $options)
356 356
     {
@@ -359,14 +359,14 @@ protected function _validateUserSearch(array $options)
359 359
 
360 360
         $this->_compareOptions($options, $validOptions);
361 361
 
362  
-        $between = new Zend_Validate_Between(1, 500, true);
  362
+        $between = new Zend\Validator\Between(1, 500, true);
363 363
         if (!$between->isValid($options['per_page'])) {
364  
-            throw new Zend_Service_Exception($options['per_page'] . ' is not valid for the "per_page" option');
  364
+            throw new Zend\Service\Exception($options['per_page'] . ' is not valid for the "per_page" option');
365 365
         }
366 366
 
367  
-        $int = new Zend_Validate_Int();
  367
+        $int = new Zend\Validator\Int();
368 368
         if (!$int->isValid($options['page'])) {
369  
-            throw new Zend_Service_Exception($options['page'] . ' is not valid for the "page" option');
  369
+            throw new Zend\Service\Exception($options['page'] . ' is not valid for the "page" option');
370 370
         }
371 371
 
372 372
         // validate extras, which are delivered in csv format
@@ -388,7 +388,7 @@ protected function _validateUserSearch(array $options)
388 388
      *
389 389
      * @param  array $options
390 390
      * @return void
391  
-     * @throws Zend_Service_Exception
  391
+     * @throws Zend\Service\Exception
392 392
      */
393 393
     protected function _validateTagSearch(array $options)
394 394
     {
@@ -401,14 +401,14 @@ protected function _validateTagSearch(array $options)
401 401
 
402 402
         $this->_compareOptions($options, $validOptions);
403 403
 
404  
-        $between = new Zend_Validate_Between(1, 500, true);
  404
+        $between = new Zend\Validator\Between(1, 500, true);
405 405
         if (!$between->isValid($options['per_page'])) {
406  
-            throw new Zend_Service_Exception($options['per_page'] . ' is not valid for the "per_page" option');
  406
+            throw new Zend\Service\Exception($options['per_page'] . ' is not valid for the "per_page" option');
407 407
         }
408 408
 
409  
-        $int = new Zend_Validate_Int();
  409
+        $int = new Zend\Validator\Int();
410 410
         if (!$int->isValid($options['page'])) {
411  
-            throw new Zend_Service_Exception($options['page'] . ' is not valid for the "page" option');
  411
+            throw new Zend\Service\Exception($options['page'] . ' is not valid for the "page" option');
412 412
         }
413 413
 
414 414
         // validate extras, which are delivered in csv format
@@ -430,7 +430,7 @@ protected function _validateTagSearch(array $options)
430 430
     * Validate Group Search Options
431 431
     *
432 432
     * @param  array $options
433  
-    * @throws Zend_Service_Exception
  433
+    * @throws Zend\Service\Exception
434 434
     * @return void
435 435
     */
436 436
     protected function _validateGroupPoolGetPhotos(array $options)
@@ -439,15 +439,15 @@ protected function _validateGroupPoolGetPhotos(array $options)
439 439
 
440 440
         $this->_compareOptions($options, $validOptions);
441 441
 
442  
-        $between = new Zend_Validate_Between(1, 500, true);
  442
+        $between = new Zend\Validator\Between(1, 500, true);
443 443
         if (!$between->isValid($options['per_page'])) {
444  
-            throw new Zend_Service_Exception($options['per_page'] . ' is not valid for the "per_page" option');
  444
+            throw new Zend\Service\Exception($options['per_page'] . ' is not valid for the "per_page" option');
445 445
         }
446 446
 
447  
-        $int = new Zend_Validate_Int();
  447
+        $int = new Zend\Validator\Int();
448 448
 
449 449
         if (!$int->isValid($options['page'])) {
450  
-            throw new Zend_Service_Exception($options['page'] . ' is not valid for the "page" option');
  450
+            throw new Zend\Service\Exception($options['page'] . ' is not valid for the "page" option');
451 451
         }
452 452
 
453 453
         // validate extras, which are delivered in csv format
@@ -469,14 +469,14 @@ protected function _validateGroupPoolGetPhotos(array $options)
469 469
      *
470 470
      * @param  DOMDocument $dom
471 471
      * @return void
472  
-     * @throws Zend_Service_Exception
  472
+     * @throws Zend\Service\Exception
473 473
      */
474 474
     protected static function _checkErrors(DOMDocument $dom)
475 475
     {
476 476
         if ($dom->documentElement->getAttribute('stat') === 'fail') {
477 477
             $xpath = new DOMXPath($dom);
478 478
             $err = $xpath->query('//err')->item(0);
479  
-            throw new Zend_Service_Exception('Search failed due to error: ' . $err->getAttribute('msg')
  479
+            throw new Zend\Service\Exception('Search failed due to error: ' . $err->getAttribute('msg')
480 480
                                            . ' (error #' . $err->getAttribute('code') . ')');
481 481
         }
482 482
     }
@@ -505,13 +505,13 @@ protected function _prepareOptions($method, array $options, array $defaultOption
505 505
      * @param  array $options      User options
506 506
      * @param  array $validOptions Valid options
507 507
      * @return void
508  
-     * @throws Zend_Service_Exception
  508
+     * @throws Zend\Service\Exception
509 509
      */
510 510
     protected function _compareOptions(array $options, array $validOptions)
511 511
     {
512 512
         $difference = array_diff(array_keys($options), $validOptions);
513 513
         if ($difference) {
514  
-            throw new Zend_Service_Exception('The following parameters are invalid: ' . implode(',', $difference));
  514
+            throw new Zend\Service\Exception('The following parameters are invalid: ' . implode(',', $difference));
515 515
         }
516 516
     }
517 517
 }
2  library/Zend/Service/Nirvanix.php
@@ -53,7 +53,7 @@ public function __construct($authParams, $options = array())
53 53
     {
54 54
         // merge options with default options
55 55
         $defaultOptions = array('defaults'   => array(),
56  
-                                'httpClient' => new Zend_Http_Client(),
  56
+                                'httpClient' => new Zend\Http\Client(),
57 57
                                 'host'       => 'http://services.nirvanix.com');
58 58
         $this->_options = array_merge($defaultOptions, $options);
59 59
 
4  library/Zend/Service/Nirvanix/Exception.php
@@ -20,12 +20,12 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses        Zend_Service_Exception
  23
+ * @uses        Zend\Service\Exception
24 24
  * @category   Zend
25 25
  * @package    Zend_Service
26 26
  * @subpackage Nirvanix
27 27
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
28 28
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
29 29
  */
30  
-class Zend_Service_Nirvanix_Exception extends Zend_Service_Exception
  30
+class Zend_Service_Nirvanix_Exception extends Zend\Service\Exception
31 31
 {}
4  library/Zend/Service/Nirvanix/Namespace/Base.php
@@ -84,7 +84,7 @@ public function __construct($options = array())
84 84
         }
85 85
 
86 86
         if (! isset($options['httpClient'])) {
87  
-            $options['httpClient'] = new Zend_Http_Client();
  87
+            $options['httpClient'] = new Zend\Http\Client();
88 88
         }
89 89
         $this->_httpClient = $options['httpClient'];
90 90
     }
@@ -120,7 +120,7 @@ public function __call($methodName, $args)
120 120
         $this->_httpClient->resetParameters();
121 121
         $this->_httpClient->setParameterPost($params);
122 122
 
123  
-        $httpResponse = $this->_httpClient->request(Zend_Http_Client::POST);
  123
+        $httpResponse = $this->_httpClient->request(Zend\Http\Client::POST);
124 124
         return $this->_wrapResponse($httpResponse);
125 125
     }
126 126
 
4  library/Zend/Service/Nirvanix/Namespace/Imfs.php
@@ -53,7 +53,7 @@ public function getContents($filePath, $expiration = 3600)
53 53
         // download the file
54 54
         $this->_httpClient->resetParameters();
55 55
         $this->_httpClient->setUri($url);
56  
-        $resp = $this->_httpClient->request(Zend_Http_Client::GET);
  56
+        $resp = $this->_httpClient->request(Zend\Http\Client::GET);
57 57
 
58 58
         return $resp->getBody();
59 59
     }
@@ -81,7 +81,7 @@ public function putContents($filePath, $data, $mimeType = null)
81 81
         $this->_httpClient->setParameterPost('uploadToken', $uploadToken);
82 82
         $this->_httpClient->setParameterPost('destFolderPath', str_replace('\\', '/',dirname($filePath)));
83 83
         $this->_httpClient->setFileUpload(basename($filePath), 'uploadFile', $data, $mimeType);
84  
-        $response = $this->_httpClient->request(Zend_Http_Client::POST);
  84
+        $response = $this->_httpClient->request(Zend\Http\Client::POST);
85 85
 
86 86
         return new Zend_Service_Nirvanix_Response($response->getBody());
87 87
     }
10  library/Zend/Service/Simpy.php
@@ -23,7 +23,7 @@
23 23
  * @uses       DOMDocument
24 24
  * @uses       DOMXPath
25 25
  * @uses       Zend_Http_Client
26  
- * @uses       Zend_Service_Exception
  26
+ * @uses       Zend\Service\Exception
27 27
  * @uses       Zend_Service_Simpy_LinkSet
28 28
  * @uses       Zend_Service_Simpy_NoteSet
29 29
  * @uses       Zend_Service_Simpy_TagSet
@@ -81,7 +81,7 @@ public function getHttpClient()
81 81
      *
82 82
      * @param  string $op    Name of the operation for the request
83 83
      * @param  array  $query Query data for the request (optional)
84  
-     * @throws Zend_Service_Exception
  84
+     * @throws Zend\Service\Exception
85 85
      * @return DOMDocument Parsed XML response
86 86
      */
87 87
     protected function _makeRequest($op, $query = null)
@@ -106,14 +106,14 @@ protected function _makeRequest($op, $query = null)
106 106
                 if ($code != 0) {
107 107
                     $list = $xpath->query('/status/message');
108 108
                     $message = $list->item(0)->nodeValue;
109  
-                    throw new Zend_Service_Exception($message, $code);
  109
+                    throw new Zend\Service\Exception($message, $code);
110 110
                 }
111 111
             }
112 112
 
113 113
             return $doc;
114 114
         }
115 115
 
116  
-        throw new Zend_Service_Exception($response->getMessage(), $response->getStatus());
  116
+        throw new Zend\Service\Exception($response->getMessage(), $response->getStatus());
117 117
     }
118 118
 
119 119
     /**
@@ -122,7 +122,7 @@ protected function _makeRequest($op, $query = null)
122 122
      *
123 123
      * @param  int $limit Limits the number of tags returned (optional)
124 124
      * @link   http://www.simpy.com/doc/api/rest/GetTags
125  
-     * @throws Zend_Service_Exception
  125
+     * @throws Zend\Service\Exception
126 126
      * @return Zend_Service_Simpy_TagSet
127 127
      */
128 128
     public function getTags($limit = null)
3  library/Zend/Service/SlideShare/Exception.php
@@ -32,4 +32,5 @@
32 32
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
33 33
  */
34 34
 interface Exception
35  
-{}
  35
+{
  36
+}
4  library/Zend/Service/StrikeIron/Exception.php
@@ -20,12 +20,12 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Service_Exception
  23
+ * @uses       Zend\Service\Exception
24 24
  * @category   Zend
25 25
  * @package    Zend_Service
26 26
  * @subpackage StrikeIron
27 27
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
28 28
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
29 29
  */
30  
-class Zend_Service_StrikeIron_Exception extends Zend_Service_Exception
  30
+class Zend_Service_StrikeIron_Exception extends Zend\Service\Exception
31 31
 {}
4  library/Zend/Service/Technorati/Exception.php
@@ -20,13 +20,13 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Service_Exception
  23
+ * @uses       Zend\Service\Exception
24 24
  * @category   Zend
25 25
  * @package    Zend_Service
26 26
  * @subpackage Technorati
27 27
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
28 28
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
29 29
  */
30  
-class Zend_Service_Technorati_Exception extends Zend_Service_Exception
  30
+class Zend_Service_Technorati_Exception extends Zend\Service\Exception
31 31
 {
32 32
 }
2  library/Zend/Service/Technorati/ResultSet.php
@@ -180,7 +180,7 @@ public function totalResultsAvailable()
180 180
      * Implements SeekableIterator::current().
181 181
      *
182 182
      * @return  void
183  
-     * @throws  Zend_Service_Exception
  183
+     * @throws  Zend\Service\Exception
184 184
      * @abstract
185 185
      */
186 186
     // abstract public function current();
4  library/Zend/Service/WindowsAzure/Exception.php
@@ -20,11 +20,11 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Service_Exception
  23
+ * @uses       Zend\Service\Exception
24 24
  * @category   Zend
25 25
  * @package    Zend_Service_WindowsAzure
26 26
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
27 27
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
28 28
  */
29  
-class Zend_Service_WindowsAzure_Exception extends Zend_Service_Exception
  29
+class Zend_Service_WindowsAzure_Exception extends Zend\Service\Exception
30 30
 {}
14  library/Zend/Service/WindowsAzure/Storage.php
@@ -20,8 +20,8 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Http_Client
24  
- * @uses       Zend_Http_Response
  23
+ * @uses       Zend\Http\Client
  24
+ * @uses       Zend\Http\Response
25 25
  * @uses       Zend_Service_WindowsAzure_Credentials_AbstractCredentials
26 26
  * @uses       Zend_Service_WindowsAzure_Credentials_SharedKey
27 27
  * @uses       Zend_Service_WindowsAzure_Exception
@@ -186,7 +186,7 @@ public function __construct(
186 186
 		
187 187
 		// Setup default Zend_Http_Client channel
188 188
 		$options = array(
189  
-			'adapter' => 'Zend_Http_Client_Adapter_Proxy'
  189
+			'adapter' => 'Zend\\Http\\Client\\Adapter\\Proxy'
190 190
 		);
191 191
 		if (function_exists('curl_init')) {
192 192
 			// Set cURL options if cURL is used afterwards
@@ -195,7 +195,7 @@ public function __construct(
195 195
 					CURLOPT_TIMEOUT => 120,
196 196
 			);
197 197
 		}
198  
-		$this->_httpClientChannel = new Zend_Http_Client(null, $options);
  198
+		$this->_httpClientChannel = new Zend\Http\Client(null, $options);
199 199
 	}
200 200
 	
201 201
 	/**
@@ -203,7 +203,7 @@ public function __construct(
203 203
 	 * 
204 204
 	 * @param Zend_Http_Client_Adapter_Interface|string $adapterInstance Adapter instance or adapter class name.
205 205
 	 */
206  
-	public function setHttpClientChannel($adapterInstance = 'Zend_Http_Client_Adapter_Proxy')
  206
+	public function setHttpClientChannel($adapterInstance = 'Zend\\Http\\Client\\Adapter\\Proxy')
207 207
 	{
208 208
 		$this->_httpClientChannel->setAdapter($adapterInstance);
209 209
 	}
@@ -320,7 +320,7 @@ public function getCredentials()
320 320
 	protected function _performRequest(
321 321
 		$path = '/',
322 322
 		$queryString = '',
323  
-		$httpVerb = Zend_Http_Client::GET,
  323
+		$httpVerb = Zend\Http\Client::GET,
324 324
 		$headers = array(),
325 325
 		$forTableStorage = false,
326 326
 		$rawData = null,
@@ -380,7 +380,7 @@ protected function _performRequest(
380 380
 	 * @return object
381 381
 	 * @throws Zend_Service_WindowsAzure_Exception
382 382
 	 */
383  
-	protected function _parseResponse(Zend_Http_Response $response = null)
  383
+	protected function _parseResponse(Zend\Http\Response $response = null)
384 384
 	{
385 385
 		if ($response === null) {
386 386
 			throw new Zend_Service_WindowsAzure_Exception('Response should not be null.');
44  library/Zend/Service/WindowsAzure/Storage/Blob.php
@@ -20,8 +20,8 @@
20 20
  */
21 21
 
22 22
 /**
23  
- * @uses       Zend_Http_Client
24  
- * @uses       Zend_Http_Response
  23
+ * @uses       Zend\Http\Client
  24
+ * @uses       Zend\Http\Response
25 25
  * @uses       Zend_Service_WindowsAzure_Credentials_AbstractCredentials
26 26
  * @uses       Zend_Service_WindowsAzure_Credentials_SharedAccessSignature
27 27
  * @uses       Zend_Service_WindowsAzure_Exception
@@ -174,7 +174,7 @@ public function createContainer($containerName = '', $metadata = array())
174 174
 		$headers = array_merge($headers, $this->_generateMetadataHeaders($metadata));
175 175
 		
176 176
 		// Perform request
177  
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);			
  177
+		$response = $this->_performRequest($containerName, '?restype=container', Zend\Http\Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);			
178 178
 		if ($response->isSuccessful()) {
179 179
 		    return new Zend_Service_WindowsAzure_Storage_BlobContainer(
180 180
 		        $containerName,
@@ -205,7 +205,7 @@ public function getContainerAcl($containerName = '', $signedIdentifiers = false)
205 205
 		}
206 206
 
207 207
 		// Perform request
208  
-		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
  208
+		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend\Http\Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
209 209
 		if ($response->isSuccessful()) {
210 210
 		    if ($signedIdentifiers == false)  {
211 211
 		        // Only public/private
@@ -285,7 +285,7 @@ public function setContainerAcl($containerName = '', $acl = self::ACL_PRIVATE, $
285 285
 		}
286 286
 		
287 287
 		// Perform request
288  
-		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend_Http_Client::PUT, array('x-ms-prop-publicaccess' => $acl), false, $policies, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
  288
+		$response = $this->_performRequest($containerName, '?restype=container&comp=acl', Zend\Http\Client::PUT, array('x-ms-prop-publicaccess' => $acl), false, $policies, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
289 289
 		if (!$response->isSuccessful()) {
290 290
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
291 291
 		}
@@ -308,7 +308,7 @@ public function getContainer($containerName = '')
308 308
 		}
309 309
 		    
310 310
 		// Perform request
311  
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);	
  311
+		$response = $this->_performRequest($containerName, '?restype=container', Zend\Http\Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);	
312 312
 		if ($response->isSuccessful()) {
313 313
 		    // Parse metadata
314 314
 		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
@@ -379,7 +379,7 @@ public function setContainerMetadata($containerName = '', $metadata = array(), $
379 379
 		}
380 380
 		
381 381
 		// Perform request
382  
-		$response = $this->_performRequest($containerName, '?restype=container&comp=metadata', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
  382
+		$response = $this->_performRequest($containerName, '?restype=container&comp=metadata', Zend\Http\Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
383 383
 		if (!$response->isSuccessful()) {
384 384
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
385 385
 		}
@@ -408,7 +408,7 @@ public function deleteContainer($containerName = '', $additionalHeaders = array(
408 408
 		}
409 409
 		
410 410
 		// Perform request
411  
-		$response = $this->_performRequest($containerName, '?restype=container', Zend_Http_Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
  411
+		$response = $this->_performRequest($containerName, '?restype=container', Zend\Http\Client::DELETE, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
412 412
 		if (!$response->isSuccessful()) {
413 413
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
414 414
 		}
@@ -439,7 +439,7 @@ public function listContainers($prefix = null, $maxResults = null, $marker = nul
439 439
 	    }
440 440
 	        
441 441
 		// Perform request
442  
-		$response = $this->_performRequest('', $queryString, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_LIST);	
  442
+		$response = $this->_performRequest('', $queryString, Zend\Http\Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_CONTAINER, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_LIST);	
443 443
 		if ($response->isSuccessful()) {
444 444
 			$xmlContainers = $this->_parseResponse($response)->Containers->Container;
445 445
 			$xmlMarker = (string)$this->_parseResponse($response)->NextMarker;
@@ -523,7 +523,7 @@ public function putBlob($containerName = '', $blobName = '', $localFileName = ''
523 523
 		$resourceName = self::createResourceName($containerName , $blobName);
524 524
 		
525 525
 		// Perform request
526  
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);	
  526
+		$response = $this->_performRequest($resourceName, '', Zend\Http\Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);	
527 527
 		if ($response->isSuccessful()) {
528 528
 			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
529 529
 				$containerName,
@@ -651,7 +651,7 @@ public function putBlock($containerName = '', $blobName = '', $identifier = '',
651 651
 		$resourceName = self::createResourceName($containerName , $blobName);
652 652
 		
653 653
     	// Upload
654  
-		$response = $this->_performRequest($resourceName, '?comp=block&blockid=' . base64_encode($identifier), Zend_Http_Client::PUT, null, false, $contents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
  654
+		$response = $this->_performRequest($resourceName, '?comp=block&blockid=' . base64_encode($identifier), Zend\Http\Client::PUT, null, false, $contents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
655 655
 		if (!$response->isSuccessful()) {
656 656
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
657 657
 		}
@@ -712,7 +712,7 @@ public function putBlockList($containerName = '', $blobName = '', $blockList = a
712 712
 		$resourceName = self::createResourceName($containerName , $blobName);
713 713
 		
714 714
 		// Perform request
715  
-		$response = $this->_performRequest($resourceName, '?comp=blocklist', Zend_Http_Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
  715
+		$response = $this->_performRequest($resourceName, '?comp=blocklist', Zend\Http\Client::PUT, $headers, false, $fileContents, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
716 716
 		if (!$response->isSuccessful()) {
717 717
 		    throw new Zend_Service_WindowsAzure_Exception($this->_getErrorMessage($response, 'Resource could not be accessed.'));
718 718
 		}
@@ -755,7 +755,7 @@ public function getBlockList($containerName = '', $blobName = '', $type = 0)
755 755
 		$resourceName = self::createResourceName($containerName , $blobName);
756 756
 			
757 757
 		// Perform request
758  
-		$response = $this->_performRequest($resourceName, '?comp=blocklist&blocklisttype=' . $blockListType, Zend_Http_Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
  758
+		$response = $this->_performRequest($resourceName, '?comp=blocklist&blocklisttype=' . $blockListType, Zend\Http\Client::GET, array(), false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
759 759
 		if ($response->isSuccessful()) {
760 760
 		    // Parse response
761 761
 		    $blockList = $this->_parseResponse($response);
@@ -841,7 +841,7 @@ public function copyBlob($sourceContainerName = '', $sourceBlobName = '', $desti
841 841
 		$headers["x-ms-copy-source"] = '/' . $this->_accountName . '/' . $sourceResourceName;
842 842
 
843 843
 		// Perform request
844  
-		$response = $this->_performRequest($destinationResourceName, '', Zend_Http_Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
  844
+		$response = $this->_performRequest($destinationResourceName, '', Zend\Http\Client::PUT, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_WRITE);
845 845
 		if ($response->isSuccessful()) {
846 846
 			return new Zend_Service_WindowsAzure_Storage_BlobInstance(
847 847
 				$destinationContainerName,
@@ -895,7 +895,7 @@ public function getBlob($containerName = '', $blobName = '', $localFileName = ''
895 895
 		$resourceName = self::createResourceName($containerName , $blobName);
896 896
 		
897 897
 		// Perform request
898  
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::GET, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
  898
+		$response = $this->_performRequest($resourceName, '', Zend\Http\Client::GET, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
899 899
 		if ($response->isSuccessful()) {
900 900
 			file_put_contents($localFileName, $response->getBody());
901 901
 		} else {
@@ -937,7 +937,7 @@ public function getBlobInstance($containerName = '', $blobName = '', $additional
937 937
 		$resourceName = self::createResourceName($containerName , $blobName);
938 938
 		    
939 939
 		// Perform request
940  
-		$response = $this->_performRequest($resourceName, '', Zend_Http_Client::HEAD, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
  940
+		$response = $this->_performRequest($resourceName, '', Zend\Http\Client::HEAD, $headers, false, null, Zend_Service_WindowsAzure_Storage::RESOURCE_BLOB, Zend_Service_WindowsAzure_Credentials_AbstractCredentials::PERMISSION_READ);
941 941
 		if ($response->isSuccessful()) {
942 942
 		    // Parse metadata
943 943
 		    $metadata = $this->_parseMetadataHeaders($response->getHeaders());
@@ -1026,7 +1026,7 @@ public function setBlobMetadata($containerName = '', $blobName = '', $metadata =
1026 1026
 		}
1027 1027
 		
1028 1028
 		// Perform request