Permalink
Browse files

Additional Cake references to CakePHP and docblock typo

  • Loading branch information...
1 parent ce1939c commit 4242bd4f3d4ae8ee1bcaf0bcc278e2af06141e44 @bcrowe bcrowe committed Oct 9, 2013
View
@@ -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
View
@@ -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
*
@@ -111,11 +111,11 @@ if (isset($filePresent)):
<?php
if ($connected && $connected->isConnected()):
echo '<span class="notice success">';
- 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 '</span>';
else:
echo '<span class="notice">';
- 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 '<br /><br />';
echo $errorMsg;
echo '</span>';
@@ -76,7 +76,7 @@ public function startup() {
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";
@@ -98,7 +98,7 @@ protected function _initConstants() {
*/
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);
}
@@ -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)
@@ -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
*
@@ -111,11 +111,11 @@ if (isset($filePresent)):
<?php
if ($connected && $connected->isConnected()):
echo '<span class="notice success">';
- 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 '</span>';
else:
echo '<span class="notice">';
- 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 '<br /><br />';
echo $errorMsg;
echo '</span>';
@@ -713,7 +713,7 @@ public function httpCodes($code = null) {
/**
* 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
@@ -169,7 +169,7 @@ public static function write($config, $value = null) {
}
/**
- * 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:
@@ -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
*
@@ -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
*
@@ -1,6 +1,6 @@
<?php
/**
- * Cake Socket connection class.
+ * CakePHP Socket connection class.
*
* PHP 5
*
@@ -21,7 +21,7 @@
App::uses('Validation', 'Utility');
/**
- * Cake network socket connection class.
+ * CakePHP network socket connection class.
*
* Core base class for network communication.
*
@@ -1,6 +1,6 @@
<?php
/**
- * Cake E-Mail
+ * CakePHP Email
*
* PHP 5
*
@@ -26,7 +26,7 @@
App::uses('View', 'View');
/**
- * Cake e-mail class.
+ * CakePHP email class.
*
* This class is used for handling Internet Message Format based
* based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt
@@ -23,7 +23,7 @@
App::uses('Hash', 'Utility');
/**
- * Cake network socket connection class.
+ * CakePHP network socket connection class.
*
* Core base class for HTTP network communication. HttpSocket can be used as an
* Object Oriented replacement for cURL in many places.
@@ -372,7 +372,7 @@ public static function connect($route, $defaults = array(), $options = array())
* routes that end in `*` are greedy. As you can remap URLs and not loose any passed/named args.
*
* @param string $route A string describing the template of the route
- * @param array $url A URL to redirect to. Can be a string or a Cake array-based URL
+ * @param array $url A URL to redirect to. Can be a string or a CakePHP array-based URL
* @param array $options An array matching the named elements in the route to regular expressions which that
* element should match. Also contains additional parameters such as which routed parameters should be
* shifted into the passed arguments. As well as supplying patterns for routing parameters.
View
@@ -1,6 +1,6 @@
<?php
/**
- * Basic Cake functionality.
+ * Basic CakePHP functionality.
*
* Core functions for including other source files, loading models and so forth.
*

0 comments on commit 4242bd4

Please sign in to comment.