kristuff / parselog

src/LogParser.php

Spacing +12 added lines, -12 removed lines

@@ -51,7 +51,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $patterns = [];
+    protected $patterns = [ ];
    
     /** 
      * The time format 
@@ -91,7 +91,7 @@ 
     public function addNamedPattern(string $placeholder, string $propertyName, string $pattern, bool $required = true): void
     {
         // First field must be a required field
-        if ($required === false && count($this->patterns) === 0){
+        if ($required === false && count($this->patterns) === 0) {
             throw new \Kristuff\Parselog\InvalidArgumentException(
                 "Invalid value 'false' for argument 'required' given: First pattern must be a required pattern.");
         }
@@ -100,8 +100,8 @@ 
         // Adjust pattern for nullable columns and add space before placeholder
         // - $format = '%t %l %P %E: %a %M';
         // + $format = '%t %l( %P)?( %E:)?(%a)? %M';
-        $key = $required ? $placeholder :  ' ' . $placeholder ; 
-        $val = '(?P<'. $propertyName . '>' . ($required ? $pattern : '( ' . $pattern . ')?') . ')'; 
+        $key = $required ? $placeholder : ' '.$placeholder; 
+        $val = '(?P<'.$propertyName.'>'.($required ? $pattern : '( '.$pattern.')?').')'; 
 
         $this->addPattern($key, $val);
     }
@@ -118,7 +118,7 @@ 
      */
     public function addPattern(string $placeholder, string $pattern): void
     {
-        $this->patterns[$placeholder] = $pattern;
+        $this->patterns[ $placeholder ] = $pattern;
     }
 
     /**
@@ -148,7 +148,7 @@ 
         $format = str_replace("\\", '', $format);
 
         // store log format update IP pattern
-        $this->logFormat = $format ;
+        $this->logFormat = $format;
         $this->updateIpPatterns();
 
         // strtr won't work for "complex" header patterns
@@ -208,7 +208,7 @@ 
     protected function getTimestamp($time): ?int
     {
         // try to get stamp from string
-        if (isset($this->timeFormat)){
+        if (isset($this->timeFormat)) {
             $dateTime = DateTime::createFromFormat($this->timeFormat, $time);
 
             if (false !== $dateTime) {
@@ -236,11 +236,11 @@ 
         // Set IPv4 & IPv6 recognition patterns 
         $ipPatterns = implode('|', [
             'ipv4'          => self::PATTERN_IP_V4,
-            'ipv6full'      => self::PATTERN_IP_V6_FULL,        // 1:1:1:1:1:1:1:1
-            'ipv6null'      => self::PATTERN_IP_V6_NULL,        // ::
-            'ipv6leading'   => self::PATTERN_IP_V6_LEADING,     // ::1:1:1:1:1:1:1
-            'ipv6mid'       => self::PATTERN_IP_V6_MID,         // 1:1:1::1:1:1
-            'ipv6trailing'  => self::PATTERN_IP_V6_TRAILING,    // 1:1:1:1:1:1:1::
+            'ipv6full'      => self::PATTERN_IP_V6_FULL, // 1:1:1:1:1:1:1:1
+            'ipv6null'      => self::PATTERN_IP_V6_NULL, // ::
+            'ipv6leading'   => self::PATTERN_IP_V6_LEADING, // ::1:1:1:1:1:1:1
+            'ipv6mid'       => self::PATTERN_IP_V6_MID, // 1:1:1::1:1:1
+            'ipv6trailing'  => self::PATTERN_IP_V6_TRAILING, // 1:1:1:1:1:1:1::
         ]);
 
         foreach ($this->patterns as &$value) {

src/Software/ApacheErrorLogParser.php

Spacing +31 added lines, -31 removed lines

@@ -154,23 +154,23 @@ 
         // set 2.2 format by default. Will be changed to 2.4 format, ie:
         // $this->timeFormat        = 'D M d H:i:s.u Y';
         // , if the format contain %{u} insted of %t  
-        $this->timeFormat        = 'D M d H:i:s Y';
+        $this->timeFormat = 'D M d H:i:s Y';
 
-        $this->addFormat('default',                         self::FORMAT_APACHE_2_4_DEFAULT);  
-        $this->addFormat('apache2.2 default',               self::FORMAT_APACHE_2_2_DEFAULT);  
-        $this->addFormat('apache2.2 extented',              self::FORMAT_APACHE_2_2_EXTENDED);  
-        $this->addFormat('apache2.2 referer',               self::FORMAT_APACHE_2_2_REFERER);  
-        $this->addFormat('apache2.2 extented referer',      self::FORMAT_APACHE_2_2_EXTENDED_REFERER);  
-        $this->addFormat('apache2.4 default',               self::FORMAT_APACHE_2_4_DEFAULT);  
-        $this->addFormat('apache2.4 extented',              self::FORMAT_APACHE_2_4_EXTENDED);  
-        $this->addFormat('apache2.4 referer',               self::FORMAT_APACHE_2_4_REFEFER);  
-        $this->addFormat('apache2.4 extented referer',      self::FORMAT_APACHE_2_4_EXTENDED_REFERER);  
-        $this->addFormat('apache2.4 npm',                   self::FORMAT_APACHE_2_4_MPM);  
-        $this->addFormat('apache2.4 npm extented',          self::FORMAT_APACHE_2_4_MPM_EXTENDED);  
-        $this->addFormat('apache2.4 npm referer',           self::FORMAT_APACHE_2_4_MPM_REFERER);  
+        $this->addFormat('default', self::FORMAT_APACHE_2_4_DEFAULT);  
+        $this->addFormat('apache2.2 default', self::FORMAT_APACHE_2_2_DEFAULT);  
+        $this->addFormat('apache2.2 extented', self::FORMAT_APACHE_2_2_EXTENDED);  
+        $this->addFormat('apache2.2 referer', self::FORMAT_APACHE_2_2_REFERER);  
+        $this->addFormat('apache2.2 extented referer', self::FORMAT_APACHE_2_2_EXTENDED_REFERER);  
+        $this->addFormat('apache2.4 default', self::FORMAT_APACHE_2_4_DEFAULT);  
+        $this->addFormat('apache2.4 extented', self::FORMAT_APACHE_2_4_EXTENDED);  
+        $this->addFormat('apache2.4 referer', self::FORMAT_APACHE_2_4_REFEFER);  
+        $this->addFormat('apache2.4 extented referer', self::FORMAT_APACHE_2_4_EXTENDED_REFERER);  
+        $this->addFormat('apache2.4 npm', self::FORMAT_APACHE_2_4_MPM);  
+        $this->addFormat('apache2.4 npm extented', self::FORMAT_APACHE_2_4_MPM_EXTENDED);  
+        $this->addFormat('apache2.4 npm referer', self::FORMAT_APACHE_2_4_MPM_REFERER);  
         $this->addFormat('apache2.4 npm extented referer ', self::FORMAT_APACHE_2_4_MPM_EXTENDED_REFERER);  
-        $this->addFormat('apache2.4 npm tid',               self::FORMAT_APACHE_2_4_MPM_TID);  
-        $this->addFormat('apache2.4 npm tid referer',       self::FORMAT_APACHE_2_4_MPM_TID_REFERER);  
+        $this->addFormat('apache2.4 npm tid', self::FORMAT_APACHE_2_4_MPM_TID);  
+        $this->addFormat('apache2.4 npm tid referer', self::FORMAT_APACHE_2_4_MPM_TID_REFERER);  
 
         $this->addPath("/var/log/");
         $this->addPath("/var/log/apache/");
@@ -192,7 +192,7 @@ 
         // define patterns
         // ***************
 
-        $this->addNamedPattern('%%' , 'percent', '\%');
+        $this->addNamedPattern('%%', 'percent', '\%');
                 
         // %t 	        The current time
         // %{u}t 	The current time including micro-seconds
@@ -203,29 +203,29 @@ 
         
         // %a 	Client IP address and port of the request (port is not registered by parser). 
         //      That column may be missing depending of error
-        $clientIpPattern = '( \[client (?P<remoteIp>' . self::PATTERN_IP_ALL . ')(:[\d]+|)?\])?';
-        $this->addPattern(' \[client %a\]' , $clientIpPattern);
-        $this->addPattern(' \[%a\]' ,  $clientIpPattern);
-        $this->addPattern(' %a' , $clientIpPattern);
+        $clientIpPattern = '( \[client (?P<remoteIp>'.self::PATTERN_IP_ALL.')(:[\d]+|)?\])?';
+        $this->addPattern(' \[client %a\]', $clientIpPattern);
+        $this->addPattern(' \[%a\]', $clientIpPattern);
+        $this->addPattern(' %a', $clientIpPattern);
 
         // %A 	Local IP-address and port
         //      That column may be missing depending of error
-        $this->addNamedPattern('%A',  'localIP', self::PATTERN_IP_ALL, false);
+        $this->addNamedPattern('%A', 'localIP', self::PATTERN_IP_ALL, false);
         
         // %m 	Name of the module logging the message
         // %l 	Loglevel of the message
-        $this->addPattern('\[%m:%l\]',  '\[(?<module>.+?)?:(?P<level>[\w]+)\]');
+        $this->addPattern('\[%m:%l\]', '\[(?<module>.+?)?:(?P<level>[\w]+)\]');
         $this->addPattern('\[%-m:%l\]', '\[(?<module>.+?)?:(?P<level>[\w]+)\]');
-        $this->addPattern('\[%l\]',     '\[(?P<level>[\w:]+)\]');
-        $this->addPattern('%l',         '\[(?P<level>[\w:]+)\]');
+        $this->addPattern('\[%l\]', '\[(?P<level>[\w:]+)\]');
+        $this->addPattern('%l', '\[(?P<level>[\w:]+)\]');
 
         // %P 	Process ID of current process (since apache 2.4?)
         // %T 	Thread ID of current thread
         $this->addPattern('\[pid %P:tid %T\]', '\[pid (?P<pid>\d+):tid (?P<tid>\d+)\]'); 
-        $this->addPattern('%P %T',             '\[pid (?P<pid>\d+):tid (?P<tid>\d+)\]');
+        $this->addPattern('%P %T', '\[pid (?P<pid>\d+):tid (?P<tid>\d+)\]');
         $this->addPattern('\[pid %P\]', '\[pid (?P<pid>\d+)\]');
-        $this->addPattern('\[%P\]',     '\[pid (?P<pid>\d+)\]');   
-        $this->addPattern('%P',         '\[pid (?P<pid>\d+)\]');
+        $this->addPattern('\[%P\]', '\[pid (?P<pid>\d+)\]');   
+        $this->addPattern('%P', '\[pid (?P<pid>\d+)\]');
         
         // %E 	APR/OS error status code and string
         //      That column may be missing depending of error
@@ -236,11 +236,11 @@ 
         $this->addPattern(' %F:', '( (?P<fileName>[^ ]+\([\d]+\)):)?');              
 
         // %M 	The actual log message
-        $this->addNamedPattern('%M',  'message', '.+?');
+        $this->addNamedPattern('%M', 'message', '.+?');
 
         // referer (may be empty)
-        $this->addPattern(' , referer %{Referer}i',   '(, referer: (?P<referer>[^ ]+))?');
-        $this->addPattern(', referer %{Referer}i',    '(, referer: (?P<referer>[^ ]+))?');
+        $this->addPattern(' , referer %{Referer}i', '(, referer: (?P<referer>[^ ]+))?');
+        $this->addPattern(', referer %{Referer}i', '(, referer: (?P<referer>[^ ]+))?');
 
         // now let default constructor
         parent::__construct($format, $factory);
@@ -259,7 +259,7 @@ 
         parent::setFormat($format);
 
         // set the correct time format
-        if (strpos($this->logFormat, '%{u}t') !== false){
+        if (strpos($this->logFormat, '%{u}t') !== false) {
             $this->timeFormat = 'D M d H:i:s.u Y';
         }
     }