Moved environment to Uri object

getgrav · Nov 7, 2014 · 78279e4 · 78279e4
1 parent 699fade
commit 78279e4
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 18 deletions.
diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -3,6 +3,7 @@
 
 use Grav\Common\Config\Config;
 use Grav\Common\Grav;
+use Grav\Common\Uri;
 use Grav\Common\Filesystem\Folder;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
@@ -33,7 +34,7 @@ public function register(Container $container)
 
     public function loadMasterConfig(Container $container)
     {
-        $environment = $this->getEnvironment();
+        $environment = $this->getEnvironment($container);
         $file = CACHE_DIR . 'compiled/config/master-'.$environment.'.php';
         $data = is_file($file) ? (array) include $file : [];
         if ($data) {
@@ -54,25 +55,17 @@ public function loadMasterConfig(Container $container)
 
     public function loadMasterBlueprints(Container $container)
     {
-        $environment = $this->getEnvironment();
+        $environment = $this->getEnvironment($container);
         $file = CACHE_DIR . 'compiled/blueprints/master-'.$environment.'.php';
         $data = is_file($file) ? (array) include $file : [];
 
         return new Blueprints($data, $container);
     }
 
-    public function getEnvironment()
+    public function getEnvironment(Container $container)
     {
-        if (!$this->environment) {
-            $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
-
-            // check for localhost variations
-            if ($address == '::1' || $address == '127.0.0.1') {
-                $hostname = 'localhost';
-            } else {
-                $hostname = gethostname();
-            }
-            $this->environment = $hostname;
+        if (!isset($this->environment)) {
+            $this->environment = $container['uri']->environment();
         }
 
         return $this->environment;

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -50,6 +50,16 @@ public function __construct()
             $root_path = substr($uri, 0, strpos($uri, '/', 1)) . $root_path;
         }
 
+        // set hostname
+        $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
+
+        // check for localhost variations
+        if ($address == '::1' || $address == '127.0.0.1') {
+            $this->host = 'localhost';
+        } else {
+            $this->host = gethostname();
+        }
+
         $this->base = $base;
         $this->root = $base . $root_path;
         $this->url = $base . $uri;
@@ -213,7 +223,8 @@ public function url($include_host = false)
      *
      * @return String The path of the URI
      */
-    public function path() {
+    public function path()
+    {
         return $this->path;
     }
 
@@ -222,7 +233,8 @@ public function path() {
      *
      * @return String The extension of the URI
      */
-    public function extension($default = null) {
+    public function extension($default = null)
+    {
         if (!$this->extension) {
             $this->extension = $default;
         }
@@ -234,16 +246,28 @@ public function extension($default = null) {
      *
      * @return String The host of the URI
      */
-    public function host() {
+    public function host()
+    {
         return $this->host;
     }
 
+    /**
+     * Gets the environment name
+     *
+     * @return String
+     */
+    public function environment()
+    {
+        return $this->host();
+    }
+
     /**
      * Return the base of the URI
      *
      * @return String The base of the URI
      */
-    public function base() {
+    public function base()
+    {
         return $this->base;
     }
 
@@ -340,7 +364,8 @@ public function ip()
      * @param $parsed_url
      * @return string
      */
-    public static function build_url($parsed_url) {
+    public static function build_url($parsed_url)
+    {
         $scheme   = isset($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '';
         $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
         $port     = isset($parsed_url['port']) ? ':' . $parsed_url['port'] : '';