Forward port zendframework/zendframework#3826

src/Logger.php

@@ -132,11 +132,10 @@ public function __construct(array $options = null)
         }
 
         if (is_array($options)) {
+            if (isset($options['writers']) && is_array($options['writers'])) {
+                foreach ($options['writers'] as $writer) {
 
-            if(isset($options['writers']) && is_array($options['writers'])) {
-                foreach($options['writers'] as $writer) {
-
-                    if(!isset($writer['name'])) {
+                    if (!isset($writer['name'])) {
                         throw new Exception\InvalidArgumentException('Options must contain a name for the writer');
                     }
 
@@ -147,11 +146,11 @@ public function __construct(array $options = null)
                 }
             }
 
-            if(isset($options['exceptionhandler']) && $options['exceptionhandler'] === true) {
+            if (isset($options['exceptionhandler']) && $options['exceptionhandler'] === true) {
                 self::registerExceptionHandler($this);
             }
 
-            if(isset($options['errorhandler']) && $options['errorhandler'] === true) {
+            if (isset($options['errorhandler']) && $options['errorhandler'] === true) {
                 self::registerErrorHandler($this);
             }
 
@@ -410,7 +409,7 @@ public function log($priority, $message, $extra = array())
             'extra'        => $extra
         );
 
-        foreach($this->processors->toArray() as $processor) {
+        foreach ($this->processors->toArray() as $processor) {
             $event = $processor->process($event);
         }
 

src/Writer/AbstractWriter.php

@@ -77,17 +77,16 @@ public function __construct($options = null)
         }
 
         if (is_array($options)) {
-
-            if(isset($options['filters'])) {
+            if (isset($options['filters'])) {
                 $filters = $options['filters'];
-                if(is_string($filters) || $filters instanceof Filter\FilterInterface) {
+                if (is_string($filters) || $filters instanceof Filter\FilterInterface) {
                     $this->addFilter($filters);
-                } elseif(is_array($filters)) {
-                    foreach($filters as $filter) {
-                        if(is_string($filter) || $filter instanceof Filter\FilterInterface) {
+                } elseif (is_array($filters)) {
+                    foreach ($filters as $filter) {
+                        if (is_string($filter) || $filter instanceof Filter\FilterInterface) {
                             $this->addFilter($filter);
-                        } elseif(is_array($filter)) {
-                            if(!isset($filter['name'])) {
+                        } elseif (is_array($filter)) {
+                            if (!isset($filter['name'])) {
                                 throw new Exception\InvalidArgumentException('Options must contain a name for the filter');
                             }
                             $filterOptions = (isset($filter['options'])) ? $filter['options'] : null;
@@ -97,12 +96,12 @@ public function __construct($options = null)
                 }
             }
 
-            if(isset($options['formatter'])) {
+            if (isset($options['formatter'])) {
                 $formatter = $options['formatter'];
-                if(is_string($formatter) || $formatter instanceof Formatter\FormatterInterface) {
+                if (is_string($formatter) || $formatter instanceof Formatter\FormatterInterface) {
                     $this->setFormatter($formatter);
-                } elseif(is_array($formatter)) {
-                    if(!isset($formatter['name'])) {
+                } else if(is_array($formatter)) {
+                    if (!isset($formatter['name'])) {
                         throw new Exception\InvalidArgumentException('Options must contain a name for the formatter');
                     }
                     $formatterOptions = (isset($formatter['options'])) ? $formatter['options'] : null;

src/Writer/ChromePhp.php

@@ -42,7 +42,7 @@ public function __construct($instance = null)
             $instance = isset($instance['instance']) ? $instance['instance'] : null;
         }
 
-        if(!($instance instanceof ChromePhpInterface || $instance === null)) {
+        if (!($instance instanceof ChromePhpInterface || $instance === null)) {
             throw new Exception\InvalidArgumentException('You must pass a valid Zend\Log\Writer\ChromePhp\ChromePhpInterface');
         }
 

src/Writer/Mail.php

@@ -109,7 +109,7 @@ public function __construct($mail, Transport\TransportInterface $transport = nul
         }
         $this->setTransport($transport);
 
-        if($this->formatter === null) {
+        if ($this->formatter === null) {
             $this->formatter = new SimpleFormatter();
         }
     }

src/Writer/Stream.php

@@ -91,7 +91,7 @@ public function __construct($streamOrUrl, $mode = null, $logSeparator = null)
             $this->setLogSeparator($logSeparator);
         }
 
-        if($this->formatter === null) {
+        if ($this->formatter === null) {
             $this->formatter = new SimpleFormatter();
         }
     }

src/Writer/Syslog.php

@@ -108,7 +108,7 @@ public function __construct($params = null)
             $this->initializeSyslog();
         }
 
-        if($this->formatter === null) {
+        if ($this->formatter === null) {
             $this->setFormatter(new SimpleFormatter('%message%'));
         }
     }