Resolved #5, Add PSR-3 Adapter

Author: dusta

README.md

@@ -29,7 +29,8 @@
     },
     "require": {
         "php": ">=7.0",
-        "ext-json": "*"
+        "ext-json": "*",
+        "psr/log": "^1.0"
     },
     "require-dev": {
         "dframe/database": "^1.4"
@@ -40,4 +41,4 @@
         ],
         "phpunit": "php vendor/bin/phpunit"
     }
-}
+}

composer.json

@@ -0,0 +1,96 @@
+<?php
+
+namespace Dframe\ActivityLog\Demo\Drivers;
+
+define('APP_DIR', __DIR__ . '/../');
+
+/**
+ * Dframe/ActivityLog
+ * Copyright (c) Sławomir Kaleta
+ *
+ * @license https://github.com/dusta/activityLog/blob/master/LICENCE
+ */
+class PSR3FileLog extends \Psr\Log\AbstractLogger implements \Psr\Log\LoggerInterface, \Dframe\ActivityLog\Driver
+{
+    const FILE_DB = APP_DIR . 'Logs' . DIRECTORY_SEPARATOR . 'db.txt';
+
+    public function push($loggedId, $on, $entity, $log)
+    {
+        $data = [
+            'level' => $entity['data']['level'],
+            'data' => $entity['data']['message'],
+            'context' => $entity['data']['context']
+        ];
+
+        $fp = fopen(self::FILE_DB, 'rw+');
+        if (!flock($fp, LOCK_EX)) {
+            return false;
+        }
+
+        if (filesize(self::FILE_DB) > 0) {
+            $contents = null;
+            while (!feof($fp)) {
+                $contents .= fread($fp, 8192);
+            }
+
+            $jsondecode = json_decode($contents, true);
+            $jsondecode[] = $data;
+
+            flock($fp, LOCK_UN);
+            fclose($fp);
+
+            $fp = fopen(self::FILE_DB, 'w+');
+            $result = fwrite($fp, json_encode($jsondecode));
+        } else {
+            $result = fwrite($fp, json_encode($data));
+        }
+
+        flock($fp, LOCK_UN);
+        fclose($fp);
+
+
+        return $result !== false;
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    public function log($level, $message, array $context = [])
+    {
+        $this->push(null, null, null, $message);
+    }
+
+    /**
+     * @param        $start
+     * @param        $limit
+     * @param        $whereArray
+     * @param string $order
+     * @param string $sort
+     *
+     * @return mixed
+     */
+    public function logs($start, $limit, $where, $order, $sort)
+    {
+        if (!file_exists(self::FILE_DB)) {
+            return false;
+        }
+
+        $fp = fopen(self::FILE_DB, 'r');
+
+        $contents = null;
+        while (!feof($fp)) {
+            $contents .= fread($fp, 8192);
+        }
+
+        fclose($fp);
+
+        $data = json_decode($contents, true);
+        return ['return' => true, 'data' => $data];
+    }
+}

composer.lock

@@ -17,9 +17,4 @@ public function __construct()
     {
         return $this;
     }
-
-    public function build($message)
-    {
-        return ['message' => $message];
-    }
 }

demo/app/Drivers/PSR3FileLog.php

@@ -1 +0,0 @@
-{"loggedId":"1","on":"","entity":{"entity":"Dframe\\ActivityLog\\Demo\\Entity\\Action","data":{"message":"Hello Word!"}},"log":"system","0":{"loggedId":"1","on":"","entity":{"entity":"Dframe\\ActivityLog\\Demo\\Entity\\Action","data":{"message":"Hello Word!"}},"log":"system"},"1":{"loggedId":"1","on":"","entity":{"entity":"Dframe\\ActivityLog\\Demo\\Entity\\Action","data":{"message":"Hello Word!"}},"log":"system"},"2":{"loggedId":"1","on":"","entity":{"entity":"Dframe\\ActivityLog\\Demo\\Entity\\Action","data":{"message":"Hello Word!"}},"log":"system"}}

demo/app/Entity/Action.php

@@ -8,11 +8,12 @@
  */
 
 use Dframe\ActivityLog\Activity;
+use Dframe\ActivityLog\Demo\Drivers\FileLog;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-$log = (new Activity(new \Dframe\ActivityLog\Demo\Drivers\FileLog()));
-$log->log('system')->entity(\Dframe\ActivityLog\Demo\Entity\Action::class, ['Hello Word!'])->push();
+$log = (new Activity(new FileLog()));
+$log->log('Hello Word!')->entity(\Dframe\ActivityLog\Demo\Entity\Action::class)->push();
 
 echo '<pre>';
-var_dump($log->logs(null, null, null, null, null));
+var_dump($log->logs());

demo/app/Logs/db.txt

@@ -63,7 +63,11 @@ public function loggedId($loggedId)
     public function entity($entity, $arg = null)
     {
         $class = new \ReflectionClass($entity);
-        $this->entity = call_user_func_array([new $entity, "build"], $arg);
+        if (!is_null($arg)) {
+            $this->entity = call_user_func_array([new $entity, "build"], $arg);
+        } else {
+            $this->entity = new $entity;
+        }
         $this->entityType = $class->getName();
         return $this;
     }
@@ -133,8 +137,9 @@ public function logs($where = [], $order = 'id', $sort = 'DESC', $limit = 30, $s
             foreach ($logs['data'] as $key => $value) {
                 if (isset($value['log_type'])) {
                     $explode = explode(".", $value['log_type']);
-                    $table = $explode[0];
+
                     $entity = new $value['log_entity'];
+                    $table = $explode[0];
                     $columns = $entity->interpreter($explode[0]);
 
                     $logs['data'][$key]['table'] = $this->driver->readTypes($table, $columns, [$explode['1'] => $value['changed_id']])['data'];

demo/web/index.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Dframe\ActivityLog\Entity;
+
+/**
+ * Dframe/ActivityLog
+ * Copyright (c) Sławomir Kaleta
+ *
+ * @license https://github.com/dusta/activityLog/blob/master/LICENCE
+ */
+class PSR3
+{
+    /**
+     * Action constructor.
+     */
+    public function __construct()
+    {
+        return $this;
+    }
+
+    public function build($level, $message, array $context = [])
+    {
+        return [
+            'level' => $level,
+            'message' => $this->interpolate($message, $context),
+            'context' => $context
+        ];
+
+    }
+
+    public function interpolate($message, array $context = [])
+    {
+        // build a replacement array with braces around the context keys
+        $replace = [];
+        foreach ($context as $key => $val) {
+            // check that the value can be casted to string
+            if (!is_array($val) && (!is_object($val) || method_exists($val, '__toString'))) {
+                $replace['{' . $key . '}'] = $val;
+            }
+        }
+
+        // interpolate replacement values into the message and return
+        return strtr($message, $replace);
+    }
+}

src/Activity.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Dframe\ActivityLog\Helper;
+
+/**
+ * Class Psr16Adapter
+ *
+ * @package phpFastCache\Helper
+ */
+class Psr3Adapter extends \Psr\Log\AbstractLogger implements \Psr\Log\LoggerInterface
+{
+
+    /**
+     * Psr3Adapter constructor.
+     *
+     * @param \Dframe\ActivityLog\Activity $log
+     * @param                              $communique
+     * @param                              $entity
+     */
+    public function __construct(\Dframe\ActivityLog\Activity $log, $communique, $entity)
+    {
+        $this->log = $log;
+        $this->communique = $communique;
+        $this->entity = $entity;
+
+    }
+
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
+     *
+     * @return void
+     */
+    function log($level, $message, array $context = [])
+    {
+
+        $this->log->log($this->communique)->entity($this->entity, [
+            'level' => $level,
+            'message' => $message,
+            'context' => $context
+        ])->push();
+
+    }
+
+
+}