Correct doc block return types.
Wording correction.
Merge pull request #5084 from cakephp/master-docblock-return

Correct doc block return types.
Merge branch 'master' into 2.6
Update return type for Model::saveField().

Fixes #5086
Fix HttpSocket mishandling encoded URIs

The HTTP specs seem to indicate that the Location header should contain
an 'absoluteURI' which includes encoded data. In order to avoid
a regression with the issue fixed in b9ee4fc9f1abd1639bc20a5536f87ad7a5318dea
we'll continue to replace `%2F` and no longer decode the entire URI.

Fixes #5076
Merge pull request #5096 from cakephp/issue-5076

Fix HttpSocket mishandling encoded URIs
Merge branch 'master' into 2.6
Merge branch '2.6' of github.com:cakephp/cakephp into 2.6
Update version number to 2.5.6
Update version number to 2.6.0-RC1
Simplification of return types. No need to return more mixed than necessary.
Merge pull request #5093 from cakephp/2.6-returns

Simplify return types.

Update code to use documented return types where possible, and reduce number of return types.
Make unsetting the email pattern work as expected.

When set to `null`, only `filter_var()` should be used. This is a
partial backport of #5111
Merge pull request #5119 from ndm2/fix-unset-email-pattern

Make unsetting the email pattern work as expected.
Clean up formatting and make a failure exit non-zero.

Console tools should exit non-zero when a comman fails.

Refs #4993
Remove singularization on schema class names.

Using camelize() does the transformation we want without also
singularizing the name. This makes user input more transparent and fixes
issues around plugin schemas with plural names.

Refs #4993
Merge pull request #5123 from cakephp/issue-4993

Remove singularization on schema class names
Merge branch 'master' into 2.6

Conflicts:
	lib/Cake/VERSION.txt
Correct assert argument order.