Merge branch 'hotfix/146' into develop

Forward port #146
zendframework · Apr 17, 2018 · 002c32d · 002c32d
2 parents b9e06df + 7dba0df
commit 002c32d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -47,6 +47,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#146](https://github.com/zendframework/zend-cache/pull/146) fixes several methods to change `@return` annotations to `@throws` where applicable.
+
 - [#134](https://github.com/zendframework/zend-cache/pull/134) adds a missing import statement for `Traversable` within the `AdapterOptions` class.
 
 - [#128](https://github.com/zendframework/zend-cache/pull/128)

diff --git a/src/Storage/Adapter/Dba.php b/src/Storage/Adapter/Dba.php
@@ -303,7 +303,7 @@ public function getIterator()
      * Optimize the storage
      *
      * @return bool
-     * @return Exception\RuntimeException
+     * @throws Exception\RuntimeException
      */
     public function optimize()
     {

diff --git a/src/Storage/Adapter/Filesystem.php b/src/Storage/Adapter/Filesystem.php
@@ -441,7 +441,7 @@ public function getIterator()
      * Optimize the storage
      *
      * @return bool
-     * @return Exception\RuntimeException
+     * @throws Exception\RuntimeException
      */
     public function optimize()
     {

diff --git a/src/Storage/Adapter/MemcacheOptions.php b/src/Storage/Adapter/MemcacheOptions.php
@@ -241,7 +241,7 @@ public function setAutoCompressMinSavings($minSavings)
     /**
      * Get compress min savings
      *
-     * @return Exception\RuntimeException
+     * @throws Exception\RuntimeException
      */
     public function getAutoCompressMinSavings()
     {

diff --git a/src/Storage/Adapter/Memcached.php b/src/Storage/Adapter/Memcached.php
@@ -630,7 +630,7 @@ protected function expirationTime()
      * Generate exception based of memcached result code
      *
      * @param int $code
-     * @return Exception\RuntimeException
+     * @throws Exception\RuntimeException
      * @throws Exception\InvalidArgumentException On success code
      */
     protected function getExceptionByResultCode($code)