Merge branch 'hotfix/4098' into develop

Close zendframework/zendframework#4098
zendframework · Mar 28, 2013 · 7886448 · 7886448
commit 7886448
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/Upload/AbstractUploadHandler.php b/src/Upload/AbstractUploadHandler.php
@@ -159,7 +159,7 @@ public function getProgress($id)
 
     /**
      * @param  string $id
-     * @return array|boolean
+     * @return array|bool
      */
     abstract protected function getUploadProgress($id);
 

diff --git a/src/Upload/ApcProgress.php b/src/Upload/ApcProgress.php
@@ -20,7 +20,7 @@ class ApcProgress extends AbstractUploadHandler
 {
     /**
      * @param  string $id
-     * @return array|boolean
+     * @return array|bool
      * @throws Exception\PhpEnvironmentException
      */
     protected function getUploadProgress($id)
@@ -53,7 +53,7 @@ protected function getUploadProgress($id)
     /**
      * Checks for the APC extension
      *
-     * @return boolean
+     * @return bool
      */
     public function isApcAvailable()
     {

diff --git a/src/Upload/SessionProgress.php b/src/Upload/SessionProgress.php
@@ -20,7 +20,7 @@ class SessionProgress extends AbstractUploadHandler
 {
     /**
      * @param  string $id
-     * @return array|boolean
+     * @return array|bool
      * @throws Exception\PhpEnvironmentException
      */
     protected function getUploadProgress($id)
@@ -62,7 +62,7 @@ protected function getUploadProgress($id)
     /**
      * Checks if Session Upload Progress is available
      *
-     * @return boolean
+     * @return bool
      */
     public function isSessionUploadProgressAvailable()
     {

diff --git a/src/Upload/UploadProgress.php b/src/Upload/UploadProgress.php
@@ -20,7 +20,7 @@ class UploadProgress extends AbstractUploadHandler
 {
     /**
      * @param  string $id
-     * @return array|boolean
+     * @return array|bool
      * @throws Exception\PhpEnvironmentException
      */
     protected function getUploadProgress($id)
@@ -57,7 +57,7 @@ protected function getUploadProgress($id)
     /**
      * Checks for the UploadProgress extension
      *
-     * @return boolean
+     * @return bool
      */
     public function isUploadProgressAvailable()
     {