浏览代码

Revert "[Loggable] move configuration to Configuration class"

This reverts commit d4bce3d1b28d7b6e5ba3d9805841101ad33f7b7e.
Boussekeyt Jules 14 年之前
父节点
当前提交
90578ef4bf

+ 13 - 3
lib/Gedmo/Loggable/AbstractLoggableListener.php

@@ -20,6 +20,17 @@ use Doctrine\Common\EventArgs,
  */
 abstract class AbstractLoggableListener extends MappedEventSubscriber
 {
+    protected static $user;
+
+    /**
+     * Set the current user
+     * @param $user string
+     */
+    public static function setUser($user)
+    {
+        self::$user = $user; 
+    }
+
     /**
      * Mapps additional metadata
      *
@@ -95,10 +106,9 @@ abstract class AbstractLoggableListener extends MappedEventSubscriber
     {
         $class = $this->getObjectClass();
         $log = new $class();
-        $user = Configuration::getUser();
-
+        
         $log->setAction($action);
-        $log->setUser($user);
+        $log->setUser(self::$user);
         $log->setObject($object);
 
         $this->insertLogRecord($om, $log);

+ 0 - 27
lib/Gedmo/Loggable/Configuration.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Gedmo\Loggable;
-
-/**
- * @author Boussekeyt Jules <jules.boussekeyt@gmail.com>
- * @author Gediminas Morkevicius <gediminas.morkevicius@gmail.com>
- * @package Gedmo.Loggable
- * @subpackage Configuration
- * @link http://www.gediminasm.org
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
- */
-class Configuration
-{
-    private static $user;
-
-    public static function setUser($user)
-    {
-        self::$user = $user;
-    }
-
-    public static function getUser()
-    {
-        return self::$user;
-    }
-
-}

+ 1 - 1
tests/Gedmo/Loggable/LoggableDocumentTest.php

@@ -46,7 +46,7 @@ class LoggableDocumentTest extends \PHPUnit_Framework_TestCase
 
         $evm = new \Doctrine\Common\EventManager();
         $loggableListener = new ODM\MongoDB\LoggableListener();
-        Configuration::setUser('jules');
+        $loggableListener::setUser('jules');
         $evm->addEventSubscriber($loggableListener);
 
         if (!class_exists('Mongo')) {

+ 1 - 1
tests/Gedmo/Loggable/LoggableEntityTest.php

@@ -41,7 +41,7 @@ class LoggableEntityTest extends \PHPUnit_Framework_TestCase
 
         $evm = new \Doctrine\Common\EventManager();
         $this->LoggableListener = new ORM\LoggableListener();
-        Configuration::setUser('jules');
+        $this->LoggableListener->setUser('jules');
         $evm->addEventSubscriber($this->LoggableListener);
         $this->em = \Doctrine\ORM\EntityManager::create($conn, $config, $evm);