Merge branch 'cs/#6994-zend-progressbar-psr2-compliance'

Close #6994
zendframework · Dec 11, 2014 · 8279992 · 8279992
2 parents 670b5c2 + 685ad66
commit 8279992
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php b/library/Zend/ProgressBar/Adapter/Exception/InvalidArgumentException.php
@@ -14,7 +14,6 @@
 /**
  * Exception for Zend\Progressbar component.
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php b/library/Zend/ProgressBar/Adapter/Exception/RuntimeException.php
@@ -14,7 +14,6 @@
 /**
  * Exception for Zend\Progressbar component.
  */
-class RuntimeException extends Exception\RuntimeException implements
-    ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/ProgressBar/Exception/InvalidArgumentException.php b/library/Zend/ProgressBar/Exception/InvalidArgumentException.php
@@ -12,7 +12,6 @@
 /**
  * Exception for Zend\Progressbar component.
  */
-class InvalidArgumentException extends \InvalidArgumentException implements
-    ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }
diff --git a/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php b/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
@@ -137,9 +137,7 @@ public function getProgress($id)
         $adapter = $this->getProgressAdapter();
         if (isset($adapter)) {
             if ($adapter instanceof AbstractProgressAdapter) {
-                $adapter = new ProgressBar(
-                    $adapter, 0, $status['total'], $this->getSessionNamespace()
-                );
+                $adapter = new ProgressBar($adapter, 0, $status['total'], $this->getSessionNamespace());
                 $this->setProgressAdapter($adapter);
             }
 

diff --git a/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php b/library/Zend/ProgressBar/Upload/UploadHandlerInterface.php
@@ -9,7 +9,6 @@
 
 namespace Zend\ProgressBar\Upload;
 
-
 /**
  * Interface for Upload Progress Handlers
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     namespace Zend\ProgressBar\Upload;
     /**
      * Interface for Upload Progress Handlers
      */
@@ Expand Down @@