From 5bc65513eb538a4a497da381b71ba9624e2134fd Mon Sep 17 00:00:00 2001
From: Anton Grebnev <anton.grebnev@netmonsters.ru>
Date: Fri, 5 Oct 2012 19:39:23 +0400
Subject: [PATCH] modified CliController to use ErrorStream conf var and
 separate logging by LOGGING/PROFILER settings

---
 app/CliController.php           | 17 ++++++++++----
 tests/app/CliControllerTest.php | 51 ++++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/app/CliController.php b/app/CliController.php
index 2e2c1b8..480c81b 100644
--- a/app/CliController.php
+++ b/app/CliController.php
@@ -24,7 +24,7 @@ class CliController
     protected function __construct()
     {
         ErrorHandler::init();
-        $this->error_stream = fopen('php://stderr', 'rw');
+        $this->error_stream = Config::get('ErrorStream');
     }
 
     /**
@@ -51,11 +51,20 @@ class CliController
             }
             $cli_class->run();
             if (Config::get('PROFILER')) {
-                echo PHP_EOL . Profiler::getInstance()->getCli();
+                $profile = Profiler::getInstance()->getCli();
+                if (Config::get('LOGGING')) {
+                    Logger::getInstance()->log($profile);
+                } else {
+                    echo $profile;
+                }
             }
         } catch (Exception $e) {
-            fwrite($this->error_stream, PHP_EOL . 'Error: ' . $e->getMessage() . PHP_EOL);
-            fwrite($this->error_stream, PHP_EOL . 'Stack trace: ' . PHP_EOL . $e->getTraceAsString() . PHP_EOL);
+            $code = $e->getCode();
+            if ($e instanceof ErrorException) {
+                $code = $e->getSeverity();
+            }
+            file_put_contents($this->error_stream, PHP_EOL . 'Error ' . '#' . $code . ': ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
+            file_put_contents($this->error_stream, PHP_EOL . 'Stack trace: ' . PHP_EOL . $e->getTraceAsString() . PHP_EOL, FILE_APPEND);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/app/CliControllerTest.php b/tests/app/CliControllerTest.php
index 231c3f4..7e6f719 100644
--- a/tests/app/CliControllerTest.php
+++ b/tests/app/CliControllerTest.php
@@ -36,8 +36,8 @@ class CliControllerTest extends PHPUnit_Framework_TestCase
         Config::set('PROFILER', false);
         $cli_class = $this->getMockForAbstractClass('iCli', array(), '', '', '', '', array('run'));
         $cli_class->expects($this->once())
-            ->method('run')
-            ->with();
+                ->method('run')
+                ->with();
         CliController::getInstance()->execute($cli_class);
     }
 
@@ -47,8 +47,8 @@ class CliControllerTest extends PHPUnit_Framework_TestCase
         Config::set('PROFILER', true);
         $cli_class = $this->getMockForAbstractClass('iCli', array(), '', '', '', '', array('run'));
         $cli_class->expects($this->once())
-            ->method('run')
-            ->with();
+                ->method('run')
+                ->with();
         CliController::getInstance()->execute($cli_class);
         $output = ob_get_clean();
         $this->assertContains('Elapsed time:', $output);
@@ -57,38 +57,41 @@ class CliControllerTest extends PHPUnit_Framework_TestCase
     /**
      * @runInSeparateProcess
      */
-    public function testExecuteImplementError()
+    public function testExecuteImplementErrorToFile()
     {
+        Config::set('ErrorStream', __DIR__ . '/temp.txt');
+        touch(Config::get('ErrorStream'));
         $cli_class = new StdClass();
-        $cli_controller = CliController::getInstance();
-        $error_stream_prop = new ReflectionProperty($cli_controller, 'error_stream');
-        $this->stream = fopen('php://memory', 'rw');
-        $error_stream_prop->setAccessible(true);
-        $error_stream_prop->setValue($cli_controller, $this->stream);
-        $cli_controller->execute($cli_class);
-        rewind($this->stream);
-        $this->assertContains('Runner "' . get_class($cli_class) . '" need implement of "iCli" interface.', stream_get_contents($this->stream));
+        CliController::getInstance()->execute($cli_class);
+        $this->assertContains('Runner "' . get_class($cli_class) . '" need implement of "iCli" interface.', file_get_contents(Config::get('ErrorStream')));
+        unlink(Config::get('ErrorStream'));
     }
 
     /**
      * @runInSeparateProcess
      */
+    public function testExecuteImplementErrorToConsole()
+    {
+        Config::set('ErrorStream', 'php://output');
+        $cli_class = new StdClass();
+        $this->expectOutputRegex('/.*Runner "' . get_class($cli_class) . '" need implement of "iCli" interface\..*/');
+        CliController::getInstance()->execute($cli_class);
+    }
+    /**
+     * @runInSeparateProcess
+     */
     public function testExecuteWithRunThrowError()
     {
+        Config::set('ErrorStream', 'php://output');
         Config::set('PROFILER', false);
         $cli_class = $this->getMockForAbstractClass('iCli', array(), '', '', '', '', array('run'));
         $cli_class->expects($this->once())
-            ->method('run')
-            ->with()
-            ->will($this->returnCallback(array($this, 'callbackWithThrow')));
-        $cli_controller = CliController::getInstance();
-        $error_stream_prop = new ReflectionProperty($cli_controller, 'error_stream');
-        $this->stream = fopen('php://memory', 'rw');
-        $error_stream_prop->setAccessible(true);
-        $error_stream_prop->setValue($cli_controller, $this->stream);
-        $cli_controller->execute($cli_class);
-        rewind($this->stream);
-        $this->assertContains('Error from callback.', stream_get_contents($this->stream));
+                ->method('run')
+                ->with()
+                ->will($this->returnCallback(array($this, 'callbackWithThrow')));
+        
+        $this->expectOutputRegex('/.*Error from callback\..*/');
+        CliController::getInstance()->execute($cli_class);
     }
 
     public function callbackWithThrow()