Merge 9b42f21 into 368ea83

.travis.yml

@@ -1,4 +1,4 @@
-#v 0.1.1
+#v 0.2.0
 language: php
 
 php:

src/Core/LogEntry.php

@@ -12,7 +12,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.1.1
+ * @version    0.2.0
  * @copyright  2017-2020 Kristuff
  */
 

src/Core/LogEntryFactory.php

@@ -12,7 +12,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.1.1
+ * @version    0.2.0
  * @copyright  2017-2020 Kristuff
  */
 

src/Core/LogEntryFactoryInterface.php

@@ -12,7 +12,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.1.1
+ * @version    0.2.0
  * @copyright  2017-2020 Kristuff
  */
 

src/Core/LogEntryInterface.php

@@ -12,7 +12,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.1.1
+ * @version    0.2.0
  * @copyright  2017-2020 Kristuff
  */
 

src/FormatException.php

@@ -12,7 +12,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.1.1
+ * @version    0.2.0
  * @copyright  2017-2020 Kristuff
  */
 

src/LogParser.php

@@ -12,7 +12,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.1.1
+ * @version    0.2.0
  * @copyright  2017-2020 Kristuff
  */
 
@@ -28,30 +28,29 @@
 class LogParser
 {
     /** 
+     * @access private
      * @var string 
      */
     private $pcreFormat;
 
     /** 
+     * @access private
      * @var string
      */
     private $logFormat = '';
 
-     /** 
-     * @var array 
-     */
-    public $patterns = [];
-
-    /** 
-     * @var string
-     */
-    public $defaultFormat = '';
-
     /**
-     *  @var LogEntryFactoryInterface 
+     * @access private
+     * @var LogEntryFactoryInterface 
      */
     private $factory;
 
+    /** 
+     * @access protected
+     * @var array 
+     */
+    protected $patterns = [];
+
     /**
      * Constructor
      * 
@@ -63,9 +62,7 @@ class LogParser
      */
     public function __construct(string $format = null, LogEntryFactoryInterface $factory = null)
     {
-        $this->logFormat = $format ?? $this->defaultFormat;
-        $this->updateIpPatterns();
-        $this->setFormat($this->logFormat);
+        $this->setFormat($format ?? '');
         $this->factory = $factory ?: new LogEntryFactory();
     }
 
@@ -81,7 +78,6 @@ public function __construct(string $format = null, LogEntryFactoryInterface $fac
     public function addPattern(string $placeholder, string $pattern): void
     {
         $this->patterns[$placeholder] = $pattern;
-        $this->updateIpPatterns();
     }
 
     /**
@@ -106,6 +102,10 @@ public function getFormat(): string
      */
     public function setFormat(string $format): void
     {
+        // store log format update IP pattern
+        $this->logFormat = $format ;
+        $this->updateIpPatterns();
+
         // strtr won't work for "complex" header patterns
         // $this->pcreFormat = strtr("#^{$format}$#", $this->patterns);
         $expr = "#^{$format}$#";
@@ -131,14 +131,8 @@ public function parse(string $line): LogEntryInterface
         if (!preg_match($this->getPCRE(), $line, $matches)) {
             throw new FormatException($line);
         }
+
         return $this->factory->create($matches);
-//       $parsedLine = [];
-//       foreach (array_filter(array_keys($matches), 'is_string') as $key) {
-//           $parsedLine[$key] = trim($matches[$key]);
-//       }
-//     
-//       return $parsedLine;
-//       return array_filter(array_keys($data), 'is_string') as $key)
     }
 
     /**

src/LogParserFactory.php

@@ -0,0 +1,65 @@
+<?php declare(strict_types=1);
+
+/** 
+ *  ___                      _
+ * | _ \ __ _  _ _  ___ ___ | | ___  __ _
+ * |  _// _` || '_|(_-</ -_)| |/ _ \/ _` |
+ * |_|  \__,_||_|  /__/\___||_|\___/\__, |
+ *                                  |___/
+ * 
+ * (c) Kristuff <contact@kristuff.fr>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @version    0.2.0
+ * @copyright  2017-2020 Kristuff
+ */
+
+namespace Kristuff\Parselog;
+
+use Kristuff\Parselog\Core\LogEntryFactoryInterface;
+use Kristuff\Parselog\Software\SoftwareLogParser;
+
+/**
+ * 
+ */
+class LogParserFactory 
+{
+    const TYPE_APACHE_ACCESS    = 'apache_access';
+    const TYPE_APACHE_ERROR     = 'apache_error';
+    const TYPE_SYSLOG           = 'syslog';
+    const TYPE_FAIL2BAN         = 'fail2ban';
+
+    /** 
+     * Gets a new LogParser instance based on given logType
+     * 
+     * @access public
+     * @static
+     * @param string                    $logType        The internal log type
+     * @param string                    $format         The log format. Default is null
+     * @param LogEntryFactoryInterface  $factory        The custom log entry factory. Default is null (use default factory)       
+     * 
+     * @return \Kristuff\Parselog\LogParser|null        
+     */
+    public static function getParser(string $logType, string $format = null, LogEntryFactoryInterface $factory = null): ?SoftwareLogParser 
+    {
+        switch ($logType){
+
+            case self::TYPE_APACHE_ACCESS: 
+                return new \Kristuff\Parselog\Software\ApacheAccessLogParser($format, $factory); 
+
+            case self::TYPE_APACHE_ERROR: 
+                return new \Kristuff\Parselog\Software\ApacheErrorLogParser($format, $factory); 
+
+            case self::TYPE_SYSLOG: 
+                return new \Kristuff\Parselog\Software\SyslogParser($format, $factory); 
+
+            case self::TYPE_FAIL2BAN:
+                return new \Kristuff\Parselog\Software\Fail2BanLogParser($format, $factory); 
+
+        }
+        return null;
+    }
+
+}