Merge branch 'master' into dev-filefilessize

zendframework · Dec 25, 2014 · 3a02933 · 3a02933
commit 3a02933
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 29 deletions.
diff --git a/src/Adapter/AbstractAdapter.php b/src/Adapter/AbstractAdapter.php
@@ -194,7 +194,6 @@ public function writeBox(
         // Draw vertical lines and fill
         if (is_numeric($fillStyle)
             && $fillStyle !== static::FILL_NONE) {
-
             switch ($fillStyle) {
                 case static::FILL_SHADE_LIGHT:
                     $fillChar = $charset::SHADE_LIGHT;
@@ -210,7 +209,6 @@ public function writeBox(
                     $fillChar = $charset::BLOCK;
                     break;
             }
-
         } elseif ($fillStyle) {
             $fillChar = StringUtils::getWrapper()->substr($fillStyle, 0, 1);
         } else {

diff --git a/src/Charset/Ascii.php b/src/Charset/Ascii.php
@@ -14,7 +14,6 @@
  */
 class Ascii implements CharsetInterface
 {
-
     const ACTIVATE          = "";
     const DEACTIVATE        = "";
 

diff --git a/src/Charset/AsciiExtended.php b/src/Charset/AsciiExtended.php
@@ -16,7 +16,6 @@
  */
 class AsciiExtended implements CharsetInterface
 {
-
     const ACTIVATE          = "";
     const DEACTIVATE        = "";
 

diff --git a/src/Charset/DECSG.php b/src/Charset/DECSG.php
@@ -16,7 +16,6 @@
  */
 class DECSG implements CharsetInterface
 {
-
     const ACTIVATE          = "\x1b(0";
     const DEACTIVATE        = "\x1b(B";
 

diff --git a/src/Charset/Utf8.php b/src/Charset/Utf8.php
@@ -16,7 +16,6 @@
  */
 class Utf8 implements CharsetInterface
 {
-
     const ACTIVATE          = "";
     const DEACTIVATE        = "";
 

diff --git a/src/Charset/Utf8Heavy.php b/src/Charset/Utf8Heavy.php
@@ -16,7 +16,6 @@
  */
 class Utf8Heavy extends Utf8
 {
-
     const LINE_SINGLE_EW = "━";
     const LINE_SINGLE_NS = "┃";
     const LINE_SINGLE_NW = "┏";

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -11,5 +11,4 @@
 
 class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
-
 }
diff --git a/src/Getopt.php b/src/Getopt.php
@@ -69,7 +69,6 @@
  */
 class Getopt
 {
-
     /**
      * The options for a given application can be in multiple formats.
      * modeGnu is for traditional 'ab:c:' style getopt format.

diff --git a/src/Prompt/Char.php b/src/Prompt/Char.php
@@ -52,7 +52,6 @@ public function __construct(
         $allowEmpty = false,
         $echo = true
     ) {
-
         $this->setPromptText($promptText);
         $this->setAllowEmpty($allowEmpty);
         $this->setIgnoreCase($ignoreCase);

diff --git a/src/Prompt/Select.php b/src/Prompt/Select.php
@@ -62,7 +62,6 @@ public function __construct(
         if ($echo !== null) {
             $this->setEcho($echo);
         }
-
     }
 
     /**

diff --git a/src/Response.php b/src/Response.php
@@ -14,7 +14,6 @@
 
 class Response extends Message implements ResponseInterface
 {
-
     /**
      * @var bool
      */

diff --git a/src/RouteMatcher/DefaultRouteMatcher.php b/src/RouteMatcher/DefaultRouteMatcher.php
@@ -728,7 +728,6 @@ public function match($params)
              * Advance to next argument
              */
             $argPos++;
-
         }
 
         /*

diff --git a/src/RouteMatcher/RouteMatcherInterface.php b/src/RouteMatcher/RouteMatcherInterface.php
@@ -11,13 +11,11 @@
 
 interface RouteMatcherInterface
 {
-
     /**
      * Match parameters against route passed to constructor
      *
      * @param array $params
      * @return array|null
      */
     public function match($params);
-
 }
diff --git a/test/ConsoleTest.php b/test/ConsoleTest.php
@@ -68,15 +68,15 @@ public function testCanNotGetInstanceInNoConsoleMode()
 
     public function testCanForceInstance()
     {
-       $console = Console::getInstance('Posix');
-       $this->assertTrue($console instanceof Adapter\AdapterInterface);
-       $this->assertTrue($console instanceof Adapter\Posix);
+        $console = Console::getInstance('Posix');
+        $this->assertTrue($console instanceof Adapter\AdapterInterface);
+        $this->assertTrue($console instanceof Adapter\Posix);
 
-       Console::overrideIsConsole(null);
-       Console::resetInstance();
+        Console::overrideIsConsole(null);
+        Console::resetInstance();
 
-       $console = Console::getInstance('Windows');
-       $this->assertTrue($console instanceof Adapter\AdapterInterface);
-       $this->assertTrue($console instanceof Adapter\Windows);
+        $console = Console::getInstance('Windows');
+        $this->assertTrue($console instanceof Adapter\AdapterInterface);
+        $this->assertTrue($console instanceof Adapter\Windows);
     }
 }
diff --git a/test/GetoptTest.php b/test/GetoptTest.php
@@ -291,7 +291,6 @@ public function testGetoptUsageMessageFromException()
             $message = preg_replace('/ /', '_', $message);
             $this->assertEquals($message,
                 "Usage:_<progname>_[_options_]\n--apple|-a_[_<string>_]_________________apple\n--banana1|--banana2|--banana3|--banana4_banana\n--pear_<string>_________________________pear\n");
-
         }
     }
 
@@ -342,7 +341,6 @@ public function testGetoptSetHelp()
         $message = preg_replace('/ /', '_', $message);
         $this->assertEquals($message,
             "Usage:_<progname>_[_options_]\n-a___________________apple\n-b___________________banana\n-p_<string>__________pear\n");
-
     }
 
     public function testGetoptSetHelpInvalid()
@@ -408,7 +406,6 @@ public function testGetoptCheckParameterType()
 
         $opts->setArguments(array('-k', 'string'));
         $this->assertEquals('string', $opts->k);
-
     }
 
     /**

diff --git a/test/RouteMatcher/DefaultRouteMatcherTest.php b/test/RouteMatcher/DefaultRouteMatcherTest.php
@@ -20,7 +20,6 @@
  */
 class DefaultRouteMatcherTest extends \PHPUnit_Framework_TestCase
 {
-
     public static function routeProvider()
     {
         return array(
@@ -1208,8 +1207,7 @@ public function testMatchingWithAliases(
         array $aliases = array(),
         array $arguments = array(),
         array $params = null
-    )
-    {
+    ) {
         $route = new DefaultRouteMatcher($routeDefinition, array(), array(), $aliases);
         $match = $route->match($arguments);
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ @@
      */
     class Ascii implements CharsetInterface
     {
         const ACTIVATE          = "";
         const DEACTIVATE        = "";
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,5 +11,4 @@

		class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
		{

		}