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;
     }
 
     /**
@@ -144,7 +144,7 @@ 
     public function setFormat(string $format): void
     {
         // store log format update IP pattern
-        $this->logFormat = $format ;
+        $this->logFormat = $format;
         $this->updateIpPatterns();
 
         // strtr won't work for "complex" header patterns
@@ -204,7 +204,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) {
@@ -232,11 +232,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/LogParserFactory.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public static function getParser(string $logType, string $format = null, LogEntryFactoryInterface $factory = null): ?SoftwareLogParser
     {
-        switch ($logType){
+        switch ($logType) {
 
             case self::TYPE_APACHE_ACCESS: 
                 return new \Kristuff\Parselog\Software\ApacheAccessLogParser($format, $factory); 

src/Software/SoftwareLogParser.php

Spacing +6 added lines, -6 removed lines

@@ -54,7 +54,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $knownFormats = [];
+    protected $knownFormats = [ ];
 
     /** 
      * The log files names
@@ -62,7 +62,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $files = [];
+    protected $files = [ ];
 
     /** 
      * The log files paths
@@ -70,7 +70,7 @@ 
      * @access protected
      * @var array 
      */
-    protected $paths = [];
+    protected $paths = [ ];
 
     /**
      * Constructor
@@ -121,7 +121,7 @@ 
      */
     protected function addFormat(string $name, string $format): void
     {
-        $this->knownFormats[$name] = $format;
+        $this->knownFormats[ $name ] = $format;
     }
 
     /**
@@ -146,7 +146,7 @@ 
      */
     protected function addFile(string $fileName): void
     {
-        $this->files[] = $fileName;
+        $this->files[ ] = $fileName;
     }
 
     /**
@@ -172,7 +172,7 @@ 
      */
     protected function addPath(string $path): void
     {
-        $this->paths[] = $path;
+        $this->paths[ ] = $path;
     }
 
     /**

src/Software/SyslogParser.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     {
         $this->software       = 'Syslog';
         $this->prettyName     = 'Syslog';
-      //  $this->timeFormat     = 'M j h:i:s';
+        //  $this->timeFormat     = 'M j h:i:s';
 
         $this->addFormat('default', '%t %h %s %m');
         $this->defaultFormat      = '%t %h %s %m';

Spacing +5 added lines, -5 removed lines

@@ -42,16 +42,16 @@
       //  $this->timeFormat     = 'M j h:i:s';
 
         $this->addFormat('default', '%t %h %s %m');
-        $this->defaultFormat      = '%t %h %s %m';
+        $this->defaultFormat = '%t %h %s %m';
         
         $this->addPath("/var/log/");
         $this->addFile("syslog");
         //todo
 
-        $this->addPattern('%t',  '(?P<time>(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\s\d|\d{2}) \d{2}:\d{2}:\d{2})');
-        $this->addPattern('%h',  '(?P<hostname>.+?)');
-        $this->addPattern('%s',  '(?P<service>(\S+|\[\d+\])):');
-        $this->addPattern('%m',  '(?P<message>.+)');
+        $this->addPattern('%t', '(?P<time>(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) (\s\d|\d{2}) \d{2}:\d{2}:\d{2})');
+        $this->addPattern('%h', '(?P<hostname>.+?)');
+        $this->addPattern('%s', '(?P<service>(\S+|\[\d+\])):');
+        $this->addPattern('%m', '(?P<message>.+)');
 
         parent::__construct($format, $factory);
     }

src/Software/ApacheAccessLogParser.php

Spacing +19 added lines, -19 removed lines

@@ -69,50 +69,50 @@
         $this->addFile('apache.log');
         $this->addFile('apache_access.log');
 
-        $this->addFormat('apache_common',          '%h %l %u %t \"%r\" %>s %O"');  
-        $this->addFormat('apache_combined_vhost',  '%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"'); 
-        $this->addFormat('apache_combined',        '%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"');
-        $this->addFormat('apache_common_vhost',    '%v %l %u %t \"%r\" %>s %b');
+        $this->addFormat('apache_common', '%h %l %u %t \"%r\" %>s %O"');  
+        $this->addFormat('apache_combined_vhost', '%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"'); 
+        $this->addFormat('apache_combined', '%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"');
+        $this->addFormat('apache_common_vhost', '%v %l %u %t \"%r\" %>s %b');
 
 
-        $this->addNamedPattern('%%' , 'percent', '\%');
+        $this->addNamedPattern('%%', 'percent', '\%');
 
         // time 
-        $this->addPattern('%t' , '\[(?P<time>\d{2}/(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/\d{4}:\d{2}:\d{2}:\d{2} (?:-|\+)\d{4})\]');
+        $this->addPattern('%t', '\[(?P<time>\d{2}/(?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)/\d{4}:\d{2}:\d{2}:\d{2} (?:-|\+)\d{4})\]');
         
-        $this->addNamedPattern('%v' , 'serverName',          '([a-zA-Z0-9]+)([a-z0-9.-]*)');
-        $this->addNamedPattern('%V' , 'canonicalServerName', '([a-zA-Z0-9]+)([a-z0-9.-]*)');
+        $this->addNamedPattern('%v', 'serverName', '([a-zA-Z0-9]+)([a-z0-9.-]*)');
+        $this->addNamedPattern('%V', 'canonicalServerName', '([a-zA-Z0-9]+)([a-z0-9.-]*)');
         
         // port
-        $this->addNamedPattern('%p' , 'port', '\d+');
+        $this->addNamedPattern('%p', 'port', '\d+');
 
         // Client IP address of the request
-        $this->addNamedPattern('%a',  'remoteIp', self::PATTERN_IP_ALL);
+        $this->addNamedPattern('%a', 'remoteIp', self::PATTERN_IP_ALL);
         
         // Remote hostname
-        $this->addNamedPattern('%h' , 'host', '[a-zA-Z0-9\-\._:]+'); 
+        $this->addNamedPattern('%h', 'host', '[a-zA-Z0-9\-\._:]+'); 
 
         // Local IP-address
-        $this->addNamedPattern('%A',  'localIp', self::PATTERN_IP_ALL);
+        $this->addNamedPattern('%A', 'localIp', self::PATTERN_IP_ALL);
 
         // Remote user if the request was authenticated. May be bogus if return status (%s) is 401 (unauthorized).
-        $this->addNamedPattern('%u',  'user', '(?:-|[\w\-\.]+)');
+        $this->addNamedPattern('%u', 'user', '(?:-|[\w\-\.]+)');
 
-        $this->addNamedPattern('%l', 'logname',         '(?:-|[\w-]+)');
-        $this->addNamedPattern('%m', 'requestMethod',   'OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PATCH|PROPFIND');
-        $this->addNamedPattern('%U', 'URL',             '.+?');
+        $this->addNamedPattern('%l', 'logname', '(?:-|[\w-]+)');
+        $this->addNamedPattern('%m', 'requestMethod', 'OPTIONS|GET|HEAD|POST|PUT|DELETE|TRACE|CONNECT|PATCH|PROPFIND');
+        $this->addNamedPattern('%U', 'URL', '.+?');
         $this->addNamedPattern('%H', 'requestProtocol', 'HTTP/(1\.0|1\.1|2\.0)');
-        $this->addNamedPattern('%r', 'request',         '(?:(?:[A-Z]+) .+? HTTP/(1\.0|1\.1|2\.0))|-|');
+        $this->addNamedPattern('%r', 'request', '(?:(?:[A-Z]+) .+? HTTP/(1\.0|1\.1|2\.0))|-|');
         
         // Status of the final request
         $this->addNamedPattern('%>s', 'status', '\d{3}|-');
         
         // Bytes sent, including headers. May be zero in rare cases such as when a request is aborted before a 
         // response is sent. You need to enable mod_logio to use this.
-        $this->addNamedPattern('%O', 'sentBytes',  '[0-9]+');
+        $this->addNamedPattern('%O', 'sentBytes', '[0-9]+');
     
         // Size of response in bytes, excluding HTTP headers. In CLF format, i.e. a '-' rather than a 0 when no bytes are sent.
-        $this->addNamedPattern('%b', 'responseBytes',  '(\d+|-)');
+        $this->addNamedPattern('%b', 'responseBytes', '(\d+|-)');
 
         //The time taken to serve the request, in seconds.
         $this->addNamedPattern('%T', 'requestTime', '(\d+\.?\d*)');

src/Software/Fail2BanLogParser.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         $this->addPath("/var/log/");
         $this->addFile("fail2ban.log");
 
-     // '%d' => '(?P<date>[\d \-,:]+)',
+        // '%d' => '(?P<date>[\d \-,:]+)',
         $this->addPattern('%t', '(?P<time>[\d \-:]+)(,\d+)');
         $this->addPattern('%s', '(?P<service>[\w\d\. :]+(|\s+))');
 

Spacing +2 added lines, -2 removed lines

@@ -41,8 +41,8 @@
         $this->software       = 'Fail2ban';
         $this->prettyName     = 'Fail2ban';
         $this->addFormat('default', '%t %s %p %l %m');
-        $this->defaultFormat      = '%t %s %p %l %m';
-        $this->timeFormat   = 'Y-m-d';
+        $this->defaultFormat = '%t %s %p %l %m';
+        $this->timeFormat = 'Y-m-d';
 
         $this->addPath("/var/log/");
         $this->addFile("fail2ban.log");

src/Software/ApacheErrorLogParser.php

Indentation +8 added lines, -8 removed lines

@@ -173,14 +173,14 @@
         parent::__construct($format, $factory);
     } 
 
-     /**
-     * Sets the log format  
-     * 
-     * @access public
-     * @param string    $format
-     * 
-     * @return void
-     */
+        /**
+         * Sets the log format  
+         * 
+         * @access public
+         * @param string    $format
+         * 
+         * @return void
+         */
     public function setFormat(string $format): void
     {
             parent::setFormat($format);

Spacing +15 added lines, -15 removed lines

@@ -98,7 +98,7 @@ 
         $this->defaultFormat      = self::FORMAT_DEFAULT_APACHE_2_4;
         
         // 2.2 / 2.4
-        $this->timeFormat        = 'D M d H:i:s Y';
+        $this->timeFormat = 'D M d H:i:s Y';
         //$this->timeFormat        = 'D M d H:i:s.u Y';
 
         $this->addFormat('default', self::FORMAT_DEFAULT_APACHE_2_4);  
@@ -123,7 +123,7 @@ 
         // define patterns
         // ***************
 
-        $this->addNamedPattern('%%' , 'percent', '\%');
+        $this->addNamedPattern('%%', 'percent', '\%');
                 
         // %t 	        The current time
         // %{u}t 	The current time including micro-seconds
@@ -134,29 +134,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
@@ -167,7 +167,7 @@ 
         $this->addPattern(' %F:', '( (?P<fileName>[^\*\s\|><\?]*[\/][^\*\s\|><\?]*):)?');              
 
         // %M 	The actual log message
-        $this->addNamedPattern('%M',  'message', '.+?');
+        $this->addNamedPattern('%M', 'message', '.+?');
         
         // now let default constructor
         parent::__construct($format, $factory);
@@ -186,7 +186,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';
             }
 

src/Core/RegexFactory.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     const PATTERN_IP_V4         = '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9]))';
    
     /** IPV6 full pattern */
-    const PATTERN_IP_V6_FULL    ='([0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7})'; // 1:1:1:1:1:1:1:1
+    const PATTERN_IP_V6_FULL    = '([0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7})'; // 1:1:1:1:1:1:1:1
     
     /** IPV6 null pattern */
     const PATTERN_IP_V6_NULL    = '(::)';

src/Core/LogEntryFactory.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $entry = new LogEntry();
 
         foreach (array_filter(array_keys($data), 'is_string') as $key) {
-            $entry->{$key} = trim($data[$key]);
+            $entry->{$key} = trim($data[ $key ]);
         }
 
         //if (isset($entry->time)) {