Merge branch 'local/svn/1.2.x.x' into 1.2

Author: gwoo

cake/basics.php

@@ -810,7 +810,7 @@ function array_diff_key() {
 
 			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

@@ -323,7 +323,7 @@ function loginRequest($options = array()) {
 
 		if (strtolower($options['type']) == 'digest') {
 			$out[] = 'qop="auth"';
-			$out[] = 'nonce="' . uniqid() . '"';
+			$out[] = 'nonce="' . uniqid("") . '"';
 			$out[] = 'opaque="' . md5($options['realm']).'"';
 		}
 

cake/tests/cases/basics.test.php

@@ -54,6 +54,36 @@ function tearDown() {
 		Configure::write('localePaths', $this->_localePaths);
 		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
  *
@@ -110,10 +140,10 @@ function testEnv() {
 
 		$_SERVER['HTTPS'] = 'off';
 		$this->assertFalse(env('HTTPS'));
-		
+
 		$_SERVER['HTTPS'] = false;
 		$this->assertFalse(env('HTTPS'));
-		
+
 		$_SERVER['HTTPS'] = '';
 		$this->assertFalse(env('HTTPS'));
 

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

@@ -363,6 +363,14 @@ function testRequireLogin() {
  * @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/view/helpers/paginator.test.php

@@ -291,7 +291,7 @@ function testSortDir() {
 
 		$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';