Merge branch '2.6' into 3.0

Conflicts:
	.travis.yml
	README.md
	app/webroot/index.php
	app/webroot/test.php
	lib/Cake/Console/Command/SchemaShell.php
	lib/Cake/Console/Command/Task/ControllerTask.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
	lib/Cake/Controller/Component/CookieComponent.php
	lib/Cake/Log/CakeLog.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/CakeSession.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
	lib/Cake/Test/Case/Model/ModelWriteTest.php
	lib/Cake/View/Helper/CacheHelper.php
	lib/Cake/View/Helper/TimeHelper.php
	lib/Cake/basics.php
	src/Network/Response.php
	src/Validation/Validation.php

README.md

@@ -1,6 +1,9 @@
 # CakePHP framework
 
 [![CakePHP](http://cakephp.org/img/cake-logo.png)](http://www.cakephp.org)
+[![Bake Status](https://secure.travis-ci.org/cakephp/cakephp.png?branch=3.0)](http://travis-ci.org/cakephp/cakephp)
+[![Latest Stable Version](https://poser.pugx.org/cakephp/cakephp/v/stable.svg)](https://packagist.org/packages/cakephp/cakephp)
+[![License](https://poser.pugx.org/cakephp/cakephp/license.svg)](https://packagist.org/packages/cakephp/cakephp)
 
 CakePHP is a rapid development framework for PHP which uses commonly known
 design patterns like Active Record, Association Data Mapping, Front Controller
@@ -37,8 +40,8 @@ tests for cakephp by doing the following:
 
 See CONTRIBUTING.md for more information.
 
-Some Handy Links
-----------------
+
+## Some Handy Links
 
 [CakePHP](http://www.cakephp.org) - The rapid development PHP framework
 
@@ -58,8 +61,8 @@ Some Handy Links
 
 [Cake Software Foundation](http://cakefoundation.org) - Promoting development related to CakePHP
 
-Get Support!
-------------
+
+## Get Support!
 
 [#cakephp](http://webchat.freenode.net/?channels=#cakephp) on irc.freenode.net - Come chat with us, we have cake
 
@@ -69,6 +72,8 @@ Get Support!
 
 [Roadmaps](https://github.com/cakephp/cakephp/wiki#roadmaps) - Want to contribute? Get involved!
 
-[![Bake Status](https://secure.travis-ci.org/cakephp/cakephp.png?branch=3.0)](http://travis-ci.org/cakephp/cakephp)
+## Contributing
+
+[CONTRIBUTING.md](CONTRIBUTING.md) - Quick pointers for contributing to the CakePHP project
 
-![Cake Power](https://raw.github.com/cakephp/cakephp/master/lib/Cake/Console/Templates/skel/webroot/img/cake.power.gif)
+[CookBook "Contributing" Section (2.x)](http://book.cakephp.org/2.0/en/contributing.html) [(3.0)](http://book.cakephp.org/3.0/en/contributing.html) - Version-specific details about contributing to the project

src/Console/Command/Task/ExtractTask.php

@@ -359,6 +359,13 @@ protected function _extractTokens() {
 			$this->_parse('__d', array('domain', 'singular'));
 			$this->_parse('__dn', array('domain', 'singular', 'plural'));
 			$this->_parse('__x', array('context', 'singular'));
+			$this->_parse('__xn', array('context', 'singular', 'plural'));
+			$this->_parse('__dx', array('domain', 'context', 'singular'));
+			$this->_parse('__dxc', array('domain', 'context', 'singular', 'category'));
+			$this->_parse('__dxn', array('domain', 'context', 'singular', 'plural'));
+			$this->_parse('__dxcn', array('domain', 'context', 'singular', 'plural', 'count', 'category'));
+			$this->_parse('__xc', array('context', 'singular', 'category'));
+
 		}
 	}
 
@@ -382,7 +389,7 @@ protected function _parse($functionName, $map) {
 			}
 
 			list($type, $string, $line) = $countToken;
-			if (($type == T_STRING) && ($string == $functionName) && ($firstParenthesis === '(')) {
+			if (($type == T_STRING) && ($string === $functionName) && ($firstParenthesis === '(')) {
 				$position = $count;
 				$depth = 0;
 

src/Network/Response.php

@@ -601,6 +601,7 @@ public function location($url = null) {
 			return isset($headers['Location']) ? $headers['Location'] : null;
 		}
 		$this->header('Location', $url);
+		return null;
 	}
 
 /**

src/Utility/String.php

@@ -131,21 +131,21 @@ public static function tokenize($data, $separator = ',', $leftBound = '(', $righ
 			}
 			if ($tmpOffset !== -1) {
 				$buffer .= substr($data, $offset, ($tmpOffset - $offset));
-				if (!$depth && $data{$tmpOffset} == $separator) {
+				if (!$depth && $data{$tmpOffset} === $separator) {
 					$results[] = $buffer;
 					$buffer = '';
 				} else {
 					$buffer .= $data{$tmpOffset};
 				}
-				if ($leftBound != $rightBound) {
-					if ($data{$tmpOffset} == $leftBound) {
+				if ($leftBound !== $rightBound) {
+					if ($data{$tmpOffset} === $leftBound) {
 						$depth++;
 					}
-					if ($data{$tmpOffset} == $rightBound) {
+					if ($data{$tmpOffset} === $rightBound) {
 						$depth--;
 					}
 				} else {
-					if ($data{$tmpOffset} == $leftBound) {
+					if ($data{$tmpOffset} === $leftBound) {
 						if (!$open) {
 							$depth++;
 							$open = true;

tests/TestCase/Network/Email/EmailTest.php

@@ -2171,7 +2171,7 @@ protected function _checkContentTransferEncoding($message, $charset) {
 		$result['html'] = false;
 		$length = count($message);
 		for ($i = 0; $i < $length; ++$i) {
-			if ($message[$i] == $boundary) {
+			if ($message[$i] === $boundary) {
 				$flag = false;
 				$type = '';
 				while (!preg_match('/^$/', $message[$i])) {