Added support for aliases. Using @webroot as default root path.

aelvan · Oct 6, 2018 · 71d2f10 · 71d2f10
1 parent 7b503f4
commit 71d2f10
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Inlin Changelog
 
+## 2.1.0 - 2018-10-06
+### Added
+- Inlin now uses `@webroot` alias instead of $_SERVER\['DOCUMENT_ROOT'\] as path root by default. 
+- The `publicRoot` config setting now supports aliases. 
+
 ## 2.0.0 - 2017-08-09
 ### Added
 - Initial Craft 3 release
diff --git a/README.md b/README.md
@@ -60,8 +60,3 @@ and adding the `publicRoot` setting.
 
     'publicRoot' => '/path/to/website/public/',
 
-
-Changelog
----
-### Version 2.0
- - Initial Craft 3 release
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "aelvan/inlin",
     "description": "A simple plugin for inlining stuff in your templates.",
     "type": "craft-plugin",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "keywords": [
         "craft",
         "cms",
@@ -25,7 +25,7 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0.0-beta.23"
+        "craftcms/cms": "^3.0.0"
     },
     "repositories": [
         {

diff --git a/src/variables/InlinVariable.php b/src/variables/InlinVariable.php
@@ -24,7 +24,7 @@ class InlinVariable
      */
     public function er($fileName, $remote = false): string
     {
-        $documentRoot = Inlin::getInstance()->getSettings()->publicRoot ?? $_SERVER['DOCUMENT_ROOT'];
+        $documentRoot = \Yii::getAlias(Inlin::getInstance()->getSettings()->publicRoot ?? '@webroot');
         $filePath = $this->_removeDoubleSlashes($documentRoot.'/'.$fileName);
 
         if ($remote) {
@@ -54,4 +54,4 @@ private function _removeDoubleSlashes($path)
         return preg_replace('#/+#', '/', $path);
     }
 
-}
+}