Browse Source

Merge pull request #4258 from cakephp/3.0-plugin

3.0 plugin bake
Mark Story 11 years ago
parent
commit
352bbbad7b

+ 1 - 1
src/Console/Command/Task/SimpleBakeTask.php

@@ -61,7 +61,7 @@ abstract class SimpleBakeTask extends BakeTask {
 	public function templateData() {
 		$namespace = Configure::read('App.namespace');
 		if ($this->plugin) {
-			$namespace = $this->plugin;
+			$namespace = $this->_pluginNamespace($this->plugin);
 		}
 		return ['namespace' => $namespace];
 	}

+ 0 - 2
src/Template/Bake/default/config/routes.ctp

@@ -14,8 +14,6 @@
  */
 echo "<?php\n";
 ?>
-namespace <?= $plugin ?>\Config;
-
 use Cake\Routing\Router;
 
 Router::plugin('<?= $plugin ?>', function($routes) {

+ 10 - 0
src/Utility/ConventionsTrait.php

@@ -147,4 +147,14 @@ trait ConventionsTrait {
 		return current(App::path('Plugin')) . $pluginName . DS;
 	}
 
+/**
+ * Return plugin's namespace
+ *
+ * @param string $pluginName Plugin name
+ * @return string Plugin's namespace
+ */
+	protected function _pluginNamespace($pluginName) {
+		return str_replace('/', '\\', $pluginName);
+	}
+
 }