From a38cac801f7fd24bb149bd48447d32f2abd4ea92 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 2 Oct 2012 22:55:09 -0400
Subject: [PATCH] Fix PhpAcl tests.

---
 lib/Cake/Controller/Component/Acl/PhpAcl.php          | 10 +++-------
 lib/Cake/Controller/Component/AclComponent.php        |  3 ++-
 .../TestCase/Controller/Component/Acl/PhpAclTest.php  | 11 +++--------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/lib/Cake/Controller/Component/Acl/PhpAcl.php b/lib/Cake/Controller/Component/Acl/PhpAcl.php
index c65e09f7879..4623204ca64 100644
--- a/lib/Cake/Controller/Component/Acl/PhpAcl.php
+++ b/lib/Cake/Controller/Component/Acl/PhpAcl.php
@@ -1,9 +1,5 @@
 <?php
 /**
- * PHP configuration based AclInterface implementation
- *
- * PHP 5
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -12,16 +8,16 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Controller.Component.Acl
  * @since         CakePHP(tm) v 2.1
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 namespace Cake\Controller\Component\Acl;
+
 use Cake\Configure\PhpReader;
 use Cake\Controller\Component;
 use Cake\Core\Object;
 use Cake\Error;
+use Cake\Utility\Hash;
 use Cake\Utility\Inflector;
 
 /**
@@ -93,7 +89,7 @@ public function initialize(Component $Component) {
  *
  * @param array $config configuration array, see docs
  * @return void
- * @throws AclException When required keys are missing.
+ * @throws Cake\Error\Exception When required keys are missing.
  */
 	public function build(array $config) {
 		if (empty($config['roles'])) {
diff --git a/lib/Cake/Controller/Component/AclComponent.php b/lib/Cake/Controller/Component/AclComponent.php
index 65ea3462226..0fdee029b5f 100644
--- a/lib/Cake/Controller/Component/AclComponent.php
+++ b/lib/Cake/Controller/Component/AclComponent.php
@@ -13,6 +13,7 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 namespace Cake\Controller\Component;
+
 use Cake\Configure\IniReader;
 use Cake\Controller\Component;
 use Cake\Controller\ComponentCollection;
@@ -68,7 +69,7 @@ public function __construct(ComponentCollection $collection, $settings = array()
 		parent::__construct($collection, $settings);
 		$classname = $name = Configure::read('Acl.classname');
 		if (!class_exists($classname)) {
-			$classname = App::classname($name, 'Controller/Component', 'Component');
+			$classname = App::classname($name, 'Controller/Component/Acl');
 			if (!$classname) {
 				throw new Error\Exception(__d('cake_dev', 'Could not find %s.', $name));
 			}
diff --git a/lib/Cake/Test/TestCase/Controller/Component/Acl/PhpAclTest.php b/lib/Cake/Test/TestCase/Controller/Component/Acl/PhpAclTest.php
index 71fb51d2e7b..cbb0f8eee1a 100644
--- a/lib/Cake/Test/TestCase/Controller/Component/Acl/PhpAclTest.php
+++ b/lib/Cake/Test/TestCase/Controller/Component/Acl/PhpAclTest.php
@@ -1,9 +1,5 @@
 <?php
 /**
- * PhpAclTest file.
- *
- * PHP 5
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -12,12 +8,11 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Test.Case.Controller.Component.Acl
  * @since         CakePHP(tm) v 2.1
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
-
 namespace Cake\Test\TestCase\Controller\Component;
+
 use Cake\Controller\ComponentCollection;
 use Cake\Controller\Component\AclComponent;
 use Cake\Controller\Component\Acl\PhpAcl;
@@ -258,7 +253,7 @@ public function testDenyRuleIsStrongerThanAllowRule() {
  */
 	public function testInvalidConfigWithAroMissing() {
 		$this->setExpectedException(
-			'AclException',
+			'Cake\Error\AclException',
 			'"roles" section not found in configuration'
 		);
 		$config = array('aco' => array('allow' => array('foo' => '')));
@@ -267,7 +262,7 @@ public function testInvalidConfigWithAroMissing() {
 
 	public function testInvalidConfigWithAcosMissing() {
 		$this->setExpectedException(
-			'AclException',
+			'Cake\Error\AclException',
 			'Neither "allow" nor "deny" rules were provided in configuration.'
 		);