Browse Source

revert vendor namespace

euromark 11 years ago
parent
commit
9af9e82885

+ 2 - 2
README.md

@@ -57,7 +57,7 @@ Also don't forget the `use` statements.
 
 If you create a new behavior in the plugin, it might look like this:
 ```php
-namespace Dereuromark\Tools\Model\Behavior;
+namespace Tools\Model\Behavior;
 
 use Cake\ORM\Behavior;
 
@@ -69,7 +69,7 @@ For a new APP behavior "MySlugged" that extends "Tools.Slugged" it is:
 ```php
 namespace App\Model\Behavior;
 
-use Dereuromark\Tools\Model\Behavior\SluggedBehavior;
+use Tools\Model\Behavior\SluggedBehavior;
 
 class MySluggedBehavior extends SluggedBehavior {
 }

+ 6 - 5
composer.json

@@ -17,13 +17,14 @@
 		"composer/installers": "*",
 		"cakephp/cakephp": "3.0.*-dev"
 	},
-	"require-dev": {
-		"cakephp/app": "dev-master"
-	},
 	"autoload": {
 		"psr-4": {
-			"Dereuromark\\Tools\\": "src",
-			"Dereuromark\\Tools\\Test\\": "tests"
+			"Tools\\": "src"
+		}
+	},
+	"autoload-dev": {
+		"psr-4": {
+			"Tools\\Test\\": "tests"
 		}
 	},
 	"support":{

+ 1 - 1
src/Console/Command/WhitespaceShell.php

@@ -1,5 +1,5 @@
 <?php
-namespace Dereuromark\Tools\Console\Command;
+namespace Tools\Console\Command;
 
 use Cake\Console\Shell;
 use Cake\Utility\Folder;

+ 1 - 1
src/Model/Behavior/SluggedBehavior.php

@@ -6,7 +6,7 @@
  * @license http://www.opensource.org/licenses/mit-license.php The MIT License
  */
 
-namespace Dereuromark\Tools\Model\Behavior;
+namespace Tools\Model\Behavior;
 
 use Cake\Event\Event;
 use Cake\ORM\Behavior;

+ 1 - 1
src/TestSuite/Traits/ToolsTestTrait.php

@@ -1,5 +1,5 @@
 <?php
-namespace Dereuromark\Tools\TestSuite\Traits;
+namespace Tools\TestSuite\Traits;
 
 use Cake\Controller\Controller;
 use Cake\Network\Response;

+ 1 - 1
src/Utility/Set.php

@@ -1,5 +1,5 @@
 <?php
-namespace Dereuromark\Tools\Utility;
+namespace Tools\Utility;
 
 /**
  * BC wrapper for 2.x methods until they can be rewritten.

+ 1 - 1
tests/Fixture/SluggedArticleFixture.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dereuromark\Tools\Test\Fixture;
+namespace Tools\Test\Fixture;
 
 use Cake\TestSuite\Fixture\TestFixture;
 

+ 3 - 3
tests/TestCase/Console/Command/WhitespaceShellTest.php

@@ -1,7 +1,7 @@
 <?php
-namespace Dereuromark\Tools\Test\TestCase\Console\Command;
+namespace Tools\Test\TestCase\Console\Command;
 
-use Dereuromark\Tools\Console\Command\WhitespaceShell;
+use Tools\Console\Command\WhitespaceShell;
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOutput;
 use Cake\Console\Shell;
@@ -38,7 +38,7 @@ class WhitespaceShellTest extends TestCase {
 		$io = new ConsoleIo($this->out);
 
 		$this->Shell = $this->getMock(
-			'Dereuromark\Tools\Console\Command\WhitespaceShell',
+			'Tools\Console\Command\WhitespaceShell',
 			['in', 'err', '_stop'],
 			[$io]
 		);

+ 1 - 1
tests/TestCase/Model/Behavior/SluggedBehaviorTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Dereuromark\Tools\Test\TestCase\Model\Behavior;
+namespace Tools\Test\TestCase\Model\Behavior;
 
 use Cake\Database\Query;
 use Cake\Datasource\ConnectionManager;

+ 1 - 1
tests/bootstrap.php

@@ -42,7 +42,7 @@ $cache = [
 
 Cake\Cache\Cache::config($cache);
 
-Cake\Core\Plugin::load('Tools', ['namespace' => 'Dereuromark\\Tools', 'path' => './']);
+Cake\Core\Plugin::load('Tools', ['path' => './']);
 
 // Ensure default test connection is defined
 if (!getenv('db_class')) {