Make "src/" path segment part of path returned by App::pluginPath()

cakephp · Jun 11, 2014 · 3d607f7 · 3d607f7
1 parent a920727
commit 3d607f7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/src/Configure/Engine/IniConfig.php b/src/Configure/Engine/IniConfig.php
@@ -220,7 +220,7 @@ protected function _getFilePath($key) {
 		}
 
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'src' . DS . 'Config' . DS . $key;
+			$file = App::pluginPath($plugin) . 'Config' . DS . $key;
 		} else {
 			$file = $this->_path . $key;
 		}

diff --git a/src/Configure/Engine/PhpConfig.php b/src/Configure/Engine/PhpConfig.php
@@ -108,7 +108,7 @@ protected function _getFilePath($key) {
 		$key .= '.php';
 
 		if ($plugin) {
-			$file = App::pluginPath($plugin) . 'src' . DS . 'Config' . DS . $key;
+			$file = App::pluginPath($plugin) . 'Config' . DS . $key;
 		} else {
 			$file = $this->_path . $key;
 		}

diff --git a/src/Core/App.php b/src/Core/App.php
@@ -140,7 +140,7 @@ public static function path($type, $plugin = null) {
 			return (array)Configure::read('App.paths.templates');
 		}
 		if (!empty($plugin)) {
-			return [static::pluginPath($plugin) . 'src' . DS . $type . DS];
+			return [static::pluginPath($plugin) . $type . DS];
 		}
 		return [APP . $type . DS];
 	}
@@ -159,7 +159,7 @@ public static function path($type, $plugin = null) {
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::pluginPath
  */
 	public static function pluginPath($plugin) {
-		return Plugin::path($plugin);
+		return Plugin::path($plugin) . 'src' . DS;
 	}
 
 /**

diff --git a/src/I18n/I18n.php b/src/I18n/I18n.php
@@ -385,7 +385,7 @@ protected function _bindTextDomain($domain) {
 			foreach ($plugins as $plugin) {
 				$pluginDomain = Inflector::underscore($plugin);
 				if ($pluginDomain === $domain) {
-					$searchPaths[] = Plugin::path($plugin) . 'src' . DS . 'Locale/';
+					$searchPaths[] = App::pluginPath($plugin) . 'Locale/';
 					$searchPaths = array_reverse($searchPaths);
 					break;
 				}

diff --git a/tests/TestCase/Core/AppTest.php b/tests/TestCase/Core/AppTest.php
@@ -261,15 +261,15 @@ public function testPluginPath() {
 		Plugin::load(['TestPlugin', 'TestPluginTwo', 'Company/TestPluginThree']);
 
 		$path = App::pluginPath('TestPlugin');
-		$expected = TEST_APP . 'Plugin' . DS . 'TestPlugin' . DS;
+		$expected = TEST_APP . 'Plugin' . DS . 'TestPlugin' . DS . 'src' . DS;
 		$this->assertPathEquals($expected, $path);
 
 		$path = App::pluginPath('TestPluginTwo');
-		$expected = TEST_APP . 'Plugin' . DS . 'TestPluginTwo' . DS;
+		$expected = TEST_APP . 'Plugin' . DS . 'TestPluginTwo' . DS . 'src' . DS;
 		$this->assertPathEquals($expected, $path);
 
 		$path = App::pluginPath('Company/TestPluginThree');
-		$expected = TEST_APP . 'Plugin' . DS . 'Company' . DS . 'TestPluginThree' . DS;
+		$expected = TEST_APP . 'Plugin' . DS . 'Company' . DS . 'TestPluginThree' . DS . 'src' . DS;
 		$this->assertPathEquals($expected, $path);
 	}
 

diff --git a/tests/TestCase/View/Helper/HtmlHelperTest.php b/tests/TestCase/View/Helper/HtmlHelperTest.php
@@ -747,7 +747,7 @@ public function testScriptTimestamping() {
 	public function testPluginScriptTimestamping() {
 		Plugin::load('TestPlugin');
 
-		$pluginPath = App::pluginPath('TestPlugin');
+		$pluginPath = Plugin::path('TestPlugin');
 		$pluginJsPath = $pluginPath . 'webroot/js';
 		$this->skipIf(!is_writable($pluginJsPath), $pluginJsPath . ' is not Writable, timestamp testing has been skipped.');