Use Pimple instead of Core\Registry and add Monolog for logging
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
namespace Auth;
|
||||
|
||||
use Core\Tool;
|
||||
use Core\Registry;
|
||||
use Pimple\Container;
|
||||
|
||||
/**
|
||||
* Base auth class
|
||||
@@ -26,34 +26,34 @@ abstract class Base
|
||||
protected $db;
|
||||
|
||||
/**
|
||||
* Registry instance
|
||||
* Container instance
|
||||
*
|
||||
* @access protected
|
||||
* @var \Core\Registry
|
||||
* @var Pimple\Container
|
||||
*/
|
||||
protected $registry;
|
||||
protected $container;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @access public
|
||||
* @param \Core\Registry $registry Registry instance
|
||||
* @param Pimple\Container $container
|
||||
*/
|
||||
public function __construct(Registry $registry)
|
||||
public function __construct(Container $container)
|
||||
{
|
||||
$this->registry = $registry;
|
||||
$this->db = $this->registry->shared('db');
|
||||
$this->container = $container;
|
||||
$this->db = $this->container['db'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Load automatically models
|
||||
*
|
||||
* @access public
|
||||
* @param string $name Model name
|
||||
* @param string $name Model name
|
||||
* @return mixed
|
||||
*/
|
||||
public function __get($name)
|
||||
{
|
||||
return Tool::loadModel($this->registry, $name);
|
||||
return Tool::loadModel($this->container, $name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ namespace Auth;
|
||||
|
||||
use Core\Request;
|
||||
use Core\Security;
|
||||
use Core\Tool;
|
||||
|
||||
/**
|
||||
* RememberMe model
|
||||
@@ -311,7 +310,7 @@ class RememberMe extends Base
|
||||
$expiration,
|
||||
BASE_URL_DIRECTORY,
|
||||
null,
|
||||
Tool::isHTTPS(),
|
||||
Request::isHTTPS(),
|
||||
true
|
||||
);
|
||||
}
|
||||
@@ -344,7 +343,7 @@ class RememberMe extends Base
|
||||
time() - 3600,
|
||||
BASE_URL_DIRECTORY,
|
||||
null,
|
||||
Tool::isHTTPS(),
|
||||
Request::isHTTPS(),
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user