Merge branch 'cs/psr-2' of https://github.com/Maks3w/zf2

zendframework · Jul 13, 2012 · dbb18b2 · dbb18b2
commit dbb18b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/Writer/Syslog.php b/src/Writer/Syslog.php
@@ -171,7 +171,7 @@ public function setFacility($facility)
 
         if (!in_array($facility, $this->validFacilities)) {
             throw new Exception\InvalidArgumentException(
-            	'Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values'
+                'Invalid log facility provided; please see http://php.net/openlog for a list of valid facility values'
             );
         }
 

diff --git a/test/Formatter/SimpleTest.php b/test/Formatter/SimpleTest.php
@@ -43,7 +43,7 @@ public function testDefaultFormat()
         $this->assertContains((string)$fields['priority'], $line);
     }
 
-    function testComplexValues()
+    public function testComplexValues()
     {
         $fields = array('timestamp'    => 0,
                         'priority'     => 42,
@@ -90,15 +90,15 @@ function testComplexValues()
      */
     public function testDefaultFormatShouldDisplayExtraInformations()
     {
-    	$message = 'custom message';
-    	$exception = new \RuntimeException($message);
-    	$event = array(
-    	    'timestamp'    => date('c'),
-    	    'message'      => 'Application error',
-    	    'priority'     => 2,
-    	    'priorityName' => 'CRIT',
-    	    'info'         => $exception,
-    	);
+        $message = 'custom message';
+        $exception = new \RuntimeException($message);
+        $event = array(
+            'timestamp'    => date('c'),
+            'message'      => 'Application error',
+            'priority'     => 2,
+            'priorityName' => 'CRIT',
+            'info'         => $exception,
+        );
 
         $formatter = new Simple();
         $output = $formatter->format($event);

diff --git a/test/Writer/DbTest.php b/test/Writer/DbTest.php
@@ -186,7 +186,7 @@ public function testShutdownRemovesReferenceToDatabaseInstance()
      */
     public function testThrowStrictSetFormatter()
     {
-    	$this->setExpectedException('PHPUnit_Framework_Error');
+        $this->setExpectedException('PHPUnit_Framework_Error');
         $this->writer->setFormatter(new \StdClass());
     }
 }