Merge pull request #1689 from dereuromark/master-cakephp-name

Cake to CakePHP name
This commit is contained in:
Frank de Graaf 2013-09-27 12:16:25 -07:00
commit 3e8af8b180
10 changed files with 12 additions and 12 deletions

View file

@ -17,7 +17,7 @@ Some Handy Links
[The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles [The Bakery](http://bakery.cakephp.org) - Tips, tutorials and articles
[API](http://api.cakephp.org) - A reference to Cake's classes [API](http://api.cakephp.org) - A reference to CakePHP's classes
[CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials [CakePHP TV](http://tv.cakephp.org) - Screen casts from events and video tutorials

View file

@ -23,7 +23,7 @@
*/ */
/** /**
* Get Cake's root directory * Get CakePHP's root directory
*/ */
define('APP_DIR', 'app'); define('APP_DIR', 'app');
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);

View file

@ -207,7 +207,7 @@ class Controller extends Object implements CakeEventListener {
public $View; public $View;
/** /**
* File extension for view templates. Defaults to Cake's conventional ".ctp". * File extension for view templates. Defaults to CakePHP's conventional ".ctp".
* *
* @var string * @var string
*/ */

View file

@ -3,7 +3,7 @@
* Dispatcher takes the URL information, parses it for parameters and * Dispatcher takes the URL information, parses it for parameters and
* tells the involved controllers what to do. * tells the involved controllers what to do.
* *
* This is the heart of Cake's operation. * This is the heart of CakePHP's operation.
* *
* PHP 5 * PHP 5
* *

View file

@ -3477,7 +3477,7 @@ class ContainableBehaviorTest extends CakeTestCase {
'joinTable' => 'articles_tags', 'joinTable' => 'articles_tags',
'foreignKey' => 'article_id', 'foreignKey' => 'article_id',
'associationForeignKey' => 'tag_id', 'associationForeignKey' => 'tag_id',
// LENGHT function mysql-only, using LIKE does almost the same // LENGTH function mysql-only, using LIKE does almost the same
'conditions' => "ShortTag.tag LIKE '???'" 'conditions' => "ShortTag.tag LIKE '???'"
) )
) )

View file

@ -42,7 +42,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader {
} }
/** /**
* Convert path fragments used by Cake's test runner to absolute paths that can be fed to PHPUnit. * Convert path fragments used by CakePHP's test runner to absolute paths that can be fed to PHPUnit.
* *
* @param string $filePath * @param string $filePath
* @param string $params * @param string $params

View file

@ -22,14 +22,14 @@ require_once 'PHPUnit/TextUI/TestRunner.php';
App::uses('CakeFixtureManager', 'TestSuite/Fixture'); App::uses('CakeFixtureManager', 'TestSuite/Fixture');
/** /**
* A custom test runner for Cake's use of PHPUnit. * A custom test runner for CakePHP's use of PHPUnit.
* *
* @package Cake.TestSuite * @package Cake.TestSuite
*/ */
class CakeTestRunner extends PHPUnit_TextUI_TestRunner { class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
/** /**
* Lets us pass in some options needed for cake's webrunner. * Lets us pass in some options needed for CakePHP's webrunner.
* *
* @param mixed $loader * @param mixed $loader
* @param array $params list of options to be used for this run * @param array $params list of options to be used for this run

View file

@ -32,7 +32,7 @@ class CakeTestFixture {
public $name = null; public $name = null;
/** /**
* Cake's DBO driver (e.g: DboMysql). * CakePHP's DBO driver (e.g: DboMysql).
* *
* @var object * @var object
*/ */

View file

@ -18,7 +18,7 @@
* Pluralize and singularize English words. * Pluralize and singularize English words.
* *
* Inflector pluralizes and singularizes English nouns. * Inflector pluralizes and singularizes English nouns.
* Used by Cake's naming conventions throughout the framework. * Used by CakePHP's naming conventions throughout the framework.
* *
* @package Cake.Utility * @package Cake.Utility
* @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html * @link http://book.cakephp.org/2.0/en/core-utility-libraries/inflector.html

View file

@ -136,7 +136,7 @@ class View extends Object {
public $layoutPath = null; public $layoutPath = null;
/** /**
* Turns on or off Cake's conventional mode of applying layout files. On by default. * Turns on or off CakePHP's conventional mode of applying layout files. On by default.
* Setting to off means that layouts will not be automatically applied to rendered views. * Setting to off means that layouts will not be automatically applied to rendered views.
* *
* @var boolean * @var boolean
@ -144,7 +144,7 @@ class View extends Object {
public $autoLayout = true; public $autoLayout = true;
/** /**
* File extension. Defaults to Cake's template ".ctp". * File extension. Defaults to CakePHP's template ".ctp".
* *
* @var string * @var string
*/ */