CS fixes.

pear2 · Aug 14, 2013 · 27efd23 · 27efd23
1 parent f4f24e9
commit 27efd23
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 32 deletions.
diff --git a/stub.php b/stub.php
@@ -75,8 +75,6 @@
 HEREDOC;
     }
 
-    if (class_exists('PEAR2\Cache\SHM', true))
-
     if (function_exists('stream_socket_client')) {
         $failCode = constant(
             'PEAR2\Net\RouterOS\SocketException::CODE_CONNECTION_FAIL'

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -42,9 +42,6 @@ public static function tearDownAfterClass()
 
     public function testNormalEncryptedConnection()
     {
-//        $this->markTestIncomplete(
-//            'There are issues with PHP itself regarding TLS connections'
-//        );
         try {
             $routerOS = new Client(
                 \HOSTNAME,

diff --git a/tests/HandlingTest.php b/tests/HandlingTest.php
@@ -31,10 +31,10 @@
 class RequestHandlingTest extends PHPUnit_Framework_TestCase
 {
     /**
-     * @dataProvider providerNonAbsoluteCommand
-     * 
      * @param string $command
      * 
+     * @dataProvider providerNonAbsoluteCommand
+     * 
      * @return void
      */
     public function testNonAbsoluteCommand($command)
@@ -61,10 +61,10 @@ public function providerNonAbsoluteCommand()
     }
 
     /**
-     * @dataProvider providerUnresolvableCommand
-     * 
      * @param string $command
      * 
+     * @dataProvider providerUnresolvableCommand
+     * 
      * @return void
      */
     public function testUnresolvableCommand($command)
@@ -89,10 +89,10 @@ public function providerUnresolvableCommand()
     }
 
     /**
-     * @dataProvider providerInvalidCommand
-     * 
      * @param string $command
      * 
+     * @dataProvider providerInvalidCommand
+     * 
      * @return void
      */
     public function testInvalidCommand($command)
@@ -118,11 +118,11 @@ public function providerInvalidCommand()
     }
 
     /**
-     * @dataProvider providerCommandTranslation
-     * 
      * @param string $command
      * @param string $expected
      * 
+     * @dataProvider providerCommandTranslation
+     * 
      * @return void
      */
     public function testCommandTranslation($command, $expected)
@@ -150,12 +150,12 @@ public function providerCommandTranslation()
     }
 
     /**
-     * @dataProvider providerCommandAndArgumentParsing
-     * 
      * @param string $command
      * @param string $expected
      * @param array  $args
      * 
+     * @dataProvider providerCommandAndArgumentParsing
+     * 
      * @return void
      */
     public function testCommandAndArgumentParsing($command, $expected, $args)
@@ -592,10 +592,12 @@ public function providerCommandAndArgumentParsing()
     }
 
     /**
-     * @dataProvider providerCommandArgumentParsingExceptions
-     * 
      * @param string $command
      * @param int    $code
+     * 
+     * @dataProvider providerCommandArgumentParsingExceptions
+     * 
+     * @return void
      */
     public function testCommandArgumentParsingExceptions($command, $code)
     {
@@ -626,9 +628,11 @@ public function providerCommandArgumentParsingExceptions()
     }
 
     /**
+     * @param string $name
+     * 
      * @dataProvider providerInvalidArgumentName
      * 
-     * @param string $name
+     * @return void
      */
     public function testInvalidArgumentName($name)
     {
@@ -645,10 +649,10 @@ public function testInvalidArgumentName($name)
     }
 
     /**
-     * @dataProvider providerInvalidArgumentName
-     * 
      * @param string $name
      * 
+     * @dataProvider providerInvalidArgumentName
+     * 
      * @return void
      */
     public function testInvalidQueryArgumentName($name)
@@ -690,9 +694,11 @@ public function testNonSeekableArgumentValue()
     }
 
     /**
+     * @param string|int $action
+     * 
      * @dataProvider providerInvalidQueryArgumentAction
      * 
-     * @param string|int $action
+     * @return void
      */
     public function testInvalidQueryArgumentAction($action)
     {
@@ -772,10 +778,10 @@ public function testArgumentRemoval()
     }
 
     /**
-     * @dataProvider providerLengths
-     * 
      * @param string $expected
-     * @param int $length
+     * @param int    $length
+     * 
+     * @dataProvider providerLengths
      * 
      * @return void
      */
@@ -793,10 +799,10 @@ public function testLengthEncoding($expected, $length)
     }
 
     /**
-     * @dataProvider providerLengths
-     * 
      * @param string $length
-     * @param int $expected
+     * @param int    $expected
+     * 
+     * @dataProvider providerLengths
      * 
      * @return void
      */
@@ -902,10 +908,10 @@ public function testLengthEncodingExceptions()
     }
 
     /**
-     * @dataProvider providerControlByte
-     * 
      * @param int $controlByte
      * 
+     * @dataProvider providerControlByte
+     * 
      * @return void
      */
     public function testControlByteException($controlByte)
@@ -1157,10 +1163,10 @@ public function testTaglessModePassing()
     }
 
     /**
-     * @dataProvider providerUtilParseValue
-     * 
      * @param string $value
-     * @param mixed $expected
+     * @param mixed  $expected
+     * 
+     * @dataProvider providerUtilParseValue
      * 
      * @return void
      */