cleanup and test fixes

splitbrain · splitbrain · commit cff17681f0f7 · 2016-05-03T21:34:35.000+02:00
diff --git a/examples/complex.php b/examples/complex.php
@@ -27,7 +27,8 @@ protected function setup(Options $options)
         $options->registerOption('someflag', 'This is a flag only valid for the foo command', 's', false, 'foo');
         $options->registerArgument('file', 'This argument is only required for the foo command', true, 'foo');
 
-        $options->registerOption('load', 'Another flag only for the bar command, requiring an argument', 'l', 'input', 'bar');
+        $options->registerOption('load', 'Another flag only for the bar command, requiring an argument', 'l', 'input',
+            'bar');
 
     }
 
@@ -56,7 +57,7 @@ protected function main(Options $options)
         }
 
         $this->info('$options->getArgs():');
-            var_dump($options->getArgs());
+        var_dump($options->getArgs());
 
     }
 }
diff --git a/examples/simple.php b/examples/simple.php
@@ -44,8 +44,8 @@ protected function main(Options $options)
             $this->info("file was given as " . $options->getOpt('file'));
         }
 
-        $this->info("Number of arguments: ".count($options->getArgs()));
-        
+        $this->info("Number of arguments: " . count($options->getArgs()));
+
         $this->success("main finished");
     }
 }
diff --git a/src/CLI.php b/src/CLI.php
@@ -25,9 +25,9 @@ abstract class CLI
      *
      * @param bool $autocatch should exceptions be catched and handled automatically?
      */
-    public function __construct($autocatch=true)
+    public function __construct($autocatch = true)
     {
-        if($autocatch) {
+        if ($autocatch) {
             set_exception_handler(array($this, 'fatal'));
         }
 
diff --git a/tests/OptionsTest.php b/tests/OptionsTest.php
@@ -1,8 +1,14 @@
 <?php
 
-use splitbrain\phpcli\Options;
+namespace splitbrain\phpcli\tests;
 
-class OptionsTest extends PHPUnit_Framework_TestCase
+class Options extends \splitbrain\phpcli\Options
+{
+
+    public $args;
+}
+
+class OptionsTest extends \PHPUnit_Framework_TestCase
 {
 
     function test_simpleshort()
diff --git a/tests/TableFormatterTest.php b/tests/TableFormatterTest.php
@@ -76,27 +76,19 @@ public function test_calc($input, $expect, $max = 100, $border = ' ')
 
     }
 
-    /**
-     * check that color codes are not used when calculating string lengths
-     */
-    public function test_strlen()
-    {
-        $tf = new TableFormatter();
-        $this->assertEquals(strlen("this is red!"), $tf->strlen("this is \33[0;31mred\33[0m!"));
-    }
-
     /**
      * Check wrapping
      */
-    public function test_wrap() {
-        $text = "this is a long string something\n".
-                "123456789012345678901234567890";
-
-        $expt = "this is a long\n".
-                "string\n".
-                "something\n".
-                "123456789012345\n".
-                "678901234567890";
+    public function test_wrap()
+    {
+        $text = "this is a long string something\n" .
+            "123456789012345678901234567890";
+
+        $expt = "this is a long\n" .
+            "string\n" .
+            "something\n" .
+            "123456789012345\n" .
+            "678901234567890";
 
         $tf = new TableFormatter();
         $this->assertEquals($expt, $tf->wordwrap($text, 15, "\n", true));

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ protected function setup(Options $options)`
`27`	`27`	`$options->registerOption('someflag', 'This is a flag only valid for the foo command', 's', false, 'foo');`
`28`	`28`	`$options->registerArgument('file', 'This argument is only required for the foo command', true, 'foo');`
`29`	`29`
`30`		`- $options->registerOption('load', 'Another flag only for the bar command, requiring an argument', 'l', 'input', 'bar');`
	`30`	`+ $options->registerOption('load', 'Another flag only for the bar command, requiring an argument', 'l', 'input',`
	`31`	`+ 'bar');`
`31`	`32`
`32`	`33`	`}`
`33`	`34`
`@@ -56,7 +57,7 @@ protected function main(Options $options)`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`$this->info('$options->getArgs():');`
`59`		`- var_dump($options->getArgs());`
	`60`	`+ var_dump($options->getArgs());`
`60`	`61`
`61`	`62`	`}`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ protected function main(Options $options)`
`44`	`44`	`$this->info("file was given as " . $options->getOpt('file'));`
`45`	`45`	`}`
`46`	`46`
`47`		`- $this->info("Number of arguments: ".count($options->getArgs()));`
`48`		`-`
	`47`	`+ $this->info("Number of arguments: " . count($options->getArgs()));`
	`48`	`+`
`49`	`49`	`$this->success("main finished");`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ abstract class CLI`
`25`	`25`	`*`
`26`	`26`	`* @param bool $autocatch should exceptions be catched and handled automatically?`
`27`	`27`	`*/`
`28`		`- public function __construct($autocatch=true)`
	`28`	`+ public function __construct($autocatch = true)`
`29`	`29`	`{`
`30`		`- if($autocatch) {`
	`30`	`+ if ($autocatch) {`
`31`	`31`	`set_exception_handler(array($this, 'fatal'));`
`32`	`32`	`}`
`33`	`33`