Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/3342'

Close #3342
  • Loading branch information...
commit b46b073368ea1b19d9dbe8a790156e7d7aeb1284 2 parents f642ecf + b5b39be
@weierophinney weierophinney authored
Showing with 916 additions and 916 deletions.
  1. +4 −4 library/Zend/Authentication/Adapter/DbTable.php
  2. +3 −3 library/Zend/Authentication/Adapter/Http.php
  3. +1 −1  library/Zend/Authentication/Adapter/Ldap.php
  4. +1 −1  library/Zend/Authentication/AuthenticationService.php
  5. +1 −1  library/Zend/Authentication/Result.php
  6. +1 −1  library/Zend/Authentication/Storage/NonPersistent.php
  7. +1 −1  library/Zend/Authentication/Storage/Session.php
  8. +1 −1  library/Zend/Authentication/Storage/StorageInterface.php
  9. +1 −1  library/Zend/Barcode/Barcode.php
  10. +25 −25 library/Zend/Barcode/Object/AbstractObject.php
  11. +1 −1  library/Zend/Barcode/Object/Code128.php
  12. +3 −3 library/Zend/Barcode/Object/Code25interleaved.php
  13. +1 −1  library/Zend/Barcode/Object/Error.php
  14. +14 −14 library/Zend/Barcode/Object/ObjectInterface.php
  15. +5 −5 library/Zend/Barcode/Renderer/AbstractRenderer.php
  16. +1 −1  library/Zend/Barcode/Renderer/Image.php
  17. +1 −1  library/Zend/Barcode/Renderer/Pdf.php
  18. +3 −3 library/Zend/Barcode/Renderer/RendererInterface.php
  19. +1 −1  library/Zend/Barcode/Renderer/Svg.php
  20. +2 −2 library/Zend/Cache/Pattern/CaptureCache.php
  21. +2 −2 library/Zend/Cache/Pattern/OutputCache.php
  22. +25 −25 library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
  23. +5 −5 library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
  24. +6 −6 library/Zend/Cache/Storage/Adapter/AdapterOptions.php
  25. +12 −12 library/Zend/Cache/Storage/Adapter/Apc.php
  26. +1 −1  library/Zend/Cache/Storage/Adapter/ApcIterator.php
  27. +9 −9 library/Zend/Cache/Storage/Adapter/Dba.php
  28. +2 −2 library/Zend/Cache/Storage/Adapter/DbaIterator.php
  29. +33 −33 library/Zend/Cache/Storage/Adapter/Filesystem.php
  30. +1 −1  library/Zend/Cache/Storage/Adapter/FilesystemIterator.php
  31. +4 −4 library/Zend/Cache/Storage/Adapter/FilesystemOptions.php
  32. +1 −1  library/Zend/Cache/Storage/Adapter/KeyListIterator.php
  33. +10 −10 library/Zend/Cache/Storage/Adapter/Memcached.php
  34. +17 −17 library/Zend/Cache/Storage/Adapter/Memory.php
  35. +10 −10 library/Zend/Cache/Storage/Adapter/WinCache.php
  36. +3 −3 library/Zend/Cache/Storage/Adapter/ZendServerDisk.php
  37. +3 −3 library/Zend/Cache/Storage/Adapter/ZendServerShm.php
  38. +12 −12 library/Zend/Cache/Storage/Capabilities.php
  39. +1 −1  library/Zend/Cache/Storage/ClearByNamespaceInterface.php
  40. +1 −1  library/Zend/Cache/Storage/ClearByPrefixInterface.php
  41. +1 −1  library/Zend/Cache/Storage/ClearExpiredInterface.php
  42. +3 −3 library/Zend/Cache/Storage/ExceptionEvent.php
  43. +1 −1  library/Zend/Cache/Storage/FlushableInterface.php
  44. +1 −1  library/Zend/Cache/Storage/OptimizableInterface.php
  45. +3 −3 library/Zend/Cache/Storage/Plugin/PluginOptions.php
  46. +11 −11 library/Zend/Cache/Storage/StorageInterface.php
  47. +3 −3 library/Zend/Cache/Storage/TaggableInterface.php
  48. +3 −3 library/Zend/Captcha/AbstractWord.php
  49. +1 −1  library/Zend/Captcha/ReCaptcha.php
  50. +1 −1  library/Zend/Code/Generator/ClassGenerator.php
  51. +4 −4 library/Zend/Code/Scanner/ParameterScanner.php
  52. +8 −8 library/Zend/Config/Config.php
  53. +2 −2 library/Zend/Config/Factory.php
  54. +1 −1  library/Zend/Config/Reader/ReaderInterface.php
  55. +1 −1  library/Zend/Config/Writer/AbstractWriter.php
  56. +1 −1  library/Zend/Config/Writer/Ini.php
  57. +1 −1  library/Zend/Config/Writer/WriterInterface.php
  58. +2 −2 library/Zend/Console/Getopt.php
  59. +6 −6 library/Zend/Console/Prompt/Char.php
  60. +2 −2 library/Zend/Console/Prompt/Line.php
  61. +4 −4 library/Zend/Console/Prompt/Number.php
  62. +6 −6 library/Zend/Crypt/BlockCipher.php
  63. +3 −3 library/Zend/Crypt/Hash.php
  64. +3 −3 library/Zend/Crypt/Hmac.php
  65. +1 −1  library/Zend/Crypt/Password/Bcrypt.php
  66. +1 −1  library/Zend/Crypt/Password/PasswordInterface.php
  67. +3 −3 library/Zend/Crypt/PublicKey/DiffieHellman.php
  68. +3 −3 library/Zend/Crypt/PublicKey/RsaOptions.php
  69. +1 −1  library/Zend/Crypt/Utils.php
  70. +1 −1  library/Zend/Db/Adapter/Driver/Mysqli/Connection.php
  71. +3 −3 library/Zend/Db/Adapter/Driver/Mysqli/Result.php
  72. +1 −1  library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
  73. +2 −2 library/Zend/Db/Adapter/Driver/Pdo/Result.php
  74. +2 −2 library/Zend/Db/Adapter/Driver/Pdo/Statement.php
  75. +1 −1  library/Zend/Db/Adapter/Driver/Pgsql/Connection.php
  76. +1 −1  library/Zend/Db/Adapter/Driver/Sqlsrv/Connection.php
  77. +1 −1  library/Zend/Db/Adapter/Driver/Sqlsrv/Exception/ErrorException.php
  78. +6 −6 library/Zend/Db/Adapter/Driver/Sqlsrv/Result.php
  79. +1 −1  library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
  80. +3 −3 library/Zend/Db/Adapter/ParameterContainer.php
  81. +5 −5 library/Zend/Db/Metadata/Object/ColumnObject.php
  82. +4 −4 library/Zend/Db/Metadata/Object/ConstraintObject.php
  83. +2 −2 library/Zend/Db/RowGateway/AbstractRowGateway.php
  84. +2 −2 library/Zend/Feed/PubSubHubbub/HttpResponse.php
  85. +1 −1  library/Zend/Feed/Reader/AbstractFeed.php
  86. +1 −1  library/Zend/Feed/Reader/Feed/AbstractFeed.php
  87. +4 −4 library/Zend/Feed/Reader/Reader.php
  88. +1 −1  library/Zend/Feed/Writer/Feed.php
  89. +1 −1  library/Zend/Feed/Writer/Writer.php
  90. +8 −8 library/Zend/File/Transfer/Adapter/AbstractAdapter.php
  91. +8 −8 library/Zend/File/Transfer/Adapter/Http.php
  92. +3 −3 library/Zend/File/Transfer/Transfer.php
  93. +1 −1  library/Zend/Filter/AbstractFilter.php
  94. +3 −3 library/Zend/Filter/Boolean.php
  95. +1 −1  library/Zend/Filter/Compress/Rar.php
  96. +4 −4 library/Zend/Filter/Encrypt/Openssl.php
  97. +2 −2 library/Zend/Filter/File/Rename.php
  98. +4 −4 library/Zend/Filter/HtmlEntities.php
  99. +4 −4 library/Zend/Filter/RealPath.php
  100. +2 −2 library/Zend/Form/Element/Collection.php
  101. +2 −2 library/Zend/Form/Fieldset.php
  102. +2 −2 library/Zend/Form/FieldsetInterface.php
  103. +2 −2 library/Zend/Form/View/Helper/FormCollection.php
  104. +4 −4 library/Zend/Form/View/Helper/FormMultiCheckbox.php
  105. +11 −11 library/Zend/Http/Client.php
  106. +1 −1  library/Zend/Http/Client/Adapter/AdapterInterface.php
  107. +1 −1  library/Zend/Http/Client/Adapter/Curl.php
  108. +2 −2 library/Zend/Http/Client/Adapter/Proxy.php
  109. +1 −1  library/Zend/Http/Client/Adapter/Socket.php
  110. +3 −3 library/Zend/Http/Client/Adapter/Test.php
  111. +2 −2 library/Zend/Http/Client/Cookies.php
  112. +2 −2 library/Zend/Http/ClientStatic.php
  113. +1 −1  library/Zend/Http/Cookies.php
  114. +2 −2 library/Zend/Http/Header/AbstractAccept.php
  115. +1 −1  library/Zend/Http/Header/Allow.php
  116. +3 −3 library/Zend/Http/Header/CacheControl.php
  117. +1 −1  library/Zend/Http/Header/Connection.php
  118. +8 −8 library/Zend/Http/Header/SetCookie.php
  119. +2 −2 library/Zend/Http/Request.php
  120. +2 −2 library/Zend/Http/Response/Stream.php
  121. +4 −4 library/Zend/I18n/Filter/Alnum.php
  122. +1 −1  library/Zend/I18n/Translator/Loader/Gettext.php
  123. +5 −5 library/Zend/I18n/Validator/Alnum.php
  124. +1 −1  library/Zend/I18n/Validator/Alpha.php
  125. +1 −1  library/Zend/I18n/Validator/Float.php
  126. +1 −1  library/Zend/I18n/Validator/Int.php
  127. +1 −1  library/Zend/I18n/Validator/PostCode.php
  128. +11 −11 library/Zend/InputFilter/Input.php
  129. +4 −4 library/Zend/Json/Encoder.php
  130. +3 −3 library/Zend/Json/Json.php
  131. +1 −1  library/Zend/Json/Server/Cache.php
  132. +2 −2 library/Zend/Json/Server/Server.php
  133. +2 −2 library/Zend/Json/Server/Smd.php
  134. +1 −1  library/Zend/Json/Server/Smd/Service.php
  135. +5 −5 library/Zend/Ldap/Attribute.php
  136. +2 −2 library/Zend/Ldap/Collection.php
  137. +1 −1  library/Zend/Ldap/Collection/DefaultIterator.php
  138. +5 −5 library/Zend/Ldap/Converter/Converter.php
  139. +5 −5 library/Zend/Ldap/Dn.php
  140. +22 −22 library/Zend/Ldap/Ldap.php
  141. +2 −2 library/Zend/Ldap/Ldif/Encoder.php
  142. +22 −22 library/Zend/Ldap/Node.php
  143. +11 −11 library/Zend/Ldap/Node/AbstractNode.php
  144. +3 −3 library/Zend/Ldap/Node/ChildrenIterator.php
  145. +2 −2 library/Zend/Ldap/Node/RootDse.php
  146. +3 −3 library/Zend/Ldap/Node/RootDse/ActiveDirectory.php
  147. +3 −3 library/Zend/Ldap/Node/RootDse/OpenLdap.php
  148. +1 −1  library/Zend/Ldap/Node/RootDse/eDirectory.php
  149. +2 −2 library/Zend/Ldap/Node/Schema/AbstractItem.php
  150. +1 −1  library/Zend/Ldap/Node/Schema/AttributeType/ActiveDirectory.php
  151. +1 −1  library/Zend/Ldap/Node/Schema/AttributeType/AttributeTypeInterface.php
  152. +1 −1  library/Zend/Ldap/Node/Schema/AttributeType/OpenLdap.php
  153. +1 −1  library/Zend/Log/Filter/FilterInterface.php
  154. +1 −1  library/Zend/Log/Filter/Mock.php
  155. +1 −1  library/Zend/Log/Filter/Priority.php
  156. +1 −1  library/Zend/Log/Filter/Regex.php
  157. +3 −3 library/Zend/Log/Filter/SuppressFilter.php
  158. +1 −1  library/Zend/Log/Filter/Validator.php
  159. +2 −2 library/Zend/Log/Logger.php
  160. +1 −1  library/Zend/Log/Writer/Mock.php
  161. +3 −3 library/Zend/Log/Writer/ZendMonitor.php
  162. +1 −1  library/Zend/Mail/AddressList.php
  163. +3 −3 library/Zend/Mail/Header/HeaderInterface.php
  164. +1 −1  library/Zend/Mail/Headers.php
  165. +2 −2 library/Zend/Mail/Protocol/AbstractProtocol.php
  166. +1 −1  library/Zend/Mail/Protocol/Pop3.php
  167. +7 −7 library/Zend/Mail/Protocol/Smtp.php
  168. +1 −1  library/Zend/Mail/Storage/AbstractStorage.php
  169. +1 −1  library/Zend/Mail/Storage/Maildir.php
  170. +1 −1  library/Zend/Mail/Storage/Mbox.php
  171. +1 −1  library/Zend/Mail/Storage/Part.php
  172. +1 −1  library/Zend/Mail/Transport/Sendmail.php
  173. +3 −3 library/Zend/Mail/Transport/Smtp.php
  174. +6 −6 library/Zend/Math/Rand.php
  175. +1 −1  library/Zend/Memory/Container/AccessController.php
  176. +1 −1  library/Zend/Memory/Container/ContainerInterface.php
  177. +1 −1  library/Zend/Memory/Container/Locked.php
  178. +2 −2 library/Zend/Memory/Container/Movable.php
  179. +1 −1  library/Zend/Memory/MemoryManager.php
  180. +2 −2 library/Zend/Memory/Value.php
  181. +1 −1  library/Zend/Mime/Decode.php
  182. +1 −1  library/Zend/Mime/Message.php
  183. +1 −1  library/Zend/Mime/Mime.php
  184. +1 −1  library/Zend/ModuleManager/ModuleManager.php
  185. +5 −5 library/Zend/Mvc/Controller/Plugin/FlashMessenger.php
  186. +1 −1  library/Zend/Mvc/Controller/Plugin/Url.php
  187. +2 −2 library/Zend/Mvc/Router/Http/Part.php
  188. +2 −2 library/Zend/Mvc/Router/Http/Segment.php
  189. +2 −2 library/Zend/Mvc/Router/PriorityList.php
  190. +1 −1  library/Zend/Mvc/View/Console/RouteNotFoundStrategy.php
  191. +2 −2 library/Zend/Mvc/View/Http/InjectRoutematchParamsListener.php
  192. +12 −12 library/Zend/Permissions/Acl/Acl.php
  193. +1 −1  library/Zend/Permissions/Acl/Assertion/AssertionInterface.php
  194. +3 −3 library/Zend/Permissions/Acl/Role/Registry.php
  195. +1 −1  library/Zend/ProgressBar/Adapter/Console.php
  196. +2 −2 library/Zend/ProgressBar/Adapter/JsPull.php
  197. +1 −1  library/Zend/Server/Cache.php
  198. +2 −2 library/Zend/Server/Reflection.php
  199. +2 −2 library/Zend/Server/Reflection/Node.php
  200. +5 −5 library/Zend/Session/SaveHandler/Cache.php
  201. +4 −4 library/Zend/Session/SaveHandler/DbTableGateway.php
  202. +1 −1  library/Zend/Session/Validator/ValidatorInterface.php
  203. +1 −1  library/Zend/Soap/AutoDiscover.php
  204. +3 −3 library/Zend/Soap/Client.php
  205. +6 −6 library/Zend/Soap/Server.php
  206. +3 −3 library/Zend/Soap/Wsdl.php
  207. +1 −1  library/Zend/Stdlib/AbstractOptions.php
  208. +2 −2 library/Zend/Stdlib/CallbackHandler.php
  209. +3 −3 library/Zend/Stdlib/ErrorHandler.php
  210. +1 −1  library/Zend/Stdlib/Glob.php
  211. +2 −2 library/Zend/Stdlib/Hydrator/ClassMethods.php
  212. +1 −1  library/Zend/Stdlib/ParameterObjectInterface.php
  213. +1 −1  library/Zend/Stdlib/PriorityQueue.php
  214. +2 −2 library/Zend/Tag/ItemList.php
  215. +4 −4 library/Zend/Text/Figlet/Figlet.php
  216. +1 −1  library/Zend/Text/MultiByte.php
  217. +1 −1  library/Zend/Uri/File.php
  218. +2 −2 library/Zend/Uri/Http.php
  219. +1 −1  library/Zend/Uri/Mailto.php
  220. +15 −15 library/Zend/Uri/Uri.php
  221. +3 −3 library/Zend/Uri/UriInterface.php
  222. +2 −2 library/Zend/Validator/AbstractValidator.php
  223. +3 −3 library/Zend/Validator/Barcode.php
  224. +10 −10 library/Zend/Validator/Barcode/AbstractAdapter.php
  225. +6 −6 library/Zend/Validator/Barcode/AdapterInterface.php
  226. +2 −2 library/Zend/Validator/Barcode/Code128.php
  227. +1 −1  library/Zend/Validator/Barcode/Code39.php
  228. +1 −1  library/Zend/Validator/Barcode/Code93.php
  229. +1 −1  library/Zend/Validator/Barcode/Ean8.php
  230. +3 −3 library/Zend/Validator/Barcode/Issn.php
  231. +2 −2 library/Zend/Validator/Barcode/Royalmail.php
  232. +1 −1  library/Zend/Validator/Barcode/Upce.php
  233. +3 −3 library/Zend/Validator/Between.php
  234. +1 −1  library/Zend/Validator/Callback.php
  235. +1 −1  library/Zend/Validator/CreditCard.php
  236. +1 −1  library/Zend/Validator/Date.php
  237. +1 −1  library/Zend/Validator/Digits.php
  238. +13 −13 library/Zend/Validator/EmailAddress.php
  239. +4 −4 library/Zend/Validator/Explode.php
  240. +1 −1  library/Zend/Validator/File/Count.php
  241. +1 −1  library/Zend/Validator/File/Crc32.php
  242. +1 −1  library/Zend/Validator/File/ExcludeExtension.php
  243. +1 −1  library/Zend/Validator/File/ExcludeMimeType.php
  244. +2 −2 library/Zend/Validator/File/Exists.php
  245. +4 −4 library/Zend/Validator/File/Extension.php
  246. +1 −1  library/Zend/Validator/File/FilesSize.php
  247. +1 −1  library/Zend/Validator/File/Hash.php
  248. +1 −1  library/Zend/Validator/File/ImageSize.php
  249. +1 −1  library/Zend/Validator/File/Md5.php
  250. +6 −6 library/Zend/Validator/File/MimeType.php
  251. +1 −1  library/Zend/Validator/File/NotExists.php
  252. +1 −1  library/Zend/Validator/File/Sha1.php
  253. +3 −3 library/Zend/Validator/File/Size.php
  254. +1 −1  library/Zend/Validator/File/Upload.php
  255. +1 −1  library/Zend/Validator/File/WordCount.php
  256. +4 −4 library/Zend/Validator/GreaterThan.php
  257. +1 −1  library/Zend/Validator/Hex.php
  258. +7 −7 library/Zend/Validator/Hostname.php
  259. +3 −3 library/Zend/Validator/Identical.php
  260. +6 −6 library/Zend/Validator/InArray.php
  261. +4 −4 library/Zend/Validator/Ip.php
  262. +1 −1  library/Zend/Validator/Isbn.php
  263. +4 −4 library/Zend/Validator/LessThan.php
  264. +1 −1  library/Zend/Validator/NotEmpty.php
  265. +1 −1  library/Zend/Validator/Regex.php
  266. +1 −1  library/Zend/Validator/Sitemap/Changefreq.php
  267. +1 −1  library/Zend/Validator/Sitemap/Lastmod.php
  268. +1 −1  library/Zend/Validator/Sitemap/Loc.php
  269. +1 −1  library/Zend/Validator/Sitemap/Priority.php
  270. +1 −1  library/Zend/Validator/StaticValidator.php
  271. +1 −1  library/Zend/Validator/StringLength.php
  272. +9 −9 library/Zend/Validator/Uri.php
  273. +4 −4 library/Zend/Validator/ValidatorChain.php
  274. +1 −1  library/Zend/Validator/ValidatorInterface.php
  275. +1 −1  library/Zend/Version/Version.php
  276. +1 −1  library/Zend/View/Helper/AbstractHtmlElement.php
  277. +3 −3 library/Zend/View/Helper/Doctype.php
  278. +1 −1  library/Zend/View/Helper/HeadLink.php
  279. +1 −1  library/Zend/View/Helper/HeadMeta.php
  280. +1 −1  library/Zend/View/Helper/HeadStyle.php
  281. +2 −2 library/Zend/View/Helper/HtmlList.php
  282. +1 −1  library/Zend/View/Helper/ServerUrl.php
  283. +1 −1  library/Zend/View/Helper/Url.php
  284. +2 −2 library/Zend/XmlRpc/Fault.php
  285. +3 −3 library/Zend/XmlRpc/Request.php
  286. +2 −2 library/Zend/XmlRpc/Response.php
  287. +4 −4 library/Zend/XmlRpc/Server.php
  288. +2 −2 library/Zend/XmlRpc/Server/Fault.php
  289. +1 −1  tests/ZendTest/Filter/_files/TestNamespace/StringEquals.php
  290. +1 −1  tests/ZendTest/I18n/Filter/AlnumTest.php
  291. +1 −1  tests/ZendTest/I18n/Filter/AlphaTest.php
  292. +1 −1  tests/ZendTest/Ldap/Converter/ConverterTest.php
  293. +3 −3 tests/ZendTest/Memory/AccessControllerTest.php
  294. +3 −3 tests/ZendTest/Memory/LockedTest.php
  295. +4 −4 tests/ZendTest/Memory/MovableTest.php
  296. +3 −3 tests/ZendTest/Server/ReflectionTest.php
  297. +2 −2 tests/ZendTest/Soap/TestAsset/commontypes.php
  298. +2 −2 tests/ZendTest/Soap/_files/commontypes.php
  299. +1 −1  tests/ZendTest/Uri/HttpTest.php
  300. +1 −1  tests/ZendTest/Validator/AbstractTest.php
Sorry, we could not display the entire diff because too many files (304) changed.
View
8 library/Zend/Authentication/Adapter/DbTable.php
@@ -98,7 +98,7 @@ class DbTable implements AdapterInterface
* different credentials. Default is FALSE and need to be set to true to
* allow ambiguity usage.
*
- * @var boolean
+ * @var bool
*/
protected $ambiguityIdentity = false;
@@ -265,7 +265,7 @@ public function getDbSelect()
*
* @param string|array $returnColumns
* @param string|array $omitColumns
- * @return stdClass|boolean
+ * @return stdClass|bool
*/
public function getResultRowObject($returnColumns = null, $omitColumns = null)
{
@@ -339,7 +339,7 @@ public function authenticate()
* required pieces of information.
*
* @throws Exception\RuntimeException in the event that setup was not done properly
- * @return boolean
+ * @return bool
*/
protected function _authenticateSetup()
{
@@ -431,7 +431,7 @@ protected function _authenticateQuerySelect(DbSelect $dbSelect)
* certain that only one record was returned in the resultset
*
* @param array $resultIdentities
- * @return boolean|\Zend\Authentication\Result
+ * @return bool|\Zend\Authentication\Result
*/
protected function _authenticateValidateResultSet(array $resultIdentities)
{
View
6 library/Zend/Authentication/Adapter/Http.php
@@ -95,7 +95,7 @@ class Http implements AdapterInterface
/**
* Whether to send the opaque value in the header. True by default
*
- * @var boolean
+ * @var bool
*/
protected $useOpaque;
@@ -126,14 +126,14 @@ class Http implements AdapterInterface
* Whether or not to do Proxy Authentication instead of origin server
* authentication (send 407's instead of 401's). Off by default.
*
- * @var boolean
+ * @var bool
*/
protected $imaProxy;
/**
* Flag indicating the client is IE and didn't bother to return the opaque string
*
- * @var boolean
+ * @var bool
*/
protected $ieNoOpaque;
View
2  library/Zend/Authentication/Adapter/Ldap.php
@@ -452,7 +452,7 @@ protected function checkGroupMembership(ZendLdap\Ldap $ldap, $canonicalName, $dn
*
* @param array $returnAttribs
* @param array $omitAttribs
- * @return stdClass|boolean
+ * @return stdClass|bool
*/
public function getAccountObject(array $returnAttribs = array(), array $omitAttribs = array())
{
View
2  library/Zend/Authentication/AuthenticationService.php
@@ -132,7 +132,7 @@ public function authenticate(Adapter\AdapterInterface $adapter = null)
/**
* Returns true if and only if an identity is available from storage
*
- * @return boolean
+ * @return bool
*/
public function hasIdentity()
{
View
2  library/Zend/Authentication/Result.php
@@ -94,7 +94,7 @@ public function __construct($code, $identity, array $messages = array())
/**
* Returns whether the result represents a successful authentication attempt
*
- * @return boolean
+ * @return bool
*/
public function isValid()
{
View
2  library/Zend/Authentication/Storage/NonPersistent.php
@@ -31,7 +31,7 @@ class NonPersistent implements StorageInterface
/**
* Returns true if and only if storage is empty
*
- * @return boolean
+ * @return bool
*/
public function isEmpty()
{
View
2  library/Zend/Authentication/Storage/Session.php
@@ -92,7 +92,7 @@ public function getMember()
/**
* Defined by Zend\Authentication\Storage\StorageInterface
*
- * @return boolean
+ * @return bool
*/
public function isEmpty()
{
View
2  library/Zend/Authentication/Storage/StorageInterface.php
@@ -21,7 +21,7 @@
* Returns true if and only if storage is empty
*
* @throws \Zend\Authentication\Exception\ExceptionInterface If it is impossible to determine whether storage is empty
- * @return boolean
+ * @return bool
*/
public function isEmpty();
View
2  library/Zend/Barcode/Barcode.php
@@ -96,7 +96,7 @@ public static function getRendererPluginManager()
* @param mixed $renderer String name of renderer class
* @param mixed $barcodeConfig OPTIONAL; an array or Traversable object with barcode parameters.
* @param mixed $rendererConfig OPTIONAL; an array or Traversable object with renderer parameters.
- * @param boolean $automaticRenderError OPTIONAL; set the automatic rendering of exception
+ * @param bool $automaticRenderError OPTIONAL; set the automatic rendering of exception
* @return Barcode
* @throws Exception\ExceptionInterface
*/
View
50 library/Zend/Barcode/Object/AbstractObject.php
@@ -92,19 +92,19 @@
/**
* Activate/deactivate border of the object
- * @var boolean
+ * @var bool
*/
protected $withBorder = false;
/**
* Activate/deactivate drawing of quiet zones
- * @var boolean
+ * @var bool
*/
protected $withQuietZones = true;
/**
* Force quiet zones even if
- * @var boolean
+ * @var bool
*/
protected $mandatoryQuietZones = false;
@@ -136,13 +136,13 @@
/**
* Display (or not) human readable text
- * @var boolean
+ * @var bool
*/
protected $drawText = true;
/**
* Adjust (or not) position of human readable characters with barcode
- * @var boolean
+ * @var bool
*/
protected $stretchText = false;
@@ -162,13 +162,13 @@
/**
* Drawing of checksum
- * @var boolean
+ * @var bool
*/
protected $withChecksum = false;
/**
* Drawing of checksum inside text
- * @var boolean
+ * @var bool
*/
protected $withChecksumInText = false;
@@ -181,14 +181,14 @@
/**
* Activate automatic addition of leading zeros
* if barcode length is fixed
- * @var boolean
+ * @var bool
*/
protected $addLeadingZeros = true;
/**
* Activation of mandatory checksum
* to deactivate unauthorized modification
- * @var boolean
+ * @var bool
*/
protected $mandatoryChecksum = false;
@@ -440,7 +440,7 @@ public function getBackgroundColor()
/**
* Activate/deactivate drawing of the bar
- * @param boolean $value
+ * @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
public function setWithBorder($value)
@@ -451,7 +451,7 @@ public function setWithBorder($value)
/**
* Retrieve if border are draw or not
- * @return boolean
+ * @return bool
*/
public function getWithBorder()
{
@@ -460,7 +460,7 @@ public function getWithBorder()
/**
* Activate/deactivate drawing of the quiet zones
- * @param boolean $value
+ * @param bool $value
* @return AbstractObject
*/
public function setWithQuietZones($value)
@@ -471,7 +471,7 @@ public function setWithQuietZones($value)
/**
* Retrieve if quiet zones are draw or not
- * @return boolean
+ * @return bool
*/
public function getWithQuietZones()
{
@@ -538,7 +538,7 @@ public function getText()
/**
* Automatically add leading zeros if barcode length is fixed
* @param string $text
- * @param boolean $withoutChecksum
+ * @param bool $withoutChecksum
* @return string
*/
protected function addLeadingZeros($text, $withoutChecksum = false)
@@ -583,7 +583,7 @@ public function getTextToDisplay()
/**
* Activate/deactivate drawing of text to encode
- * @param boolean $value
+ * @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
public function setDrawText($value)
@@ -594,7 +594,7 @@ public function setDrawText($value)
/**
* Retrieve if drawing of text to encode is enabled
- * @return boolean
+ * @return bool
*/
public function getDrawText()
{
@@ -604,7 +604,7 @@ public function getDrawText()
/**
* Activate/deactivate the adjustment of the position
* of the characters to the position of the bars
- * @param boolean $value
+ * @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
*/
@@ -617,7 +617,7 @@ public function setStretchText($value)
/**
* Retrieve if the adjustment of the position of the characters
* to the position of the bars is enabled
- * @return boolean
+ * @return bool
*/
public function getStretchText()
{
@@ -628,7 +628,7 @@ public function getStretchText()
* Activate/deactivate the automatic generation
* of the checksum character
* added to the barcode text
- * @param boolean $value
+ * @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
*/
public function setWithChecksum($value)
@@ -642,7 +642,7 @@ public function setWithChecksum($value)
/**
* Retrieve if the checksum character is automatically
* added to the barcode text
- * @return boolean
+ * @return bool
*/
public function getWithChecksum()
{
@@ -653,7 +653,7 @@ public function getWithChecksum()
* Activate/deactivate the automatic generation
* of the checksum character
* added to the barcode text
- * @param boolean $value
+ * @param bool $value
* @return \Zend\Barcode\Object\ObjectInterface
* @throw \Zend\Barcode\Object\Exception\ExceptionInterface
*/
@@ -668,7 +668,7 @@ public function setWithChecksumInText($value)
/**
* Retrieve if the checksum character is automatically
* added to the barcode text
- * @return boolean
+ * @return bool
*/
public function getWithChecksumInText()
{
@@ -785,7 +785,7 @@ public function getInstructions()
* Add a polygon drawing instruction in the set of instructions
* @param array $points
* @param integer $color
- * @param boolean $filled
+ * @param bool $filled
*/
protected function addPolygon(array $points, $color = null, $filled = true)
{
@@ -975,7 +975,7 @@ public function getWidth($recalculate = false)
/**
* Calculate the offset from the left of the object
* if an orientation is activated
- * @param boolean $recalculate
+ * @param bool $recalculate
* @return float
*/
public function getOffsetLeft($recalculate = false)
@@ -1002,7 +1002,7 @@ public function getOffsetLeft($recalculate = false)
/**
* Calculate the offset from the top of the object
* if an orientation is activated
- * @param boolean $recalculate
+ * @param bool $recalculate
* @return float
*/
public function getOffsetTop($recalculate = false)
View
2  library/Zend/Barcode/Object/Code128.php
@@ -21,7 +21,7 @@ class Code128 extends AbstractObject
/**
* Drawing of checksum
* (even if it's sometime optional, most of time it's required)
- * @var boolean
+ * @var bool
*/
protected $withChecksum = true;
View
6 library/Zend/Barcode/Object/Code25interleaved.php
@@ -20,7 +20,7 @@ class Code25interleaved extends Code25
{
/**
* Drawing of bearer bars
- * @var boolean
+ * @var bool
*/
private $withBearerBars = false;
@@ -35,7 +35,7 @@ protected function getDefaultOptions()
/**
* Activate/deactivate drawing of bearer bars
- * @param boolean $value
+ * @param bool $value
* @return Code25
*/
public function setWithBearerBars($value)
@@ -46,7 +46,7 @@ public function setWithBearerBars($value)
/**
* Retrieve if bearer bars are enabled
- * @return boolean
+ * @return bool
*/
public function getWithBearerBars()
{
View
2  library/Zend/Barcode/Object/Error.php
@@ -21,7 +21,7 @@ class Error extends AbstractObject
/**
* All texts are accepted
* @param string $value
- * @return boolean
+ * @return bool
*/
public function validateText($value)
{
View
28 library/Zend/Barcode/Object/ObjectInterface.php
@@ -135,14 +135,14 @@ public function getBackgroundColor();
/**
* Activate/deactivate drawing of the bar
- * @param boolean $value
+ * @param bool $value
* @return ObjectInterface
*/
public function setWithBorder($value);
/**
* Retrieve if border are draw or not
- * @return boolean
+ * @return bool
*/
public function getWithBorder();
@@ -192,21 +192,21 @@ public function getTextToDisplay();
/**
* Activate/deactivate drawing of text to encode
- * @param boolean $value
+ * @param bool $value
* @return ObjectInterface
*/
public function setDrawText($value);
/**
* Retrieve if drawing of text to encode is enabled
- * @return boolean
+ * @return bool
*/
public function getDrawText();
/**
* Activate/deactivate the adjustment of the position
* of the characters to the position of the bars
- * @param boolean $value
+ * @param bool $value
* @return ObjectInterface
*/
public function setStretchText($value);
@@ -214,7 +214,7 @@ public function setStretchText($value);
/**
* Retrieve if the adjustment of the position of the characters
* to the position of the bars is enabled
- * @return boolean
+ * @return bool
*/
public function getStretchText();
@@ -222,7 +222,7 @@ public function getStretchText();
* Activate/deactivate the automatic generation
* of the checksum character
* added to the barcode text
- * @param boolean $value
+ * @param bool $value
* @return ObjectInterface
*/
public function setWithChecksum($value);
@@ -230,7 +230,7 @@ public function setWithChecksum($value);
/**
* Retrieve if the checksum character is automatically
* added to the barcode text
- * @return boolean
+ * @return bool
*/
public function getWithChecksum();
@@ -238,7 +238,7 @@ public function getWithChecksum();
* Activate/deactivate the automatic generation
* of the checksum character
* added to the barcode text
- * @param boolean $value
+ * @param bool $value
* @return ObjectInterface
*/
public function setWithChecksumInText($value);
@@ -246,7 +246,7 @@ public function setWithChecksumInText($value);
/**
* Retrieve if the checksum character is automatically
* added to the barcode text
- * @return boolean
+ * @return bool
*/
public function getWithChecksumInText();
@@ -299,14 +299,14 @@ public function checkParams();
/**
* Get height of the result object
- * @param boolean $recalculate
+ * @param bool $recalculate
* @return integer
*/
public function getHeight($recalculate = false);
/**
* Get width of the result object
- * @param boolean $recalculate
+ * @param bool $recalculate
* @return integer
*/
public function getWidth($recalculate = false);
@@ -314,7 +314,7 @@ public function getWidth($recalculate = false);
/**
* Calculate the offset from the left of the object
* if an orientation is activated
- * @param boolean $recalculate
+ * @param bool $recalculate
* @return float
*/
public function getOffsetLeft($recalculate = false);
@@ -322,7 +322,7 @@ public function getOffsetLeft($recalculate = false);
/**
* Calculate the offset from the top of the object
* if an orientation is activated
- * @param boolean $recalculate
+ * @param bool $recalculate
* @return float
*/
public function getOffsetTop($recalculate = false);
View
10 library/Zend/Barcode/Renderer/AbstractRenderer.php
@@ -38,7 +38,7 @@
/**
* Activate/Deactivate the automatic rendering of exception
- * @var boolean
+ * @var bool
*/
protected $automaticRenderError = false;
@@ -202,7 +202,7 @@ public function getLeftOffset()
/**
* Activate/Deactivate the automatic rendering of exception
- * @param boolean $value
+ * @param bool $value
* @return AbstractRenderer
*/
public function setAutomaticRenderError($value)
@@ -292,7 +292,7 @@ public function getModuleSize()
/**
* Retrieve the automatic rendering of exception
- * @return boolean
+ * @return bool
*/
public function getAutomaticRenderError()
{
@@ -321,7 +321,7 @@ public function getBarcode()
/**
* Checking of parameters after all settings
- * @return boolean
+ * @return bool
*/
public function checkParams()
{
@@ -468,7 +468,7 @@ private function drawInstructionList()
* Draw a polygon in the rendering resource
* @param array $points
* @param integer $color
- * @param boolean $filled
+ * @param bool $filled
*/
abstract protected function drawPolygon($points, $color, $filled = true);
View
2  library/Zend/Barcode/Renderer/Image.php
@@ -329,7 +329,7 @@ public function render()
*
* @param array $points
* @param integer $color
- * @param boolean $filled
+ * @param bool $filled
*/
protected function drawPolygon($points, $color, $filled = true)
{
View
2  library/Zend/Barcode/Renderer/Pdf.php
@@ -103,7 +103,7 @@ protected function initRenderer()
* Draw a polygon in the rendering resource
* @param array $points
* @param integer $color
- * @param boolean $filled
+ * @param bool $filled
*/
protected function drawPolygon($points, $color, $filled = true)
{
View
6 library/Zend/Barcode/Renderer/RendererInterface.php
@@ -83,7 +83,7 @@ public function getLeftOffset();
/**
* Activate/Deactivate the automatic rendering of exception
- * @param boolean $value
+ * @param bool $value
*/
public function setAutomaticRenderError($value);
@@ -128,7 +128,7 @@ public function getModuleSize();
/**
* Retrieve the automatic rendering of exception
- * @return boolean
+ * @return bool
*/
public function getAutomaticRenderError();
@@ -147,7 +147,7 @@ public function getBarcode();
/**
* Checking of parameters after all settings
- * @return boolean
+ * @return bool
*/
public function checkParams();
View
2  library/Zend/Barcode/Renderer/Svg.php
@@ -292,7 +292,7 @@ public function render()
*
* @param array $points
* @param integer $color
- * @param boolean $filled
+ * @param bool $filled
*/
protected function drawPolygon($points, $color, $filled = true)
{
View
4 library/Zend/Cache/Pattern/CaptureCache.php
@@ -110,7 +110,7 @@ public function get($pageId = null)
*
* @param null|string $pageId
* @throws Exception\LogicException
- * @return boolean
+ * @return bool
*/
public function has($pageId = null)
{
@@ -136,7 +136,7 @@ public function has($pageId = null)
* @param null|string $pageId
* @throws Exception\LogicException
* @throws Exception\RuntimeException
- * @return boolean
+ * @return bool
*/
public function remove($pageId = null)
{
View
4 library/Zend/Cache/Pattern/OutputCache.php
@@ -50,7 +50,7 @@ public function setOptions(PatternOptions $options)
*
* @param string $key Key
* @throws Exception\MissingKeyException if key is missing
- * @return boolean
+ * @return bool
*/
public function start($key)
{
@@ -76,7 +76,7 @@ public function start($key)
* and displays the buffer.
*
* @throws Exception\RuntimeException if output cache not started or buffering not active
- * @return boolean TRUE on success, FALSE on failure writing to cache
+ * @return bool TRUE on success, FALSE on failure writing to cache
*/
public function end()
{
View
50 library/Zend/Cache/Storage/Adapter/AbstractAdapter.php
@@ -157,7 +157,7 @@ public function getOptions()
*
* @see setWritable()
* @see setReadable()
- * @param boolean $flag
+ * @param bool $flag
* @return AbstractAdapter
*/
public function setCaching($flag)
@@ -176,7 +176,7 @@ public function setCaching($flag)
*
* @see getWritable()
* @see getReadable()
- * @return boolean
+ * @return bool
*/
public function getCaching()
{
@@ -263,7 +263,7 @@ protected function triggerException($eventName, ArrayObject $args, & $result, \E
* Check if a plugin is registered
*
* @param Plugin\PluginInterface $plugin
- * @return boolean
+ * @return bool
*/
public function hasPlugin(Plugin\PluginInterface $plugin)
{
@@ -331,7 +331,7 @@ public function getPluginRegistry()
* Get an item.
*
* @param string $key
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -385,7 +385,7 @@ public function getItem($key, & $success = null, & $casToken = null)
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -453,7 +453,7 @@ protected function internalGetItems(array & $normalizedKeys)
* Test if an item exists.
*
* @param string $key
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers hasItem.pre(PreEvent)
@@ -489,7 +489,7 @@ public function hasItem($key)
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalHasItem(& $normalizedKey)
@@ -557,7 +557,7 @@ protected function internalHasItems(array & $normalizedKeys)
* Get metadata of an item.
*
* @param string $key
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
* @throws Exception\ExceptionInterface
*
* @triggers getMetadata.pre(PreEvent)
@@ -593,7 +593,7 @@ public function getMetadata($key)
* Internal method to get metadata of an item.
*
* @param string $normalizedKey
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalGetMetadata(& $normalizedKey)
@@ -667,7 +667,7 @@ protected function internalGetMetadatas(array & $normalizedKeys)
*
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers setItem.pre(PreEvent)
@@ -705,7 +705,7 @@ public function setItem($key, $value)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
abstract protected function internalSetItem(& $normalizedKey, & $value);
@@ -769,7 +769,7 @@ protected function internalSetItems(array & $normalizedKeyValuePairs)
*
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers addItem.pre(PreEvent)
@@ -807,7 +807,7 @@ public function addItem($key, $value)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalAddItem(& $normalizedKey, & $value)
@@ -877,7 +877,7 @@ protected function internalAddItems(array & $normalizedKeyValuePairs)
*
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers replaceItem.pre(PreEvent)
@@ -915,7 +915,7 @@ public function replaceItem($key, $value)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalReplaceItem(& $normalizedKey, & $value)
@@ -990,7 +990,7 @@ protected function internalReplaceItems(array & $normalizedKeyValuePairs)
* @param mixed $token
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
* @see getItem()
* @see setItem()
@@ -1028,7 +1028,7 @@ public function checkAndSetItem($token, $key, $value)
* @param mixed $token
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
* @see getItem()
* @see setItem()
@@ -1047,7 +1047,7 @@ protected function internalCheckAndSetItem(& $token, & $normalizedKey, & $value)
* Reset lifetime of an item
*
* @param string $key
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers touchItem.pre(PreEvent)
@@ -1083,7 +1083,7 @@ public function touchItem($key)
* Internal method to reset lifetime of an item
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalTouchItem(& $normalizedKey)
@@ -1154,7 +1154,7 @@ protected function internalTouchItems(array & $normalizedKeys)
* Remove an item.
*
* @param string $key
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers removeItem.pre(PreEvent)
@@ -1190,7 +1190,7 @@ public function removeItem($key)
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
abstract protected function internalRemoveItem(& $normalizedKey);
@@ -1253,7 +1253,7 @@ protected function internalRemoveItems(array & $normalizedKeys)
*
* @param string $key
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*
* @triggers incrementItem.pre(PreEvent)
@@ -1291,7 +1291,7 @@ public function incrementItem($key, $value)
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalIncrementItem(& $normalizedKey, & $value)
@@ -1370,7 +1370,7 @@ protected function internalIncrementItems(array & $normalizedKeyValuePairs)
*
* @param string $key
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*
* @triggers decrementItem.pre(PreEvent)
@@ -1408,7 +1408,7 @@ public function decrementItem($key, $value)
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalDecrementItem(& $normalizedKey, & $value)
View
10 library/Zend/Cache/Storage/Adapter/AbstractZendServer.php
@@ -34,7 +34,7 @@
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -86,7 +86,7 @@ protected function internalGetItems(array & $normalizedKeys)
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalHasItem(& $normalizedKey)
@@ -158,7 +158,7 @@ protected function internalGetMetadatas(array & $normalizedKeys)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalSetItem(& $normalizedKey, & $value)
@@ -173,7 +173,7 @@ protected function internalSetItem(& $normalizedKey, & $value)
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalRemoveItem(& $normalizedKey)
@@ -258,7 +258,7 @@ protected function internalGetCapabilities()
* Delete data from Zend Data Cache (zdc)
*
* @param string $internalKey
- * @return boolean
+ * @return bool
* @throws Exception\RuntimeException
*/
abstract protected function zdcDelete($internalKey);
View
12 library/Zend/Cache/Storage/Adapter/AdapterOptions.php
@@ -52,7 +52,7 @@ class AdapterOptions extends AbstractOptions
/**
* Readable option
*
- * @var boolean
+ * @var bool
*/
protected $readable = true;
@@ -66,7 +66,7 @@ class AdapterOptions extends AbstractOptions
/**
* Writable option
*
- * @var boolean
+ * @var bool
*/
protected $writable = true;
@@ -154,7 +154,7 @@ public function getNamespace()
/**
* Enable/Disable reading data from cache.
*
- * @param boolean $readable
+ * @param bool $readable
* @return AbstractAdapter
*/
public function setReadable($readable)
@@ -170,7 +170,7 @@ public function setReadable($readable)
/**
* If reading data from cache enabled.
*
- * @return boolean
+ * @return bool
*/
public function getReadable()
{
@@ -206,7 +206,7 @@ public function getTtl()
/**
* Enable/Disable writing data to cache.
*
- * @param boolean $writable
+ * @param bool $writable
* @return AdapterOptions
*/
public function setWritable($writable)
@@ -222,7 +222,7 @@ public function setWritable($writable)
/**
* If writing data to cache enabled.
*
- * @return boolean
+ * @return bool
*/
public function getWritable()
{
View
24 library/Zend/Cache/Storage/Adapter/Apc.php
@@ -152,7 +152,7 @@ public function getIterator()
/**
* Flush the whole storage
*
- * @return boolean
+ * @return bool
*/
public function flush()
{
@@ -165,7 +165,7 @@ public function flush()
* Remove items by given namespace
*
* @param string $namespace
- * @return boolean
+ * @return bool
*/
public function clearByNamespace($namespace)
{
@@ -181,7 +181,7 @@ public function clearByNamespace($namespace)
* Remove items matching given prefix
*
* @param string $prefix
- * @return boolean
+ * @return bool
*/
public function clearByPrefix($prefix)
{
@@ -197,7 +197,7 @@ public function clearByPrefix($prefix)
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -250,7 +250,7 @@ protected function internalGetItems(array & $normalizedKeys)
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalHasItem(& $normalizedKey)
@@ -293,7 +293,7 @@ protected function internalHasItems(array & $normalizedKeys)
* Get metadata of an item.
*
* @param string $normalizedKey
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalGetMetadata(& $normalizedKey)
@@ -365,7 +365,7 @@ protected function internalGetMetadatas(array & $normalizedKeys)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalSetItem(& $normalizedKey, & $value)
@@ -420,7 +420,7 @@ protected function internalSetItems(array & $normalizedKeyValuePairs)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalAddItem(& $normalizedKey, & $value)
@@ -479,7 +479,7 @@ protected function internalAddItems(array & $normalizedKeyValuePairs)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalReplaceItem(& $normalizedKey, & $value)
@@ -507,7 +507,7 @@ protected function internalReplaceItem(& $normalizedKey, & $value)
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalRemoveItem(& $normalizedKey)
@@ -551,7 +551,7 @@ protected function internalRemoveItems(array & $normalizedKeys)
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalIncrementItem(& $normalizedKey, & $value)
@@ -582,7 +582,7 @@ protected function internalIncrementItem(& $normalizedKey, & $value)
*
* @param string $normalizedKey
* @param int $value
- * @return int|boolean The new value on success, false on failure
+ * @return int|bool The new value on success, false on failure
* @throws Exception\ExceptionInterface
*/
protected function internalDecrementItem(& $normalizedKey, & $value)
View
2  library/Zend/Cache/Storage/Adapter/ApcIterator.php
@@ -145,7 +145,7 @@ public function next()
/**
* Checks if current position is valid
*
- * @return boolean
+ * @return bool
*/
public function valid()
{
View
18 library/Zend/Cache/Storage/Adapter/Dba.php
@@ -179,7 +179,7 @@ public function getAvailableSpace()
/**
* Flush the whole storage
*
- * @return boolean
+ * @return bool
*/
public function flush()
{
@@ -212,7 +212,7 @@ public function flush()
* Remove items by given namespace
*
* @param string $namespace
- * @return boolean
+ * @return bool
*/
public function clearByNamespace($namespace)
{
@@ -243,7 +243,7 @@ public function clearByNamespace($namespace)
* Remove items matching given prefix
*
* @param string $prefix
- * @return boolean
+ * @return bool
*/
public function clearByPrefix($prefix)
{
@@ -290,7 +290,7 @@ public function getIterator()
/**
* Optimize the storage
*
- * @return boolean
+ * @return bool
* @return Exception\RuntimeException
*/
public function optimize()
@@ -308,7 +308,7 @@ public function optimize()
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -336,7 +336,7 @@ protected function internalGetItem(& $normalizedKey, & $success = null, & $casTo
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalHasItem(& $normalizedKey)
@@ -356,7 +356,7 @@ protected function internalHasItem(& $normalizedKey)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalSetItem(& $normalizedKey, & $value)
@@ -378,7 +378,7 @@ protected function internalSetItem(& $normalizedKey, & $value)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalAddItem(& $normalizedKey, & $value)
@@ -410,7 +410,7 @@ protected function internalAddItem(& $normalizedKey, & $value)
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalRemoveItem(& $normalizedKey)
View
4 library/Zend/Cache/Storage/Adapter/DbaIterator.php
@@ -51,7 +51,7 @@ class DbaIterator implements IteratorInterface
/**
* The current internal key
*
- * @var string|boolean
+ * @var string|bool
*/
protected $currentInternalKey;
@@ -167,7 +167,7 @@ public function next()
/**
* Checks if current position is valid
*
- * @return boolean
+ * @return bool
*/
public function valid()
{
View
66 library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -102,7 +102,7 @@ public function getOptions()
* Flush the whole storage
*
* @throws Exception\RuntimeException
- * @return boolean
+ * @return bool
*/
public function flush()
{
@@ -136,7 +136,7 @@ public function flush()
/**
* Remove expired items
*
- * @return boolean
+ * @return bool
*/
public function clearExpired()
{
@@ -179,7 +179,7 @@ public function clearExpired()
*
* @param string $namespace
* @throws Exception\RuntimeException
- * @return boolean
+ * @return bool
*/
public function clearByNamespace($namespace)
{
@@ -211,7 +211,7 @@ public function clearByNamespace($namespace)
*
* @param string $prefix
* @throws Exception\RuntimeException
- * @return boolean
+ * @return bool
*/
public function clearByPrefix($prefix)
{
@@ -244,7 +244,7 @@ public function clearByPrefix($prefix)
*
* @param string $key
* @param string[] $tags
- * @return boolean
+ * @return bool
*/
public function setTags($key, array $tags)
{
@@ -293,8 +293,8 @@ public function getTags($key)
* else all given tags must match.
*
* @param string[] $tags
- * @param boolean $disjunction
- * @return boolean
+ * @param bool $disjunction
+ * @return bool
*/
public function clearByTags(array $tags, $disjunction = false)
{
@@ -357,7 +357,7 @@ public function getIterator()
/**
* Optimize the storage
*
- * @return boolean
+ * @return bool
* @return Exception\RuntimeException
*/
public function optimize()
@@ -439,7 +439,7 @@ public function getAvailableSpace()
* Get an item.
*
* @param string $key
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -490,7 +490,7 @@ public function getItems(array $keys)
* Internal method to get an item.
*
* @param string $normalizedKey
- * @param boolean $success
+ * @param bool $success
* @param mixed $casToken
* @return mixed Data on success, null on failure
* @throws Exception\ExceptionInterface
@@ -566,7 +566,7 @@ protected function internalGetItems(array & $normalizedKeys)
* Test if an item exists.
*
* @param string $key
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers hasItem.pre(PreEvent)
@@ -608,7 +608,7 @@ public function hasItems(array $keys)
* Internal method to test if an item exists.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalHasItem(& $normalizedKey)
@@ -641,7 +641,7 @@ protected function internalHasItem(& $normalizedKey)
* Get metadata
*
* @param string $key
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
*/
public function getMetadata($key)
{
@@ -674,7 +674,7 @@ public function getMetadatas(array $keys, array $options = array())
* Get info by key
*
* @param string $normalizedKey
- * @return array|boolean Metadata on success, false on failure
+ * @return array|bool Metadata on success, false on failure
*/
protected function internalGetMetadata(& $normalizedKey)
{
@@ -744,7 +744,7 @@ protected function internalGetMetadatas(array & $normalizedKeys)
*
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers setItem.pre(PreEvent)
@@ -786,7 +786,7 @@ public function setItems(array $keyValuePairs)
*
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers addItem.pre(PreEvent)
@@ -807,7 +807,7 @@ public function addItem($key, $value)
* Add multiple items.
*
* @param array $keyValuePairs
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers addItems.pre(PreEvent)
@@ -829,7 +829,7 @@ public function addItems(array $keyValuePairs)
*
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers replaceItem.pre(PreEvent)
@@ -850,7 +850,7 @@ public function replaceItem($key, $value)
* Replace multiple existing items.
*
* @param array $keyValuePairs
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers replaceItems.pre(PreEvent)
@@ -872,7 +872,7 @@ public function replaceItems(array $keyValuePairs)
*
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalSetItem(& $normalizedKey, & $value)
@@ -945,7 +945,7 @@ protected function internalSetItems(array & $normalizedKeyValuePairs)
* @param mixed $token
* @param string $key
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
* @see getItem()
* @see setItem()
@@ -966,7 +966,7 @@ public function checkAndSetItem($token, $key, $value)
* @param mixed $token
* @param string $normalizedKey
* @param mixed $value
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
* @see getItem()
* @see setItem()
@@ -991,7 +991,7 @@ protected function internalCheckAndSetItem(& $token, & $normalizedKey, & $value)
* Reset lifetime of an item
*
* @param string $key
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers touchItem.pre(PreEvent)
@@ -1033,7 +1033,7 @@ public function touchItems(array $keys)
* Internal method to reset lifetime of an item
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalTouchItem(& $normalizedKey)
@@ -1060,7 +1060,7 @@ protected function internalTouchItem(& $normalizedKey)
* Remove an item.
*
* @param string $key
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*
* @triggers removeItem.pre(PreEvent)
@@ -1102,7 +1102,7 @@ public function removeItems(array $keys)
* Internal method to remove an item.
*
* @param string $normalizedKey
- * @return boolean
+ * @return bool
* @throws Exception\ExceptionInterface
*/
protected function internalRemoveItem(& $normalizedKey)
@@ -1269,9 +1269,9 @@ protected function getFileSpec($normalizedKey)
* Read info file
*
* @param string $file
- * @param boolean $nonBlocking Don't block script if file is locked
- * @param boolean $wouldblock The optional argument is set to TRUE if the lock would block
- * @return array|boolean The info array or false if file wasn't found
+ * @param bool $nonBlocking Don't block script if file is locked
+ * @param bool $wouldblock The optional argument is set to TRUE if the lock would block
+ * @return array|bool The info array or false if file wasn't found
* @throws Exception\RuntimeException
*/
protected function