Merge branch 'hotfix/4098' into develop

weierophinney · weierophinney · commit 788644840307 · 2013-03-28T11:40:11.000-05:00
Close zendframework/zendframework#4098
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()
     {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ApcProgress extends AbstractUploadHandler`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @param string $id`
`23`		`- * @return array\|boolean`
	`23`	`+ * @return array\|bool`
`24`	`24`	`* @throws Exception\PhpEnvironmentException`
`25`	`25`	`*/`
`26`	`26`	`protected function getUploadProgress($id)`
`@@ -53,7 +53,7 @@ protected function getUploadProgress($id)`
`53`	`53`	`/**`
`54`	`54`	`* Checks for the APC extension`
`55`	`55`	`*`
`56`		`- * @return boolean`
	`56`	`+ * @return bool`
`57`	`57`	`*/`
`58`	`58`	`public function isApcAvailable()`
`59`	`59`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class SessionProgress extends AbstractUploadHandler`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @param string $id`
`23`		`- * @return array\|boolean`
	`23`	`+ * @return array\|bool`
`24`	`24`	`* @throws Exception\PhpEnvironmentException`
`25`	`25`	`*/`
`26`	`26`	`protected function getUploadProgress($id)`
`@@ -62,7 +62,7 @@ protected function getUploadProgress($id)`
`62`	`62`	`/**`
`63`	`63`	`* Checks if Session Upload Progress is available`
`64`	`64`	`*`
`65`		`- * @return boolean`
	`65`	`+ * @return bool`
`66`	`66`	`*/`
`67`	`67`	`public function isSessionUploadProgressAvailable()`
`68`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class UploadProgress extends AbstractUploadHandler`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`	`22`	`* @param string $id`
`23`		`- * @return array\|boolean`
	`23`	`+ * @return array\|bool`
`24`	`24`	`* @throws Exception\PhpEnvironmentException`
`25`	`25`	`*/`
`26`	`26`	`protected function getUploadProgress($id)`
`@@ -57,7 +57,7 @@ protected function getUploadProgress($id)`
`57`	`57`	`/**`
`58`	`58`	`* Checks for the UploadProgress extension`
`59`	`59`	`*`
`60`		`- * @return boolean`
	`60`	`+ * @return bool`
`61`	`61`	`*/`
`62`	`62`	`public function isUploadProgressAvailable()`
`63`	`63`	`{`