CS fixes

src/Monolog/Formatter/FormatterInterface.php

@@ -24,7 +24,7 @@ interface FormatterInterface
      * @param  array $record A record to format
      * @return mixed The formatted record
      */
-    function format(array $record);
+    public function format(array $record);
 
     /**
      * Formats a set of log records.
@@ -32,5 +32,5 @@ interface FormatterInterface
      * @param  array $records A set of records to format
      * @return mixed The formatted set of records
      */
-    function formatBatch(array $records);
+    public function formatBatch(array $records);
 }

src/Monolog/Formatter/JsonFormatter.php

@@ -11,8 +11,6 @@
 
 namespace Monolog\Formatter;
 
-use Monolog\Logger;
-
 /**
  * Encodes whatever record data is passed to it as json
  *

src/Monolog/Formatter/LineFormatter.php

@@ -11,8 +11,6 @@
 
 namespace Monolog\Formatter;
 
-use Monolog\Logger;
-
 /**
  * Formats incoming records into a one-line string
  *

src/Monolog/Formatter/NormalizerFormatter.php

@@ -11,8 +11,6 @@
 
 namespace Monolog\Formatter;
 
-use Monolog\Logger;
-
 /**
  * Normalizes incoming records to remove objects/resources so it's easier to dump to various targets
  *

src/Monolog/Handler/AbstractHandler.php

@@ -87,6 +87,7 @@ abstract class AbstractHandler implements HandlerInterface
         if (!$this->processors) {
             throw new \LogicException('You tried to pop from an empty processor stack.');
         }
+
         return array_shift($this->processors);
     }
 
@@ -156,7 +157,7 @@ abstract class AbstractHandler implements HandlerInterface
     {
         try {
             $this->close();
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             // do nothing
         }
     }

src/Monolog/Handler/AbstractProcessingHandler.php

@@ -11,10 +11,6 @@
 
 namespace Monolog\Handler;
 
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-
 /**
  * Base Handler class providing the Handler structure
  *

src/Monolog/Handler/BufferHandler.php

@@ -65,7 +65,7 @@ class BufferHandler extends AbstractHandler
      */
     public function close()
     {
-        if($this->buffer) {
+        if ($this->buffer) {
             $this->handler->handleBatch($this->buffer);
             $this->buffer = array();
         }

src/Monolog/Handler/ChromePHPHandler.php

@@ -11,7 +11,6 @@
 
 namespace Monolog\Handler;
 
-use Monolog\Logger;
 use Monolog\Formatter\ChromePHPFormatter;
 
 /**
@@ -31,9 +30,9 @@ class ChromePHPHandler extends AbstractProcessingHandler
      */
     const HEADER_NAME = 'X-ChromePhp-Data';
 
-    static protected $initialized = false;
+    protected static $initialized = false;
 
-    static protected $json = array(
+    protected static $json = array(
         'version' => self::VERSION,
         'columns' => array('label', 'log', 'backtrace', 'type'),
         'rows' => array(),

src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php

@@ -24,5 +24,5 @@ interface ActivationStrategyInterface
      * @param  array   $record
      * @return Boolean
      */
-    function isHandlerActivated(array $record);
+    public function isHandlerActivated(array $record);
 }

src/Monolog/Handler/FirePHPHandler.php

@@ -11,7 +11,6 @@
 
 namespace Monolog\Handler;
 
-use Monolog\Logger;
 use Monolog\Formatter\WildfireFormatter;
 
 /**

src/Monolog/Handler/HandlerInterface.php

@@ -27,7 +27,7 @@ interface HandlerInterface
      *
      * @return Boolean
      */
-    function isHandling(array $record);
+    public function isHandling(array $record);
 
     /**
      * Handles a record.
@@ -38,40 +38,40 @@ interface HandlerInterface
      * @return Boolean True means that this handler handled the record, and that bubbling is not permitted.
      *                 False means the record was either not processed or that this handler allows bubbling.
      */
-    function handle(array $record);
+    public function handle(array $record);
 
     /**
      * Handles a set of records at once.
      *
      * @param array $records The records to handle (an array of record arrays)
      */
-    function handleBatch(array $records);
+    public function handleBatch(array $records);
 
     /**
      * Adds a processor in the stack.
      *
      * @param callable $callback
      */
-    function pushProcessor($callback);
+    public function pushProcessor($callback);
 
     /**
      * Removes the processor on top of the stack and returns it.
      *
      * @return callable
      */
-    function popProcessor();
+    public function popProcessor();
 
     /**
      * Sets the formatter.
      *
      * @param FormatterInterface $formatter
      */
-    function setFormatter(FormatterInterface $formatter);
+    public function setFormatter(FormatterInterface $formatter);
 
     /**
      * Gets the formatter.
      *
      * @return FormatterInterface
      */
-    function getFormatter();
+    public function getFormatter();
 }

src/Monolog/Handler/SyslogHandler.php

@@ -81,7 +81,7 @@ class SyslogHandler extends AbstractProcessingHandler
         // convert textual description of facility to syslog constant
         if (array_key_exists(strtolower($facility), $this->facilities)) {
             $facility = $this->facilities[strtolower($facility)];
-        } else if (!in_array($facility, array_values($this->facilities), true)) {
+        } elseif (!in_array($facility, array_values($this->facilities), true)) {
             throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given');
         }
 

src/Monolog/Logger.php

@@ -120,6 +120,7 @@ class Logger
         if (!$this->handlers) {
             throw new \LogicException('You tried to pop from an empty handler stack.');
         }
+
         return array_shift($this->handlers);
     }
 
@@ -146,6 +147,7 @@ class Logger
         if (!$this->processors) {
             throw new \LogicException('You tried to pop from an empty processor stack.');
         }
+
         return array_shift($this->processors);
     }
 

tests/Monolog/Formatter/LineFormatterTest.php

@@ -11,8 +11,6 @@
 
 namespace Monolog\Formatter;
 
-use Monolog\Logger;
-
 /**
  * @covers Monolog\Formatter\LineFormatter
  */

tests/Monolog/Formatter/NormalizerFormatterTest.php

@@ -11,8 +11,6 @@
 
 namespace Monolog\Formatter;
 
-use Monolog\Logger;
-
 /**
  * @covers Monolog\Formatter\NormalizerFormatter
  */

tests/Monolog/Functional/Handler/FirePHPHandlerTest.php

@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-spl_autoload_register(function($class)
+spl_autoload_register(function($class) {
-{
     $file = __DIR__.'/../../../../src/'.strtr($class, '\\', '/').'.php';
     if (file_exists($file)) {
         require $file;
+
         return true;
     }
 });

tests/Monolog/Handler/GelfHandlerTest.php

@@ -38,6 +38,7 @@ class GelfHandlerTest extends TestCase
     protected function getHandler($messagePublisher)
     {
         $handler = new GelfHandler($messagePublisher);
+
         return $handler;
     }
 

tests/Monolog/Handler/GelfMocks.php

@@ -16,11 +16,11 @@ use Gelf\Message;
 
 class MockMessagePublisher extends MessagePublisher
 {
-    public function publish(Message $message) {
+    public function publish(Message $message)
+    {
         $this->lastMessage = $message;
     }
 
     public $lastMessage = null;
 }
 
-

tests/Monolog/Handler/MongoDBHandlerTest.php

@@ -48,7 +48,8 @@ class MongoDBHandlerTest extends TestCase
 }
 
 if (!class_exists('Mongo')) {
-    class Mongo {
+    class Mongo
+    {
         public function selectCollection() {}
     }
 }

tests/Monolog/Handler/RotatingFileHandlerTest.php

@@ -12,7 +12,6 @@
 namespace Monolog\Handler;
 
 use Monolog\TestCase;
-use Monolog\Logger;
 
 /**
  * @covers Monolog\Handler\RotatingFileHandler

tests/Monolog/Handler/SocketHandlerTest.php

@@ -120,12 +120,12 @@ class SocketHandlerTest extends TestCase
     {
         $this->setMockHandler(array('fwrite'));
 
-        $callback = function($arg)
+        $callback = function($arg) {
-        {
             $map = array(
                 'Hello world' => 6,
                 'world' => false,
             );
+
             return $map[$arg];
         };
 
@@ -143,12 +143,12 @@ class SocketHandlerTest extends TestCase
     {
         $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
 
-        $callback = function($arg)
+        $callback = function($arg) {
-        {
             $map = array(
                 'Hello world' => 6,
                 'world' => 5,
             );
+
             return $map[$arg];
         };
 
@@ -159,7 +159,6 @@ class SocketHandlerTest extends TestCase
             ->method('streamGetMetadata')
             ->will($this->returnValue(array('timed_out' => true)));
 
-
         $this->writeRecord('Hello world');
     }
 
@@ -171,9 +170,9 @@ class SocketHandlerTest extends TestCase
         $this->setMockHandler(array('fwrite', 'streamGetMetadata'));
 
         $res = $this->res;
-        $callback = function($string) use ($res)
+        $callback = function($string) use ($res) {
-        {
             fclose($res);
+
             return strlen('Hello');
         };
 
@@ -201,12 +200,12 @@ class SocketHandlerTest extends TestCase
     {
         $this->setMockHandler(array('fwrite'));
 
-        $callback = function($arg)
+        $callback = function($arg) {
-        {
             $map = array(
                 'Hello world' => 6,
                 'world' => 5,
             );
+
             return $map[$arg];
         };
 

tests/Monolog/Handler/SyslogHandlerTest.php

@@ -11,8 +11,6 @@
 
 namespace Monolog\Handler;
 
-use Monolog\Logger;
-
 class SyslogHandlerTest extends \PHPUnit_Framework_TestCase
 {
     /**

tests/Monolog/LoggerTest.php

@@ -127,6 +127,7 @@ class LoggerTest extends \PHPUnit_Framework_TestCase
         $logger->pushHandler($handler);
         $logger->pushProcessor(function($record) {
             $record['extra']['win'] = true;
+
             return $record;
         });
         $logger->addError('test');

tests/Monolog/Processor/IntrospectionProcessorTest.php

@@ -21,6 +21,7 @@ class IntrospectionProcessorTest extends TestCase
         $processor = new IntrospectionProcessor();
         $handler = new TestHandler();
         $handler->pushProcessor($processor);
+
         return $handler;
     }
 
@@ -31,7 +32,7 @@ class IntrospectionProcessorTest extends TestCase
         $tester->test($handler, $this->getRecord());
         list($record) = $handler->getRecords();
         $this->assertEquals(__FILE__, $record['extra']['file']);
-        $this->assertEquals(57, $record['extra']['line']);
+        $this->assertEquals(58, $record['extra']['line']);
         $this->assertEquals('Acme\Tester', $record['extra']['class']);
         $this->assertEquals('test', $record['extra']['function']);
     }
@@ -42,7 +43,7 @@ class IntrospectionProcessorTest extends TestCase
         \Acme\tester($handler, $this->getRecord());
         list($record) = $handler->getRecords();
         $this->assertEquals(__FILE__, $record['extra']['file']);
-        $this->assertEquals(63, $record['extra']['line']);
+        $this->assertEquals(64, $record['extra']['line']);
         $this->assertEquals(null, $record['extra']['class']);
         $this->assertEquals('Acme\tester', $record['extra']['function']);
     }
@@ -52,7 +53,7 @@ namespace Acme;
 
 class Tester
 {
-    function test($handler, $record)
+    public function test($handler, $record)
     {
         $handler->handle($record);
     }