Merge remote-tracking branch 'origin/3.0' into 3.0-dsn-support

* origin/3.0: (172 commits)
  Consolidate doc block headings.
  Adding a test for cakephp/cakephp#5019 the plugin view file path
  Fixing the view file loading for plugins in View/View.php
  Make method name better represent what it is going to do.
  Don't mutate cwd.
  More doc block corrections.
  Cosolidate doc block headers
  Add FlashComponent property to PHPDoc for Controller class
  Fix doubly inflected variable names in controller task.
  Use chdir() instead of calling multiple commands.
  Add missing 'b' to radio docs
  Fix FormHelper::radio() options docs
  Add test case for quoted strings
  Fix issue in PoFileParser where only slashes from translations of type array are stripped.
  Remove for attributes for other group type inputs.
  Remove meaningless and possibly wrong for attr.
  Fix missing label elements in input(type=radio)
  Fix radio widget and label=false.
  Fix input() making multiple checkboxes.
  Not using union, but OR conditions
  ...

Configure.php

@@ -264,7 +264,7 @@ public static function load($key, $config = 'default', $merge = true) {
  * 'default' adapter is a PhpConfig, the generated file will be a PHP
  * configuration file loadable by the PhpConfig.
  *
- * ## Usage
+ * ### Usage
  *
  * Given that the 'default' engine is an instance of PhpConfig.
  * Save all data in Configure to the file `my_config.php`:

ConventionsTrait.php

@@ -75,13 +75,13 @@ protected function _singularName($name) {
 	}
 
 /**
- * Creates the plural name for views
+ * Creates the plural variable name for views
  *
  * @param string $name Name to use
  * @return string Plural name for views
  */
-	protected function _pluralName($name) {
-		return Inflector::variable(Inflector::pluralize($name));
+	protected function _variableName($name) {
+		return Inflector::variable($name);
 	}
 
 /**

InstanceConfigTrait.php

@@ -122,7 +122,7 @@ protected function _configRead($key) {
  * @param mixed $value Value to write.
  * @param bool $merge Whether to merge or overwrite value.
  * @return void
- * @throws Cake\Core\Exception\Exception if attempting to clobber existing config
+ * @throws \Cake\Core\Exception\Exception if attempting to clobber existing config
  */
 	protected function _configWrite($key, $value, $merge = false) {
 		if (is_string($key) && $value === null) {
@@ -174,7 +174,7 @@ protected function _configWrite($key, $value, $merge = false) {
  *
  * @param string $key Key to delete.
  * @return void
- * @throws Cake\Core\Exception\Exception if attempting to clobber existing config
+ * @throws \Cake\Core\Exception\Exception if attempting to clobber existing config
  */
 	protected function _configDelete($key) {
 		if (strpos($key, '.') === false) {

ObjectRegistry.php

@@ -158,7 +158,7 @@ abstract protected function _create($class, $alias, $config);
  * Get the loaded object list, or get the object instance at a given name.
  *
  * @param null|string $name The object name to get or null.
- * @return array|Helper Either a list of object names, or a loaded object.
+ * @return array|\Cake\View\Helper Either a list of object names, or a loaded object.
  */
 	public function loaded($name = null) {
 		if (!empty($name)) {

Plugin.php

@@ -51,7 +51,7 @@ class Plugin {
  * This method does not configure any autoloaders. That must be done separately either
  * through composer, or your own code during config/bootstrap.php.
  *
- * ## Examples:
+ * ### Examples:
  *
  * `Plugin::load('DebugKit')`
  *
@@ -91,7 +91,7 @@ class Plugin {
  *
  * Will only load the bootstrap for ApiGenerator and only the routes for DebugKit
  *
- * ## Configuration options
+ * ### Configuration options
  *
  * - `bootstrap` - array - Whether or not you want the $plugin/config/bootstrap.php file loaded.
  * - `routes` - boolean - Whether or not you want to load the $plugin/config/routes.php file.
@@ -268,7 +268,6 @@ public static function bootstrap($plugin) {
 		if ($config['bootstrap'] === false) {
 			return false;
 		}
-		$path = static::path($plugin);
 		if ($config['bootstrap'] === true) {
 			return static::_includeFile(
 				$config['configPath'] . 'bootstrap.php',

StaticConfigTrait.php

@@ -35,7 +35,7 @@ trait StaticConfigTrait {
 	protected static $_config = [];
 
 /**
- * This method can be used to define confguration adapters for an application
+ * This method can be used to define configuration adapters for an application
  * or read existing configuration.
  *
  * To change an adapter's configuration at runtime, first drop the adapter and then
@@ -111,7 +111,7 @@ public static function config($key, $config = null) {
  * If the implementing objects supports a `$_registry` object the named configuration
  * will also be unloaded from the registry.
  *
- * @param string $config An existing configuation you wish to remove.
+ * @param string $config An existing configuration you wish to remove.
  * @return bool success of the removal, returns false when the config does not exist.
  */
 	public static function drop($config) {