Merge pull request #1626 from samsonasik/clean-up-paths-viewdirectory

jim-parry · web-flow · commit 936f807b8bcc · 2019-01-02T13:57:49.000-08:00
WIP clean up Paths::$viewDirectory property
diff --git a/app/Config/Paths.php b/app/Config/Paths.php
@@ -35,7 +35,7 @@ class Paths
 	 *
 	 * NO TRAILING SLASH!
 	 */
-	public $appDirectory = __DIR__ . '/../../app';
+	public $appDirectory = __DIR__ . '/..';
 
 	/*
 	 * ---------------------------------------------------------------
@@ -73,5 +73,5 @@ class Paths
 	 * default this is in `app/Views`. This value
 	 * is used when no value is provided to `Services::renderer()`.
 	 */
-	public $viewDirectory = __DIR__ . '/../../app/Views';
+	public $viewDirectory = __DIR__ . '/../Views';
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class Paths`
`35`	`35`	`*`
`36`	`36`	`* NO TRAILING SLASH!`
`37`	`37`	`*/`
`38`		`- public $appDirectory = __DIR__ . '/../../app';`
	`38`	`+ public $appDirectory = __DIR__ . '/..';`
`39`	`39`
`40`	`40`	`/*`
`41`	`41`	`* ---------------------------------------------------------------`
`@@ -73,5 +73,5 @@ class Paths`
`73`	`73`	* default this is in `app/Views`. This value
`74`	`74`	* is used when no value is provided to `Services::renderer()`.
`75`	`75`	`*/`
`76`		`- public $viewDirectory = __DIR__ . '/../../app/Views';`
	`76`	`+ public $viewDirectory = __DIR__ . '/../Views';`
`77`	`77`	`}`