adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2181 from bcrowe/hotfix-classname

Browse source 
Add space between classname(s)
This commit is contained in:
Mark Story 2013-10-23 04:37:23 -07:00
commit b4a0182bf0
17 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/Cake/Console/Command/Task/TestTask.php
View file

@ -295,7 +295,7 @@ class TestTask extends BakeTask {
* *
* @param string $type The Type of object you are generating tests for eg. controller * @param string $type The Type of object you are generating tests for eg. controller
* @param string $class the Classname of the class the test is being generated for. * @param string $class the Classname of the class the test is being generated for.
* @return string Real classname * @return string Real class name
*/ */
public function getRealClassName($type, $class) { public function getRealClassName($type, $class) {
if (strtolower($type) === 'model' || empty($this->classTypes[$type])) { if (strtolower($type) === 'model' || empty($this->classTypes[$type])) {
@ -430,7 +430,7 @@ class TestTask extends BakeTask {
} }
/** /**
* Add classname to the fixture list. * Add class name to the fixture list.
* Sets the app. or plugin.plugin_name. prefix. * Sets the app. or plugin.plugin_name. prefix.
* *
* @param string $name Name of the Model class that a fixture might be required for. * @param string $name Name of the Model class that a fixture might be required for.
@ -476,7 +476,7 @@ class TestTask extends BakeTask {
} }
/** /**
* Generate a constructor code snippet for the type and classname * Generate a constructor code snippet for the type and class name
* *
* @param string $type The Type of object you are generating tests for eg. controller * @param string $type The Type of object you are generating tests for eg. controller
* @param string $fullClassName The Classname of the class the test is being generated for. * @param string $fullClassName The Classname of the class the test is being generated for.
@ -504,7 +504,7 @@ class TestTask extends BakeTask {
} }
/** /**
* Generate the uses() calls for a type & classname * Generate the uses() calls for a type & class name
* *
* @param string $type The Type of object you are generating tests for eg. controller * @param string $type The Type of object you are generating tests for eg. controller
* @param string $realType The package name for the class. * @param string $realType The package name for the class.

6
lib/Cake/Controller/Controller.php
View file

@ -86,7 +86,7 @@ class Controller extends Object implements CakeEventListener {
/** /**
* An array containing the names of helpers this controller uses. The array elements should * An array containing the names of helpers this controller uses. The array elements should
* not contain the "Helper" part of the classname. * not contain the "Helper" part of the class name.
* *
* Example: `public $helpers = array('Html', 'Js', 'Time', 'Ajax');` * Example: `public $helpers = array('Html', 'Js', 'Time', 'Ajax');`
* *
@ -114,7 +114,7 @@ class Controller extends Object implements CakeEventListener {
public $response; public $response;
/** /**
* The classname to use for creating the response object. * The class name to use for creating the response object.
* *
* @var string * @var string
*/ */
@ -182,7 +182,7 @@ class Controller extends Object implements CakeEventListener {
/** /**
* Array containing the names of components this controller uses. Component names * Array containing the names of components this controller uses. Component names
* should not contain the "Component" portion of the classname. * should not contain the "Component" portion of the class name.
* *
* Example: `public $components = array('Session', 'RequestHandler', 'Acl');` * Example: `public $components = array('Session', 'RequestHandler', 'Acl');`
* *

2
lib/Cake/Log/CakeLog.php
View file

@ -192,7 +192,7 @@ class CakeLog {
throw new CakeLogException(__d('cake_dev', 'Invalid key name')); throw new CakeLogException(__d('cake_dev', 'Invalid key name'));
} }
if (empty($config['engine'])) { if (empty($config['engine'])) {
throw new CakeLogException(__d('cake_dev', 'Missing logger classname')); throw new CakeLogException(__d('cake_dev', 'Missing logger class name'));
} }
if (empty(self::$_Collection)) { if (empty(self::$_Collection)) {
self::_init(); self::_init();

8
lib/Cake/Model/Model.php
View file

@ -294,7 +294,7 @@ class Model extends Object implements CakeEventListener {
* *
* ### Possible keys in association * ### Possible keys in association
* *
* - `className`: the classname of the model being associated to the current model. * - `className`: the class name of the model being associated to the current model.
* If you're defining a 'Profile belongsTo User' relationship, the className key should equal 'User.' * If you're defining a 'Profile belongsTo User' relationship, the className key should equal 'User.'
* - `foreignKey`: the name of the foreign key found in the current model. This is * - `foreignKey`: the name of the foreign key found in the current model. This is
* especially handy if you need to define multiple belongsTo relationships. The default * especially handy if you need to define multiple belongsTo relationships. The default
@ -341,7 +341,7 @@ class Model extends Object implements CakeEventListener {
* *
* ### Possible keys in association * ### Possible keys in association
* *
* - `className`: the classname of the model being associated to the current model. * - `className`: the class name of the model being associated to the current model.
* If you're defining a 'User hasOne Profile' relationship, the className key should equal 'Profile.' * If you're defining a 'User hasOne Profile' relationship, the className key should equal 'Profile.'
* - `foreignKey`: the name of the foreign key found in the other model. This is * - `foreignKey`: the name of the foreign key found in the other model. This is
* especially handy if you need to define multiple hasOne relationships. * especially handy if you need to define multiple hasOne relationships.
@ -384,7 +384,7 @@ class Model extends Object implements CakeEventListener {
* *
* ### Possible keys in association * ### Possible keys in association
* *
* - `className`: the classname of the model being associated to the current model. * - `className`: the class name of the model being associated to the current model.
* If you're defining a 'User hasMany Comment' relationship, the className key should equal 'Comment.' * If you're defining a 'User hasMany Comment' relationship, the className key should equal 'Comment.'
* - `foreignKey`: the name of the foreign key found in the other model. This is * - `foreignKey`: the name of the foreign key found in the other model. This is
* especially handy if you need to define multiple hasMany relationships. The default * especially handy if you need to define multiple hasMany relationships. The default
@ -435,7 +435,7 @@ class Model extends Object implements CakeEventListener {
* *
* ### Possible keys in association * ### Possible keys in association
* *
* - `className`: the classname of the model being associated to the current model. * - `className`: the class name of the model being associated to the current model.
* If you're defining a 'Recipe HABTM Tag' relationship, the className key should equal 'Tag.' * If you're defining a 'Recipe HABTM Tag' relationship, the className key should equal 'Tag.'
* - `joinTable`: The name of the join table used in this association (if the * - `joinTable`: The name of the join table used in this association (if the
* current table doesn't adhere to the naming convention for HABTM join tables). * current table doesn't adhere to the naming convention for HABTM join tables).

2
lib/Cake/Network/Email/CakeEmail.php
View file

@ -326,7 +326,7 @@ class CakeEmail {
protected $_emailPattern = null; protected $_emailPattern = null;
/** /**
* The classname used for email configuration. * The class name used for email configuration.
* *
* @var string * @var string
*/ */

2
lib/Cake/Network/Http/HttpSocket.php
View file

@ -78,7 +78,7 @@ class HttpSocket extends CakeSocket {
public $response = null; public $response = null;
/** /**
* Response classname * Response class name
* *
* @var string * @var string
*/ */

2
lib/Cake/Routing/Dispatcher.php
View file

@ -238,7 +238,7 @@ class Dispatcher implements CakeEventListener {
} }
/** /**
* Load controller and return controller classname * Load controller and return controller class name
* *
* @param CakeRequest $request * @param CakeRequest $request
* @return string|boolean Name of controller class name * @return string|boolean Name of controller class name

2
lib/Cake/Test/Case/Console/Command/SchemaShellTest.php
View file

@ -587,7 +587,7 @@ class SchemaShellTest extends CakeTestCase {
/** /**
* test that passing name and file creates the passed filename with the * test that passing name and file creates the passed filename with the
* passed classname * passed class name
* *
* @return void * @return void
*/ */

6
lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
View file

@ -324,7 +324,7 @@ class TestTaskTest extends CakeTestCase {
} }
/** /**
* test that getClassName returns the user choice as a classname. * test that getClassName returns the user choice as a class name.
* *
* @return void * @return void
*/ */
@ -359,7 +359,7 @@ class TestTaskTest extends CakeTestCase {
} }
/** /**
* test that resolving classnames works * test that resolving class names works
* *
* @return void * @return void
*/ */
@ -394,7 +394,7 @@ class TestTaskTest extends CakeTestCase {
/** /**
* test baking files. The conditionally run tests are known to fail in PHP4 * test baking files. The conditionally run tests are known to fail in PHP4
* as PHP4 classnames are all lower case, breaking the plugin path inflection. * as PHP4 class names are all lower case, breaking the plugin path inflection.
* *
* @return void * @return void
*/ */

2
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -27,7 +27,7 @@ App::uses('CakeEmail', 'Network/Email');
class TestCakeEmail extends CakeEmail { class TestCakeEmail extends CakeEmail {
/** /**
* Config classname. * Config class name.
* *
* Use a the testing config class in this file. * Use a the testing config class in this file.
* *

2
lib/Cake/TestSuite/CakeTestSuiteCommand.php
View file

@ -55,7 +55,7 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command {
} }
/** /**
* Ugly hack to get around PHPUnit having a hard coded classname for the Runner. :( * Ugly hack to get around PHPUnit having a hard coded class name for the Runner. :(
* *
* @param array $argv * @param array $argv
* @param boolean $exit * @param boolean $exit

2
lib/Cake/TestSuite/Coverage/HtmlCoverageReport.php
View file

@ -105,7 +105,7 @@ HTML;
} }
/** /**
* Guess the classname the test was for based on the test case filename. * Guess the class name the test was for based on the test case filename.
* *
* @param ReflectionClass $testReflection. * @param ReflectionClass $testReflection.
* @return string Possible test subject name. * @return string Possible test subject name.

2
lib/Cake/Utility/Debugger.php
View file

@ -805,7 +805,7 @@ class Debugger {
} }
/** /**
* Get the type of the given variable. Will return the classname * Get the type of the given variable. Will return the class name
* for objects. * for objects.
* *
* @param mixed $var The variable to get the type of * @param mixed $var The variable to get the type of

2
lib/Cake/View/Helper.php
View file

@ -780,7 +780,7 @@ class Helper extends Object {
* Adds the given class to the element options * Adds the given class to the element options
* *
* @param array $options Array options/attributes to add a class to * @param array $options Array options/attributes to add a class to
* @param string $class The classname being added. * @param string $class The class name being added.
* @param string $key the key to use for class. * @param string $key the key to use for class.
* @return array Array of options with $key set. * @return array Array of options with $key set.
*/ */

6
lib/Cake/View/Helper/FormHelper.php
View file

@ -650,7 +650,7 @@ class FormHelper extends AppHelper {
* - `escape` boolean - Whether or not to html escape the contents of the error. * - `escape` boolean - Whether or not to html escape the contents of the error.
* - `wrap` mixed - Whether or not the error message should be wrapped in a div. If a * - `wrap` mixed - Whether or not the error message should be wrapped in a div. If a
* string, will be used as the HTML tag to use. * string, will be used as the HTML tag to use.
* - `class` string - The classname for the error message * - `class` string - The class name for the error message
* *
* @param string $field A field name, like "Modelname.fieldname" * @param string $field A field name, like "Modelname.fieldname"
* @param string|array $text Error message as string or array of messages. * @param string|array $text Error message as string or array of messages.
@ -836,7 +836,7 @@ class FormHelper extends AppHelper {
* @param array $blacklist A simple array of fields to not create inputs for. * @param array $blacklist A simple array of fields to not create inputs for.
* @param array $options Options array. Valid keys are: * @param array $options Options array. Valid keys are:
* - `fieldset` Set to false to disable the fieldset. If a string is supplied it will be used as * - `fieldset` Set to false to disable the fieldset. If a string is supplied it will be used as
* the classname for the fieldset element. * the class name for the fieldset element.
* - `legend` Set to false to disable the legend for the generated input set. Or supply a string * - `legend` Set to false to disable the legend for the generated input set. Or supply a string
* to customize the legend text. * to customize the legend text.
* @return string Completed form inputs. * @return string Completed form inputs.
@ -1913,7 +1913,7 @@ class FormHelper extends AppHelper {
* that string is displayed as the empty element. * that string is displayed as the empty element.
* - `escape` - If true contents of options will be HTML entity encoded. Defaults to true. * - `escape` - If true contents of options will be HTML entity encoded. Defaults to true.
* - `value` The selected value of the input. * - `value` The selected value of the input.
* - `class` - When using multiple = checkbox the classname to apply to the divs. Defaults to 'checkbox'. * - `class` - When using multiple = checkbox the class name to apply to the divs. Defaults to 'checkbox'.
* - `disabled` - Control the disabled attribute. When creating a select box, set to true to disable the * - `disabled` - Control the disabled attribute. When creating a select box, set to true to disable the
* select box. When creating checkboxes, `true` will disable all checkboxes. You can also set disabled * select box. When creating checkboxes, `true` will disable all checkboxes. You can also set disabled
* to a list of values you want to disable when creating checkboxes. * to a list of values you want to disable when creating checkboxes.

2
lib/Cake/View/Helper/TimeHelper.php
View file

@ -351,7 +351,7 @@ class TimeHelper extends AppHelper {
* - `element` - The element to wrap the formatted time in. * - `element` - The element to wrap the formatted time in.
* Has a few additional options: * Has a few additional options:
* - `tag` - The tag to use, defaults to 'span'. * - `tag` - The tag to use, defaults to 'span'.
* - `class` - The classname to use, defaults to `time-ago-in-words`. * - `class` - The class name to use, defaults to `time-ago-in-words`.
* - `title` - Defaults to the $dateTime input. * - `title` - Defaults to the $dateTime input.
* *
* @param integer|string|DateTime $dateTime UNIX timestamp, strtotime() valid string or DateTime object * @param integer|string|DateTime $dateTime UNIX timestamp, strtotime() valid string or DateTime object

4
lib/Cake/basics.php
View file

@ -205,7 +205,7 @@ if (!function_exists('h')) {
if (!function_exists('pluginSplit')) { if (!function_exists('pluginSplit')) {
/** /**
* Splits a dot syntax plugin name into its plugin and classname. * Splits a dot syntax plugin name into its plugin and class name.
* If $name does not have a dot, then index 0 will be null. * If $name does not have a dot, then index 0 will be null.
* *
* Commonly used like `list($plugin, $name) = pluginSplit($name);` * Commonly used like `list($plugin, $name) = pluginSplit($name);`
@ -213,7 +213,7 @@ if (!function_exists('pluginSplit')) {
* @param string $name The name you want to plugin split. * @param string $name The name you want to plugin split.
* @param boolean $dotAppend Set to true if you want the plugin to have a '.' appended to it. * @param boolean $dotAppend Set to true if you want the plugin to have a '.' appended to it.
* @param string $plugin Optional default plugin to use if no plugin is found. Defaults to null. * @param string $plugin Optional default plugin to use if no plugin is found. Defaults to null.
* @return array Array with 2 indexes. 0 => plugin name, 1 => classname * @return array Array with 2 indexes. 0 => plugin name, 1 => class name
* @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pluginSplit * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#pluginSplit
*/ */
function pluginSplit($name, $dotAppend = false, $plugin = null) { function pluginSplit($name, $dotAppend = false, $plugin = null) {