Merge pull request #661 from pomaxa/isset

fix CubeHandler http connection and few small updates

src/Monolog/Formatter/ChromePHPFormatter.php

@@ -41,10 +41,9 @@ class ChromePHPFormatter implements FormatterInterface
     {
         // Retrieve the line and file if set and remove them from the formatted extra
         $backtrace = 'unknown';
-        if (isset($record['extra']['file']) && isset($record['extra']['line'])) {
+        if (isset($record['extra']['file'], $record['extra']['line'])) {
             $backtrace = $record['extra']['file'].' : '.$record['extra']['line'];
-            unset($record['extra']['file']);
-            unset($record['extra']['line']);
+            unset($record['extra']['file'], $record['extra']['line']);
         }
 
         $message = array('message' => $record['message']);

src/Monolog/Handler/CubeHandler.php

@@ -21,11 +21,11 @@ use Monolog\Logger;
  */
 class CubeHandler extends AbstractProcessingHandler
 {
-    private $udpConnection = null;
-    private $httpConnection = null;
-    private $scheme = null;
-    private $host = null;
-    private $port = null;
+    private $udpConnection;
+    private $httpConnection;
+    private $scheme;
+    private $host;
+    private $port;
     private $acceptedSchemes = array('http', 'udp');
 
     /**
@@ -39,7 +39,7 @@ class CubeHandler extends AbstractProcessingHandler
     {
         $urlInfos = parse_url($url);
 
-        if (!isset($urlInfos['scheme']) || !isset($urlInfos['host']) || !isset($urlInfos['port'])) {
+        if (!isset($urlInfos['scheme'], $urlInfos['host'], $urlInfos['port'])) {
             throw new \UnexpectedValueException('URL "'.$url.'" is not valid');
         }
 
@@ -60,6 +60,7 @@ class CubeHandler extends AbstractProcessingHandler
      * Establish a connection to an UDP socket
      *
      * @throws \LogicException when unable to connect to the socket
+     * @throws MissingExtensionException when there is no socket extension
      */
     protected function connectUdp()
     {
@@ -79,6 +80,7 @@ class CubeHandler extends AbstractProcessingHandler
 
     /**
      * Establish a connection to a http server
+     * @throws \LogicException when no curl extension
      */
     protected function connectHttp()
     {
@@ -144,6 +146,6 @@ class CubeHandler extends AbstractProcessingHandler
                 'Content-Length: ' . strlen('['.$data.']'))
         );
 
-        Curl\Util::execute($ch, 5, false);
+        Curl\Util::execute($this->httpConnection, 5, false);
     }
 }

src/Monolog/Handler/SlackHandler.php

@@ -79,6 +79,7 @@ class SlackHandler extends SocketHandler
      * @param bool        $bubble                 Whether the messages that are handled can bubble up the stack or not
      * @param bool        $useShortAttachment     Whether the the context/extra messages added to Slack as attachments are in a short style
      * @param bool        $includeContextAndExtra Whether the attachment should include context and extra data
+     * @throws MissingExtensionException          If no OpenSSL PHP extension configured
      */
     public function __construct($token, $channel, $username = 'Monolog', $useAttachment = true, $iconEmoji = null, $level = Logger::CRITICAL, $bubble = true, $useShortAttachment = false, $includeContextAndExtra = false)
     {