Fix Nette <3.0

janvanicek · Aug 17, 2020 · 73a3541 · 73a3541
1 parent 351bf8f
commit 73a3541
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 38 deletions.
diff --git a/composer.json b/composer.json
@@ -14,6 +14,7 @@
   ],
   "type": "library",
   "require": {
+    "php": "^7.1",
     "tracy/tracy": "~2.4",
     "nette/di": "^2.4 || ^3.0",
     "nette/security": "^2.4 || ^3.0",

diff --git a/src/DI/NetteLoggerExtension.php b/src/DI/NetteLoggerExtension.php
@@ -4,50 +4,38 @@
 
 namespace Residit\NetteLogger\DI;
 
-use Nette;
-use Nette\Schema\Expect;
 use Nette\DI\CompilerExtension;
 use Nette\PhpGenerator\ClassType;
 use Residit\NetteLogger\NetteLogger;
 
 class NetteLoggerExtension extends CompilerExtension
 {
   /**
-   * @var string $prefix
+   * @var string $extensionPrefix
    */
-  private $prefix;
-
-  /**
-   * Check configuration of extension
-   * @return Nette\Schema\Schema
-   */
-  public function getConfigSchema(): Nette\Schema\Schema
-  {
-    return Expect::structure([
-      'url' => Expect::string(),
-      'token' => Expect::string(),
-      'userData' => Expect::mixed()->nullable()
-    ]);
-  }
+  private $extensionPrefix = 'logger';
 
   /**
    * Load configuration of extension
    */
   public function loadConfiguration()
   {
-    $this->prefix = 'logger';
     $builder = $this->getContainerBuilder();
 
-    $builder->addDefinition($this->prefix($this->prefix))
+    $builder->addDefinition($this->prefix($this->extensionPrefix))
       ->setFactory(NetteLogger::class)
       ->addSetup(
         'register', []
       )->addSetup(
-        'setUrl', [$this->config->url]
-      )->addSetup(
-        'setToken', [$this->config->token]
+        'setUrl',
+        [
+          $this->config['url']
+        ]
       )->addSetup(
-        'setUserData', [$this->config->userData]
+        'setToken',
+        [
+          $this->config['token']
+        ]
       );
   }
 
@@ -63,12 +51,12 @@ public function beforeCompile()
     }
 
     if ($builder->hasDefinition('security.user')) {
-      $builder->getDefinition($this->prefix($this->prefix))
+      $builder->getDefinition($this->prefix($this->extensionPrefix))
         ->addSetup('setIdentity', [$builder->getDefinition('security.user')]);
     }
 
     if ($builder->hasDefinition('session.session')) {
-      $builder->getDefinition($this->prefix($this->prefix))
+      $builder->getDefinition($this->prefix($this->extensionPrefix))
         ->addSetup('setSession', [$builder->getDefinition('session.session')]);
     }
   }
@@ -80,6 +68,6 @@ public function beforeCompile()
   public function afterCompile(ClassType $class)
   {
     $class->getMethod('initialize')
-      ->addBody('Tracy\Debugger::setLogger($this->getService(?));', [$this->prefix($this->prefix)]);
+      ->addBody('Tracy\Debugger::setLogger($this->getService(?));', [$this->prefix($this->extensionPrefix)]);
   }
 }
diff --git a/src/NetteLogger.php b/src/NetteLogger.php
@@ -59,11 +59,6 @@ public function setToken(string $token)
     $this->token = $token;
   }
 
-  public function setUserData(array $userData)
-  {
-    $this->userData = $userData;
-  }
-
   /**
    * Init logging directory
    */
@@ -83,15 +78,11 @@ public function register()
   public function log($value, $priority = ILogger::INFO)
   {
     $response = parent::log($value, $priority);
-    $userData = null;
+    $userId = null;
     $sessionData = null;
 
     if ($this->identity) {
-      $userData = ['id' => $this->identity->getId()];
-
-      foreach ($this->userData as $name) {
-        $userData[$name] = $this->identity->{$name} ?? null;
-      }
+      $userId = $this->identity->getId();
     }
 
     if ($this->session) {
@@ -111,7 +102,7 @@ public function log($value, $priority = ILogger::INFO)
       'trace' => Json::encode($value->getTrace()),
       'line' => $value->getLine(),
       'session' => Json::encode($sessionData),
-      'user' => Json::encode($userData),
+      'userId' => $userId,
       'html' => $htmlWithoutScriptTags,
     );