From 4242bd4f3d4ae8ee1bcaf0bcc278e2af06141e44 Mon Sep 17 00:00:00 2001 From: Bryan Crowe Date: Wed, 9 Oct 2013 19:38:16 -0400 Subject: [PATCH 1/2] Additional Cake references to CakePHP and docblock typo --- README.md | 2 +- app/Config/acl.php | 2 +- app/View/Pages/home.ctp | 4 ++-- lib/Cake/Console/Command/AclShell.php | 2 +- lib/Cake/Console/ShellDispatcher.php | 2 +- lib/Cake/Console/Templates/skel/Config/acl.ini.php | 2 +- lib/Cake/Console/Templates/skel/Config/acl.php | 2 +- lib/Cake/Console/Templates/skel/View/Pages/home.ctp | 4 ++-- lib/Cake/Controller/Controller.php | 2 +- lib/Cake/Core/Configure.php | 2 +- lib/Cake/Model/Model.php | 2 +- lib/Cake/Model/ModelBehavior.php | 2 +- lib/Cake/Network/CakeSocket.php | 4 ++-- lib/Cake/Network/Email/CakeEmail.php | 4 ++-- lib/Cake/Network/Http/HttpSocket.php | 2 +- lib/Cake/Routing/Router.php | 2 +- lib/Cake/basics.php | 2 +- 17 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 7f178f870..54520d713 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Some Handy Links [CakePHP](http://www.cakephp.org) - The rapid development PHP framework -[Cookbook](http://book.cakephp.org) - THE Cake user documentation; start learning here! +[Cookbook](http://book.cakephp.org) - THE CakePHP user documentation; start learning here! [Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework diff --git a/app/Config/acl.php b/app/Config/acl.php index 2a2d6fd0d..33e29af5b 100644 --- a/app/Config/acl.php +++ b/app/Config/acl.php @@ -2,7 +2,7 @@ /** * This is the PHP base ACL configuration file. * - * Use it to configure access control of your Cake application. + * Use it to configure access control of your CakePHP application. * * PHP 5 * diff --git a/app/View/Pages/home.ctp b/app/View/Pages/home.ctp index d6b365a62..0e4ccb0f5 100644 --- a/app/View/Pages/home.ctp +++ b/app/View/Pages/home.ctp @@ -111,11 +111,11 @@ if (isset($filePresent)): isConnected()): echo ''; - echo __d('cake_dev', 'Cake is able to connect to the database.'); + echo __d('cake_dev', 'CakePHP is able to connect to the database.'); echo ''; else: echo ''; - echo __d('cake_dev', 'Cake is NOT able to connect to the database.'); + echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.'); echo '

'; echo $errorMsg; echo ''; diff --git a/lib/Cake/Console/Command/AclShell.php b/lib/Cake/Console/Command/AclShell.php index 081eaf349..9291ee99d 100644 --- a/lib/Cake/Console/Command/AclShell.php +++ b/lib/Cake/Console/Command/AclShell.php @@ -76,7 +76,7 @@ class AclShell extends AppShell { App::uses($class, $plugin . 'Controller/Component/Acl'); if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) { $out = "--------------------------------------------------\n"; - $out .= __d('cake_console', 'Error: Your current Cake configuration is set to an ACL implementation other than DB.') . "\n"; + $out .= __d('cake_console', 'Error: Your current CakePHP configuration is set to an ACL implementation other than DB.') . "\n"; $out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script') . "\n"; $out .= "--------------------------------------------------\n"; $out .= __d('cake_console', 'Current ACL Classname: %s', $class) . "\n"; diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php index b9841744d..f9257344d 100644 --- a/lib/Cake/Console/ShellDispatcher.php +++ b/lib/Cake/Console/ShellDispatcher.php @@ -98,7 +98,7 @@ class ShellDispatcher { */ protected function _initEnvironment() { if (!$this->_bootstrap()) { - $message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'Cake exists in ' . CAKE_CORE_INCLUDE_PATH; + $message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'CakePHP exists in ' . CAKE_CORE_INCLUDE_PATH; throw new CakeException($message); } diff --git a/lib/Cake/Console/Templates/skel/Config/acl.ini.php b/lib/Cake/Console/Templates/skel/Config/acl.ini.php index 4d0c18536..8c094167f 100644 --- a/lib/Cake/Console/Templates/skel/Config/acl.ini.php +++ b/lib/Cake/Console/Templates/skel/Config/acl.ini.php @@ -10,7 +10,7 @@ ; * @since CakePHP(tm) v 0.10.0.1076 ; */ -; acl.ini.php - Cake ACL Configuration +; acl.ini.php - CakePHP ACL Configuration ; --------------------------------------------------------------------- ; Use this file to specify user permissions. ; aco = access control object (something in your application) diff --git a/lib/Cake/Console/Templates/skel/Config/acl.php b/lib/Cake/Console/Templates/skel/Config/acl.php index 7db424e99..2829e69cd 100644 --- a/lib/Cake/Console/Templates/skel/Config/acl.php +++ b/lib/Cake/Console/Templates/skel/Config/acl.php @@ -2,7 +2,7 @@ /** * This is the PHP base ACL configuration file. * - * Use it to configure access control of your Cake application. + * Use it to configure access control of your CakePHP application. * * PHP 5 * diff --git a/lib/Cake/Console/Templates/skel/View/Pages/home.ctp b/lib/Cake/Console/Templates/skel/View/Pages/home.ctp index d6b365a62..0e4ccb0f5 100644 --- a/lib/Cake/Console/Templates/skel/View/Pages/home.ctp +++ b/lib/Cake/Console/Templates/skel/View/Pages/home.ctp @@ -111,11 +111,11 @@ if (isset($filePresent)): isConnected()): echo ''; - echo __d('cake_dev', 'Cake is able to connect to the database.'); + echo __d('cake_dev', 'CakePHP is able to connect to the database.'); echo ''; else: echo ''; - echo __d('cake_dev', 'Cake is NOT able to connect to the database.'); + echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.'); echo '

'; echo $errorMsg; echo ''; diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index c3cbe0cb8..c8528cbc8 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -713,7 +713,7 @@ class Controller extends Object implements CakeEventListener { /** * Loads and instantiates models required by this controller. - * If the model is non existent, it will throw a missing database table error, as Cake generates + * If the model is non existent, it will throw a missing database table error, as CakePHP generates * dynamic models for the time being. * * @param string $modelClass Name of model class to load diff --git a/lib/Cake/Core/Configure.php b/lib/Cake/Core/Configure.php index 666de9429..9c06cd777 100644 --- a/lib/Cake/Core/Configure.php +++ b/lib/Cake/Core/Configure.php @@ -169,7 +169,7 @@ class Configure { } /** - * Used to read information stored in Configure. Its not + * Used to read information stored in Configure. It's not * possible to store `null` values in Configure. * * Usage: diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php index 670b71a6d..48b9591e2 100644 --- a/lib/Cake/Model/Model.php +++ b/lib/Cake/Model/Model.php @@ -2,7 +2,7 @@ /** * Object-relational mapper. * - * DBO-backed object data model, for mapping database tables to Cake objects. + * DBO-backed object data model, for mapping database tables to CakePHP objects. * * PHP 5 * diff --git a/lib/Cake/Model/ModelBehavior.php b/lib/Cake/Model/ModelBehavior.php index ae3ef292a..500c22c10 100644 --- a/lib/Cake/Model/ModelBehavior.php +++ b/lib/Cake/Model/ModelBehavior.php @@ -2,7 +2,7 @@ /** * Model behaviors base class. * - * Adds methods and automagic functionality to Cake Models. + * Adds methods and automagic functionality to CakePHP Models. * * PHP 5 * diff --git a/lib/Cake/Network/CakeSocket.php b/lib/Cake/Network/CakeSocket.php index 58ce159d4..a06c38c50 100644 --- a/lib/Cake/Network/CakeSocket.php +++ b/lib/Cake/Network/CakeSocket.php @@ -1,6 +1,6 @@ Date: Wed, 9 Oct 2013 23:41:15 -0400 Subject: [PATCH 2/2] Revert Cake to CakePHP in ShellDispatcher::_initEnvironment() --- lib/Cake/Console/ShellDispatcher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Cake/Console/ShellDispatcher.php b/lib/Cake/Console/ShellDispatcher.php index f9257344d..b9841744d 100644 --- a/lib/Cake/Console/ShellDispatcher.php +++ b/lib/Cake/Console/ShellDispatcher.php @@ -98,7 +98,7 @@ class ShellDispatcher { */ protected function _initEnvironment() { if (!$this->_bootstrap()) { - $message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'CakePHP exists in ' . CAKE_CORE_INCLUDE_PATH; + $message = "Unable to load CakePHP core.\nMake sure " . DS . 'lib' . DS . 'Cake exists in ' . CAKE_CORE_INCLUDE_PATH; throw new CakeException($message); }