Use Pimple instead of Core\Registry and add Monolog for logging

andrewcrago · Nov 15, 2014 · b081288 · b081288
1 parent 1487cb2
commit b081288
Show file tree

Hide file tree

Showing 57 changed files with 549 additions and 593 deletions.
diff --git a/app/Action/Base.php b/app/Action/Base.php
@@ -2,8 +2,8 @@
 
 namespace Action;
 
+use Pimple\Container;
 use Core\Listener;
-use Core\Registry;
 use Core\Tool;
 
 /**
@@ -44,12 +44,12 @@ abstract class Base implements Listener
     protected $event_name = '';
 
     /**
-     * Registry instance
+     * Container instance
      *
      * @access protected
-     * @var \Core\Registry
+     * @var Pimple\Container
      */
-    protected $registry;
+    protected $container;
 
     /**
      * Execute the action
@@ -101,13 +101,13 @@ abstract public function hasRequiredCondition(array $data);
      * Constructor
      *
      * @access public
-     * @param  \Core\Registry   $registry         Regsitry instance
-     * @param  integer          $project_id       Project id
-     * @param  string           $event_name       Attached event name
+     * @param  Pimple\Container   $container        Container
+     * @param  integer            $project_id       Project id
+     * @param  string             $event_name       Attached event name
      */
-    public function __construct(Registry $registry, $project_id, $event_name)
+    public function __construct(Container $container, $project_id, $event_name)
     {
-        $this->registry = $registry;
+        $this->container = $container;
         $this->project_id = $project_id;
         $this->event_name = $event_name;
     }
@@ -132,7 +132,7 @@ public function __toString()
      */
     public function __get($name)
     {
-        return Tool::loadModel($this->registry, $name);
+        return Tool::loadModel($this->container, $name);
     }
 
     /**

diff --git a/app/Auth/Base.php b/app/Auth/Base.php
@@ -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);
     }
 }
diff --git a/app/Auth/RememberMe.php b/app/Auth/RememberMe.php
@@ -4,7 +4,6 @@
 
 use Core\Request;
 use Core\Security;
-use Core\Tool;
 
 /**
  * RememberMe model
@@ -311,7 +310,7 @@ public function writeCookie($token, $sequence, $expiration)
             $expiration,
             BASE_URL_DIRECTORY,
             null,
-            Tool::isHTTPS(),
+            Request::isHTTPS(),
             true
         );
     }
@@ -344,7 +343,7 @@ public function deleteCookie()
             time() - 3600,
             BASE_URL_DIRECTORY,
             null,
-            Tool::isHTTPS(),
+            Request::isHTTPS(),
             true
         );
     }

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
@@ -2,6 +2,7 @@
 
 namespace Controller;
 
+use Pimple\Container;
 use Core\Tool;
 use Core\Registry;
 use Core\Security;
@@ -75,34 +76,34 @@ abstract class Base
     public $session;
 
     /**
-     * Registry instance
+     * Container instance
      *
      * @access private
-     * @var \Core\Registry
+     * @var Pimple\Container
      */
-    private $registry;
+    private $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->container = $container;
     }
 
     /**
      * 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);
     }
 
     /**

diff --git a/app/Core/Registry.php b/app/Core/Registry.php
diff --git a/app/Core/Request.php b/app/Core/Request.php
@@ -124,6 +124,20 @@ public function isAjax()
         return $this->getHeader('X-Requested-With') === 'XMLHttpRequest';
     }
 
+    /**
+     * Check if the page is requested through HTTPS
+     *
+     * Note: IIS return the value 'off' and other web servers an empty value when it's not HTTPS
+     *
+     * @static
+     * @access public
+     * @return boolean
+     */
+    public static function isHTTPS()
+    {
+        return isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== '' && $_SERVER['HTTPS'] !== 'off';
+    }
+
     /**
      * Return a HTTP header value
      *

diff --git a/app/Core/Response.php b/app/Core/Response.php
@@ -246,7 +246,7 @@ public function xss()
      */
     public function hsts()
     {
-        if (Tool::isHTTPS()) {
+        if (Request::isHTTPS()) {
             header('Strict-Transport-Security: max-age=31536000');
         }
     }

diff --git a/app/Core/Router.php b/app/Core/Router.php
@@ -2,6 +2,8 @@
 
 namespace Core;
 
+use Pimple\Container;
+
 /**
  * Router class
  *
@@ -27,24 +29,24 @@ class Router
     private $action = '';
 
     /**
-     * Registry instance
+     * Container instance
      *
      * @access private
-     * @var \Core\Registry
+     * @var Pimple\Container
      */
-    private $registry;
+    private $container;
 
     /**
      * Constructor
      *
      * @access public
-     * @param  Registry        $registry     Registry instance
-     * @param  string          $controller   Controller name
-     * @param  string          $action       Action name
+     * @param  Pimple\Container   $container     Container instance
+     * @param  string             $controller   Controller name
+     * @param  string             $action       Action name
      */
-    public function __construct(Registry $registry, $controller = '', $action = '')
+    public function __construct(Container $container, $controller = '', $action = '')
     {
-        $this->registry = $registry;
+        $this->container = $container;
         $this->controller = empty($_GET['controller']) ? $controller : $_GET['controller'];
         $this->action = empty($_GET['action']) ? $action : $_GET['action'];
     }
@@ -81,7 +83,7 @@ public function load($filename, $class, $method)
                 return false;
             }
 
-            $instance = new $class($this->registry);
+            $instance = new $class($this->container);
             $instance->request = new Request;
             $instance->response = new Response;
             $instance->session = new Session;

diff --git a/app/Core/Session.php b/app/Core/Session.php
@@ -49,7 +49,7 @@ public function open($base_path = '/', $save_path = '')
             self::SESSION_LIFETIME,
             $base_path ?: '/',
             null,
-            Tool::isHTTPS(),
+            Request::isHTTPS(),
             true
         );