Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove usage of purged method Plugin::namespace().
  • Loading branch information
ADmad committed Aug 11, 2014
1 parent 9aca863 commit a978901
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Console/Command/BakeShell.php
Expand Up @@ -108,7 +108,7 @@ public function loadTasks() {
$tasks = $this->_findTasks(
$tasks,
Plugin::classPath($plugin),
Plugin::getNamespace($plugin),
$plugin,
$plugin
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Console/Command/Task/SimpleBakeTask.php
Expand Up @@ -61,7 +61,7 @@ abstract public function template();
public function templateData() {
$namespace = Configure::read('App.namespace');
if ($this->plugin) {
$namespace = Plugin::getNamespace($this->plugin);
$namespace = $this->plugin;
}
return ['namespace' => $namespace];
}
Expand Down
4 changes: 2 additions & 2 deletions src/Console/Command/Task/TestTask.php
Expand Up @@ -262,7 +262,7 @@ public function buildTestSubject($type, $class) {
public function getRealClassName($type, $class) {
$namespace = Configure::read('App.namespace');
if ($this->plugin) {
$namespace = Plugin::getNamespace($this->plugin);
$namespace = $this->plugin;
}
$suffix = $this->classSuffixes[strtolower($type)];
$subSpace = $this->mapType($type);
Expand Down Expand Up @@ -481,7 +481,7 @@ public function testCaseFileName($type, $className) {
$path = $this->getPath();
$namespace = Configure::read('App.namespace');
if ($this->plugin) {
$namespace = Plugin::getNamespace($this->plugin);
$namespace = $this->plugin;
}
$classTail = substr($className, strlen($namespace) + 1);
$path = $path . $classTail . 'Test.php';
Expand Down
2 changes: 1 addition & 1 deletion src/Core/App.php
Expand Up @@ -80,7 +80,7 @@ public static function className($class, $type = '', $suffix = '') {

list($plugin, $name) = pluginSplit($class);
if ($plugin) {
$base = Plugin::getNamespace($plugin);
$base = $plugin;
} else {
$base = Configure::read('App.namespace');
}
Expand Down
2 changes: 1 addition & 1 deletion src/TestSuite/Fixture/FixtureManager.php
Expand Up @@ -151,7 +151,7 @@ protected function _loadFixtures($test) {
} else {
list($plugin, $name) = explode('.', $name);
}
$baseNamespace = Plugin::getNamespace(Inflector::camelize($plugin));
$baseNamespace = Inflector::camelize($plugin);
} else {
$name = $fixture;
}
Expand Down

0 comments on commit a978901

Please sign in to comment.