diff --git a/src/Monolog/Formatter/JsonFormatter.php b/src/Monolog/Formatter/JsonFormatter.php
index a0a73094..7963dbf1 100644
--- a/src/Monolog/Formatter/JsonFormatter.php
+++ b/src/Monolog/Formatter/JsonFormatter.php
@@ -22,7 +22,7 @@ class JsonFormatter implements FormatterInterface
 {
     const BATCH_MODE_JSON = 1;
     const BATCH_MODE_NEWLINES = 2;
-    
+
     protected $batchMode;
     protected $appendNewline;
 
diff --git a/src/Monolog/Handler/LogEntriesHandler.php b/src/Monolog/Handler/LogEntriesHandler.php
index 18b3fa4f..8bf388b3 100644
--- a/src/Monolog/Handler/LogEntriesHandler.php
+++ b/src/Monolog/Handler/LogEntriesHandler.php
@@ -18,7 +18,6 @@ use Monolog\Logger;
  */
 class LogEntriesHandler extends SocketHandler
 {
-
     /**
      * @var string
      */
@@ -53,5 +52,4 @@ class LogEntriesHandler extends SocketHandler
     {
         return $this->logToken . ' ' . $record['formatted'];
     }
-
 }
diff --git a/src/Monolog/Handler/MissingExtensionException.php b/src/Monolog/Handler/MissingExtensionException.php
index 0cb21cd2..4724a7e2 100644
--- a/src/Monolog/Handler/MissingExtensionException.php
+++ b/src/Monolog/Handler/MissingExtensionException.php
@@ -18,5 +18,4 @@ namespace Monolog\Handler;
  */
 class MissingExtensionException extends \Exception
 {
-
 }
diff --git a/src/Monolog/Handler/SocketHandler.php b/src/Monolog/Handler/SocketHandler.php
index 2b4d6d62..ee486f69 100644
--- a/src/Monolog/Handler/SocketHandler.php
+++ b/src/Monolog/Handler/SocketHandler.php
@@ -281,5 +281,4 @@ class SocketHandler extends AbstractProcessingHandler
             throw new \RuntimeException("End-of-file reached, probably we got disconnected (sent $sent of $length)");
         }
     }
-
 }
diff --git a/src/Monolog/Handler/WhatFailureGroupHandler.php b/src/Monolog/Handler/WhatFailureGroupHandler.php
index 187b3441..05a88173 100644
--- a/src/Monolog/Handler/WhatFailureGroupHandler.php
+++ b/src/Monolog/Handler/WhatFailureGroupHandler.php
@@ -12,7 +12,7 @@
 namespace Monolog\Handler;
 
 /**
- * Forwards records to multiple handlers suppressing failures of each handler 
+ * Forwards records to multiple handlers suppressing failures of each handler
  * and continuing through to give every handler a chance to succeed.
  *
  * @author Craig D'Amelio <craig@damelio.ca>
diff --git a/src/Monolog/Processor/MemoryProcessor.php b/src/Monolog/Processor/MemoryProcessor.php
index 7e53f470..0820def4 100644
--- a/src/Monolog/Processor/MemoryProcessor.php
+++ b/src/Monolog/Processor/MemoryProcessor.php
@@ -60,5 +60,4 @@ abstract class MemoryProcessor
 
         return $bytes . ' B';
     }
-
 }
diff --git a/src/Monolog/Processor/WebProcessor.php b/src/Monolog/Processor/WebProcessor.php
index 522c892a..21f22a6e 100644
--- a/src/Monolog/Processor/WebProcessor.php
+++ b/src/Monolog/Processor/WebProcessor.php
@@ -41,7 +41,7 @@ class WebProcessor
     public function __construct($serverData = null, array $extraFields = null)
     {
         if (null === $serverData) {
-            $this->serverData =& $_SERVER;
+            $this->serverData = &$_SERVER;
         } elseif (is_array($serverData) || $serverData instanceof \ArrayAccess) {
             $this->serverData = $serverData;
         } else {
diff --git a/tests/Monolog/Formatter/GelfMessageFormatterTest.php b/tests/Monolog/Formatter/GelfMessageFormatterTest.php
index d47ba91c..3f47a09a 100644
--- a/tests/Monolog/Formatter/GelfMessageFormatterTest.php
+++ b/tests/Monolog/Formatter/GelfMessageFormatterTest.php
@@ -115,7 +115,6 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertArrayHasKey('_CTXfrom', $message_array);
         $this->assertEquals('logger', $message_array['_CTXfrom']);
-
     }
 
     /**
@@ -144,7 +143,6 @@ class GelfMessageFormatterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals("/some/file/in/dir.php", $message->getFile());
         $this->assertEquals("56", $message->getLine());
-
     }
 
     /**
diff --git a/tests/Monolog/Formatter/JsonFormatterTest.php b/tests/Monolog/Formatter/JsonFormatterTest.php
index d18c4763..69e20077 100644
--- a/tests/Monolog/Formatter/JsonFormatterTest.php
+++ b/tests/Monolog/Formatter/JsonFormatterTest.php
@@ -65,7 +65,6 @@ class JsonFormatterTest extends TestCase
      */
     public function testFormatBatchNewlines()
     {
-
         $formatter = new JsonFormatter(JsonFormatter::BATCH_MODE_NEWLINES);
         $records = $expected = array(
             $this->getRecord(Logger::WARNING),
diff --git a/tests/Monolog/Formatter/LogstashFormatterTest.php b/tests/Monolog/Formatter/LogstashFormatterTest.php
index 5776ab72..de4a3c2c 100644
--- a/tests/Monolog/Formatter/LogstashFormatterTest.php
+++ b/tests/Monolog/Formatter/LogstashFormatterTest.php
@@ -15,7 +15,6 @@ use Monolog\Logger;
 
 class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @covers Monolog\Formatter\LogstashFormatter::format
      */
@@ -102,7 +101,6 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertArrayHasKey('CTXfrom', $message_array);
         $this->assertEquals('logger', $message_array['CTXfrom']);
-
     }
 
     /**
@@ -239,7 +237,6 @@ class LogstashFormatterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertArrayHasKey('CTXfrom', $message);
         $this->assertEquals('logger', $message['CTXfrom']);
-
     }
 
     /**
diff --git a/tests/Monolog/Handler/BrowserConsoleHandlerTest.php b/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
index f3d8038c..ffb1d746 100644
--- a/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
+++ b/tests/Monolog/Handler/BrowserConsoleHandlerTest.php
@@ -64,7 +64,6 @@ EOF;
         $this->assertEquals($expected, $this->generateScript());
     }
 
-
     public function testAutolabel()
     {
         $handler = new BrowserConsoleHandler();
diff --git a/tests/Monolog/Handler/ErrorLogHandlerTest.php b/tests/Monolog/Handler/ErrorLogHandlerTest.php
index 951dec9d..99785cbb 100644
--- a/tests/Monolog/Handler/ErrorLogHandlerTest.php
+++ b/tests/Monolog/Handler/ErrorLogHandlerTest.php
@@ -22,7 +22,6 @@ function error_log()
 
 class ErrorLogHandlerTest extends TestCase
 {
-
     protected function setUp()
     {
         $GLOBALS['error_log'] = array();
diff --git a/tests/Monolog/Handler/FleepHookHandlerTest.php b/tests/Monolog/Handler/FleepHookHandlerTest.php
index 14a4f0d4..91cdd312 100644
--- a/tests/Monolog/Handler/FleepHookHandlerTest.php
+++ b/tests/Monolog/Handler/FleepHookHandlerTest.php
@@ -73,7 +73,6 @@ class FleepHookHandlerTest extends TestCase
         $actual = $handlerFormatter->format($record);
 
         $this->assertEquals($expected, $actual, 'Empty context and extra arrays should not be rendered');
-
     }
 
     /**
@@ -83,5 +82,4 @@ class FleepHookHandlerTest extends TestCase
     {
         $this->assertEquals('ssl://' . FleepHookHandler::FLEEP_HOST . ':443', $this->handler->getConnectionString());
     }
-
 }
diff --git a/tests/Monolog/Handler/GelfHandlerTest.php b/tests/Monolog/Handler/GelfHandlerTest.php
index 83136875..8cdd64f4 100644
--- a/tests/Monolog/Handler/GelfHandlerTest.php
+++ b/tests/Monolog/Handler/GelfHandlerTest.php
@@ -65,7 +65,6 @@ class GelfHandlerTest extends TestCase
         $handler = $this->getHandler($messagePublisher);
 
         $handler->handle($record);
-
     }
 
     public function testWarning()
@@ -114,6 +113,5 @@ class GelfHandlerTest extends TestCase
         $handler = $this->getHandler($messagePublisher);
         $handler->setFormatter(new GelfMessageFormatter('mysystem', 'EXT', 'CTX'));
         $handler->handle($record);
-
     }
 }
diff --git a/tests/Monolog/Handler/HipChatHandlerTest.php b/tests/Monolog/Handler/HipChatHandlerTest.php
index 8b9e4d44..d58386a1 100644
--- a/tests/Monolog/Handler/HipChatHandlerTest.php
+++ b/tests/Monolog/Handler/HipChatHandlerTest.php
@@ -20,7 +20,6 @@ use Monolog\Logger;
  */
 class HipChatHandlerTest extends TestCase
 {
-
     private $res;
     private $handler;
 
diff --git a/tests/Monolog/Handler/MongoDBHandlerTest.php b/tests/Monolog/Handler/MongoDBHandlerTest.php
index 7f06d666..0fdef63a 100644
--- a/tests/Monolog/Handler/MongoDBHandlerTest.php
+++ b/tests/Monolog/Handler/MongoDBHandlerTest.php
@@ -58,6 +58,8 @@ class MongoDBHandlerTest extends TestCase
 if (!class_exists('Mongo')) {
     class Mongo
     {
-        public function selectCollection() {}
+        public function selectCollection()
+        {
+        }
     }
 }
diff --git a/tests/Monolog/Handler/PushoverHandlerTest.php b/tests/Monolog/Handler/PushoverHandlerTest.php
index e048a02a..89408236 100644
--- a/tests/Monolog/Handler/PushoverHandlerTest.php
+++ b/tests/Monolog/Handler/PushoverHandlerTest.php
@@ -22,7 +22,6 @@ use Monolog\Logger;
  */
 class PushoverHandlerTest extends TestCase
 {
-
     private $res;
     private $handler;
 
diff --git a/tests/Monolog/Handler/SlackHandlerTest.php b/tests/Monolog/Handler/SlackHandlerTest.php
index de1cfbcd..591a36f9 100644
--- a/tests/Monolog/Handler/SlackHandlerTest.php
+++ b/tests/Monolog/Handler/SlackHandlerTest.php
@@ -56,7 +56,7 @@ class SlackHandlerTest extends TestCase
 
         $this->assertRegexp('/token=myToken&channel=channel1&username=Monolog&text=&attachments=.*$/', $content);
     }
-    
+
     public function testWriteContentWithEmoji()
     {
         $this->createHandler('myToken', 'channel1', 'Monolog', true, 'alien');
diff --git a/tests/Monolog/Handler/SocketHandlerTest.php b/tests/Monolog/Handler/SocketHandlerTest.php
index 3a925eb5..2e3d504a 100644
--- a/tests/Monolog/Handler/SocketHandlerTest.php
+++ b/tests/Monolog/Handler/SocketHandlerTest.php
@@ -279,5 +279,4 @@ class SocketHandlerTest extends TestCase
 
         $this->handler->setFormatter($this->getIdentityFormatter());
     }
-
 }
diff --git a/tests/Monolog/Handler/StreamHandlerTest.php b/tests/Monolog/Handler/StreamHandlerTest.php
index cd26cb1e..44d3d9f1 100644
--- a/tests/Monolog/Handler/StreamHandlerTest.php
+++ b/tests/Monolog/Handler/StreamHandlerTest.php
@@ -83,7 +83,7 @@ class StreamHandlerTest extends TestCase
             array(array('bogus://url')),
         );
     }
-    
+
     /**
      * @dataProvider invalidArgumentProvider
      * @expectedException InvalidArgumentException
@@ -93,7 +93,7 @@ class StreamHandlerTest extends TestCase
     {
         $handler = new StreamHandler($invalidArgument);
     }
-    
+
     /**
      * @expectedException UnexpectedValueException
      * @covers Monolog\Handler\StreamHandler::__construct
diff --git a/tests/Monolog/Handler/SyslogHandlerTest.php b/tests/Monolog/Handler/SyslogHandlerTest.php
index 98219ac1..8f9e46bf 100644
--- a/tests/Monolog/Handler/SyslogHandlerTest.php
+++ b/tests/Monolog/Handler/SyslogHandlerTest.php
@@ -10,6 +10,7 @@
  */
 
 namespace Monolog\Handler;
+
 use Monolog\Logger;
 
 class SyslogHandlerTest extends \PHPUnit_Framework_TestCase
diff --git a/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php b/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
index 91251bf1..8d37a1fc 100644
--- a/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
+++ b/tests/Monolog/Handler/WhatFailureGroupHandlerTest.php
@@ -90,7 +90,8 @@ class WhatFailureGroupHandlerTest extends TestCase
     /**
      * @covers Monolog\Handler\WhatFailureGroupHandler::handle
      */
-    public function testHandleException() {
+    public function testHandleException()
+    {
         $test = new TestHandler();
         $exception = new ExceptionTestHandler();
         $handler = new WhatFailureGroupHandler(array($exception, $test, $exception));
@@ -111,7 +112,8 @@ class ExceptionTestHandler extends TestHandler
     /**
      * {@inheritdoc}
      */
-    public function handle(array $record) {
+    public function handle(array $record)
+    {
         parent::handle($record);
 
         throw new \Exception("ExceptionTestHandler::handle");
diff --git a/tests/Monolog/Processor/PsrLogMessageProcessorTest.php b/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
index 595e4382..81bfbdc3 100644
--- a/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
+++ b/tests/Monolog/Processor/PsrLogMessageProcessorTest.php
@@ -11,8 +11,6 @@
 
 namespace Monolog\Processor;
 
-use Monolog\Processor\PsrLogMessageProcessor;
-
 class PsrLogMessageProcessorTest extends \PHPUnit_Framework_TestCase
 {
     /**