Merge pull request #3615 from rchavik/3.0-acl-split

3.0 Acl Split - wip
cakephp · Jun 5, 2014 · 2b8ab51 · 2b8ab51
2 parents bdb8285 + de1d354
commit 2b8ab51
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 2,104 deletions.
diff --git a/...Component/Auth/AbstractPasswordHasher.php → src/Auth/AbstractPasswordHasher.php b/...Component/Auth/AbstractPasswordHasher.php → src/Auth/AbstractPasswordHasher.php
@@ -12,7 +12,7 @@
  * @since         2.4.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
 use Cake\Core\InstanceConfigTrait;
 

diff --git a/...oller/Component/Auth/BaseAuthenticate.php → src/Auth/BaseAuthenticate.php b/...oller/Component/Auth/BaseAuthenticate.php → src/Auth/BaseAuthenticate.php
@@ -11,10 +11,11 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
+use Cake\Auth\AbstractPasswordHasher;
+use Cake\Auth\PasswordHasherFactory;
 use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component\Auth\PasswordHasherFactory;
 use Cake\Core\App;
 use Cake\Core\InstanceConfigTrait;
 use Cake\Error;

diff --git a/...ntroller/Component/Auth/BaseAuthorize.php → src/Auth/BaseAuthorize.php b/...ntroller/Component/Auth/BaseAuthorize.php → src/Auth/BaseAuthorize.php
@@ -12,7 +12,7 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;

diff --git a/...ller/Component/Auth/BasicAuthenticate.php → src/Auth/BasicAuthenticate.php b/...ller/Component/Auth/BasicAuthenticate.php → src/Auth/BasicAuthenticate.php
@@ -13,7 +13,7 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Error;

diff --git a/...er/Component/Auth/ControllerAuthorize.php → src/Auth/ControllerAuthorize.php b/...er/Component/Auth/ControllerAuthorize.php → src/Auth/ControllerAuthorize.php
@@ -12,7 +12,7 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Controller\Controller;

diff --git a/...ler/Component/Auth/DigestAuthenticate.php → src/Auth/DigestAuthenticate.php b/...ler/Component/Auth/DigestAuthenticate.php → src/Auth/DigestAuthenticate.php
@@ -13,10 +13,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
+use Cake\Auth\BasicAuthenticate;
 use Cake\Controller\ComponentRegistry;
-use Cake\Controller\Component\Auth\BasicAuthenticate;
 use Cake\Network\Request;
 use Cake\Network\Response;
 

diff --git a/...Component/Auth/FallbackPasswordHasher.php → src/Auth/FallbackPasswordHasher.php b/...Component/Auth/FallbackPasswordHasher.php → src/Auth/FallbackPasswordHasher.php
@@ -12,9 +12,9 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
-use Cake\Controller\Component\Auth\AbstractPasswordHasher;
+use Cake\Auth\AbstractPasswordHasher;
 
 /**
  * A password hasher that can use multiple different hashes where only

diff --git a/...oller/Component/Auth/FormAuthenticate.php → src/Auth/FormAuthenticate.php b/...oller/Component/Auth/FormAuthenticate.php → src/Auth/FormAuthenticate.php
@@ -13,7 +13,7 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
 use Cake\Controller\ComponentRegistry;
 use Cake\Network\Request;

diff --git a/.../Component/Auth/PasswordHasherFactory.php → src/Auth/PasswordHasherFactory.php b/.../Component/Auth/PasswordHasherFactory.php → src/Auth/PasswordHasherFactory.php
@@ -12,7 +12,7 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
 use Cake\Core\App;
 
@@ -42,7 +42,7 @@ public static function build($passwordHasher) {
 		}
 
 		list($plugin, $class) = pluginSplit($class, true);
-		$className = App::className($class, 'Controller/Component/Auth', 'PasswordHasher');
+		$className = App::className($class, 'Auth', 'PasswordHasher');
 		if (!class_exists($className)) {
 			throw new \RuntimeException(sprintf('Password hasher class "%s" was not found.', $class));
 		}

diff --git a/...r/Component/Auth/SimplePasswordHasher.php → src/Auth/SimplePasswordHasher.php b/...r/Component/Auth/SimplePasswordHasher.php → src/Auth/SimplePasswordHasher.php
@@ -12,9 +12,9 @@
  * @since         2.4.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
-use Cake\Controller\Component\Auth\AbstractPasswordHasher;
+use Cake\Auth\AbstractPasswordHasher;
 use Cake\Utility\Security;
 
 /**

diff --git a/...ler/Component/Auth/WeakPasswordHasher.php → src/Auth/WeakPasswordHasher.php b/...ler/Component/Auth/WeakPasswordHasher.php → src/Auth/WeakPasswordHasher.php
@@ -12,9 +12,9 @@
  * @since         3.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Controller\Component\Auth;
+namespace Cake\Auth;
 
-use Cake\Controller\Component\Auth\AbstractPasswordHasher;
+use Cake\Auth\AbstractPasswordHasher;
 use Cake\Utility\Security;
 
 /**

diff --git a/src/Controller/Component/Acl/AclInterface.php b/src/Controller/Component/Acl/AclInterface.php