Merge branch '1.2' into 1.3

cake/basics.php

@@ -843,7 +843,7 @@ if (!function_exists('file_put_contents')) {
 
 			foreach ($args[0] as $valueKey => $valueData) {
 				for ($i = 1; $i < $argc; $i++) {
-					if (isset($args[$i][$valueKey])) {
+					if (array_key_exists($valueKey, $args[$i])) {
 						continue 2;
 					}
 				}

cake/libs/controller/components/security.php

@@ -351,7 +351,7 @@ class SecurityComponent extends Object {
 
 		if (strtolower($options['type']) == 'digest') {
 			$out[] = 'qop="auth"';
-			$out[] = 'nonce="' . uniqid() . '"';
+			$out[] = 'nonce="' . uniqid("") . '"';
 			$out[] = 'opaque="' . md5($options['realm']).'"';
 		}
 

cake/libs/controller/controller.php

@@ -1028,7 +1028,7 @@ class Controller extends Object {
 			}
 		} elseif (empty($object) || $object === null) {
 			if (isset($this->{$this->modelClass})) {
-				$object = $this->{$this->modelClass};
+				$object =& $this->{$this->modelClass};
 			} else {
 				$className = null;
 				$name = $this->uses[0];
@@ -1036,9 +1036,9 @@ class Controller extends Object {
 					list($name, $className) = explode('.', $this->uses[0]);
 				}
 				if ($className) {
-					$object = $this->{$className};
+					$object =& $this->{$className};
 				} else {
-					$object = $this->{$name};
+					$object =& $this->{$name};
 				}
 			}
 		}

cake/tests/cases/basics.test.php

@@ -60,6 +60,36 @@ class BasicsTest extends CakeTestCase {
 		Configure::write('Config.language', $this->_language);
 	}
 
+/**
+ * test the array_diff_key compatibility function.
+ *
+ * @return void
+ **/
+	function testArrayDiffKey() {
+		$one = array('one' => 1, 'two' => 2, 'three' => 3);
+		$two = array('one' => 'one', 'two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('three' => 3);
+		$this->assertEqual($result, $expected);
+
+		$one = array('one' => array('value', 'value-two'), 'two' => 2, 'three' => 3);
+		$two = array('two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('one' => array('value', 'value-two'), 'three' => 3);
+		$this->assertEqual($result, $expected);
+
+		$one = array('one' => null, 'two' => 2, 'three' => '', 'four' => 0);
+		$two = array('two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('one' => null, 'three' => '', 'four' => 0);
+		$this->assertEqual($result, $expected);
+
+		$one = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
+		$two = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
+		$result = array_diff_key($one, $two);
+		$this->assertEqual($result, array());
+
+	}
 /**
  * testHttpBase method
  *

cake/tests/cases/console/libs/acl.test.php

@@ -92,7 +92,7 @@ class AclShellTest extends CakeTestCase {
 	function startTest() {
 		$this->Dispatcher =& new TestAclShellMockShellDispatcher();
 		$this->Task =& new MockAclShell($this->Dispatcher);
-		$this->Task->Dispatch = new $this->Dispatcher;
+		$this->Task->Dispatch =& $this->Dispatcher;
 		$this->Task->params['datasource'] = 'test_suite';
 		$this->Task->Acl =& new AclComponent();
 		$controller = null;

cake/tests/cases/console/libs/api.test.php

@@ -66,7 +66,7 @@ class ApiShellTest extends CakeTestCase {
 	function startTest() {
 		$this->Dispatcher =& new ApiShellMockShellDispatcher();
 		$this->Shell =& new MockApiShell($this->Dispatcher);
-		$this->Shell->Dispatch = new $this->Dispatcher;
+		$this->Shell->Dispatch =& $this->Dispatcher;
 	}
 
 /**

cake/tests/cases/console/libs/shell.test.php

@@ -40,10 +40,9 @@ if (!class_exists('ShellDispatcher')) {
 	ob_end_clean();
 }
 
-Mock::generatePartial(
+Mock::generatePartial('ShellDispatcher', 'TestShellMockShellDispatcher', array(
-				'ShellDispatcher', 'TestShellMockShellDispatcher',
+	'getInput', 'stdout', 'stderr', '_stop', '_initEnvironment'
-				array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+));
-				);
 
 /**
  * TestShell class
@@ -52,6 +51,14 @@ Mock::generatePartial(
  * @subpackage    cake.tests.cases.console.libs
  */
 class TestShell extends Shell {
+
+/*
+ * name property
+ *
+ * @var name
+ * @access public
+ */
+	var $name = 'TestShell';
 /**
  * stopped property
  *
@@ -59,6 +66,7 @@ class TestShell extends Shell {
  * @access public
  */
 	var $stopped;
+
 /**
  * stop method
  *

cake/tests/cases/libs/controller/components/security.test.php

@@ -391,6 +391,14 @@ class SecurityComponentTest extends CakeTestCase {
  * @return void
  */
 	function testDigestAuth() {
+		$skip = $this->skipIf((version_compare(PHP_VERSION, '5.1') == -1) XOR (!function_exists('apache_request_headers')),
+			"%s Cannot run Digest Auth test for PHP versions < 5.1"
+		);
+
+		if ($skip) {
+			return;
+		}
+
 		$this->Controller->action = 'posted';
 		$_SERVER['PHP_AUTH_DIGEST'] = $digest = <<<DIGEST
 		Digest username="Mufasa",

cake/tests/cases/libs/controller/scaffold.test.php

@@ -254,12 +254,12 @@ class ScaffoldViewTest extends CakeTestCase {
 	var $fixtures = array('core.article', 'core.user', 'core.comment');
 
 /**
- * setUp method
+ * startTest method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Controller =& new ScaffoldMockController();
 
 		App::build(array(
@@ -269,12 +269,12 @@ class ScaffoldViewTest extends CakeTestCase {
 	}
 
 /**
- * tearDown method
+ * endTest method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->Controller);
 
 		App::build();
@@ -481,7 +481,6 @@ class ScaffoldViewTest extends CakeTestCase {
 		$this->assertPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
 		$this->assertPattern('/<li><a href="\/scaffold_mock\/delete\/1"[^>]*>Delete<\/a>\s*<\/li>/', $result);
 	}
-
 /**
  * Test Admin Index Scaffolding.
  *
@@ -596,22 +595,22 @@ class ScaffoldTest extends CakeTestCase {
 	var $fixtures = array('core.article', 'core.user', 'core.comment');
 
 /**
- * setUp method
+ * startTest method
  *
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Controller =& new ScaffoldMockController();
 	}
 
 /**
- * tearDown method
+ * endTest method
  *
  * @access public
  * @return void
  */
-	function tearDown() {
+	function endTest() {
 		unset($this->Controller);
 	}
 
@@ -647,7 +646,6 @@ class ScaffoldTest extends CakeTestCase {
 		$result = $Scaffold->getParams();
 		$this->assertEqual($result['action'], 'admin_edit');
 	}
-
 /**
  * test that the proper names and variable values are set by Scaffold
  *
@@ -675,7 +673,7 @@ class ScaffoldTest extends CakeTestCase {
 		$this->Controller->base = '/';
 		$this->Controller->constructClasses();
 		$Scaffold =& new TestScaffoldMock($this->Controller, $params);
-		$result = $this->Controller->viewVars;
+		$result = $Scaffold->controller->viewVars;
 
 		$this->assertEqual($result['singularHumanName'], 'Scaffold Mock');
 		$this->assertEqual($result['pluralHumanName'], 'Scaffold Mock');

cake/tests/cases/libs/model/model_behavior.test.php

@@ -264,7 +264,7 @@ class TestBehavior extends ModelBehavior {
 		}
 		echo "onError trigger success";
 	}
-		/**
+/**
  * beforeTest method
  *
  * @param mixed $model
@@ -272,8 +272,8 @@ class TestBehavior extends ModelBehavior {
  * @return void
  */
 	function beforeTest(&$model) {
-		$model->beforeTestResult[] = get_class($this);
+		$model->beforeTestResult[] = strtolower(get_class($this));
-		return get_class($this);
+		return strtolower(get_class($this));
 	}
 
 /**
@@ -1013,24 +1013,24 @@ class BehaviorTest extends CakeTestCase {
  * @return void
  */
 	function testBehaviorTrigger() {
-		$Apple = new Apple();
+		$Apple =& new Apple();
 		$Apple->Behaviors->attach('Test');
 		$Apple->Behaviors->attach('Test2');
 		$Apple->Behaviors->attach('Test3');
 
 		$Apple->beforeTestResult = array();
 		$Apple->Behaviors->trigger($Apple, 'beforeTest');
-		$expected = array('TestBehavior', 'Test2Behavior', 'Test3Behavior');
+		$expected = array('testbehavior', 'test2behavior', 'test3behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 
 		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => 'Test2Behavior'));
+		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => 'test2behavior'));
-		$expected = array('TestBehavior', 'Test2Behavior');
+		$expected = array('testbehavior', 'test2behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 
 		$Apple->beforeTestResult = array();
-		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => array('Test2Behavior', 'Test3Behavior')));
+		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => array('test2behavior', 'test3behavior')));
-		$expected = array('TestBehavior', 'Test2Behavior');
+		$expected = array('testbehavior', 'test2behavior');
 		$this->assertIdentical($Apple->beforeTestResult, $expected);
 	}
 

cake/tests/cases/libs/view/helpers/paginator.test.php

@@ -302,7 +302,7 @@ class PaginatorHelperTest extends CakeTestCase {
 
 		$this->assertEqual($result, $expected);
 
-		unset($this->paginator->params['paging']['article']['options']);
+		unset($this->Paginator->params['paging']['Article']['options']);
 		$this->Paginator->params['paging']['Article']['options']['direction'] = 'desc';
 		$result = $this->Paginator->sortDir();
 		$expected = 'desc';