Merge branch 'master' into 2.6

.gitattributes

@@ -31,4 +31,5 @@
 *.jpg binary
 *.gif binary
 *.ico binary
-*.mo binary
+*.mo binary
+*.pdf binary

app/Controller/PagesController.php

@@ -40,7 +40,6 @@ class PagesController extends AppController {
 /**
  * Displays a view
  *
- * @param mixed What page to display
  * @return void
  * @throws NotFoundException When the view file could not be found
  *	or MissingViewException in debug mode.

lib/Cake/Console/Command/Task/ViewTask.php

@@ -206,7 +206,7 @@ class ViewTask extends BakeTask {
 		$this->Controller->connection = $this->connection;
 		$this->controllerName = $this->Controller->getName();
 
-		$prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", $this->controllerName);
+		$prompt = __d('cake_console', "Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if they exist.", $this->controllerName);
 		$interactive = $this->in($prompt, array('y', 'n'), 'n');
 
 		if (strtolower($interactive) === 'n') {

lib/Cake/Controller/Component/Auth/DigestAuthenticate.php

@@ -162,7 +162,7 @@ class DigestAuthenticate extends BasicAuthenticate {
 		}
 		$keys = $match = array();
 		$req = array('nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1);
-		preg_match_all('/(\w+)=([\'"]?)([a-zA-Z0-9\:\#\%@=.\/_-]+)\2/', $digest, $match, PREG_SET_ORDER);
+		preg_match_all('/(\w+)=([\'"]?)([a-zA-Z0-9\:\#\%\?\&@=\.\/_-]+)\2/', $digest, $match, PREG_SET_ORDER);
 
 		foreach ($match as $i) {
 			$keys[$i[1]] = $i[3];

lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php

@@ -217,7 +217,7 @@ DIGEST;
 			Digest username="Mufasa",
 			realm="testrealm@host.com",
 			nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
-			uri="/dir/index.html",
+			uri="/dir/index.html?query=string&value=some%20value",
 			qop=auth,
 			nc=00000001,
 			cnonce="0a4f113b",
@@ -228,7 +228,7 @@ DIGEST;
 			'username' => 'Mufasa',
 			'realm' => 'testrealm@host.com',
 			'nonce' => 'dcd98b7102dd2f0e8b11d0f600bfb0c093',
-			'uri' => '/dir/index.html',
+			'uri' => '/dir/index.html?query=string&value=some%20value',
 			'qop' => 'auth',
 			'nc' => '00000001',
 			'cnonce' => '0a4f113b',

lib/Cake/Utility/CakeTime.php

@@ -357,7 +357,7 @@ class CakeTime {
  *
  * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @param string $format The format to use. If null, `TimeHelper::$niceFormat` is used
+ * @param string $format The format to use. If null, `CakeTime::$niceFormat` is used
  * @return string Formatted date string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::nice
  */