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

Additional Cake references to CakePHP and docblock typo

Browse source
This commit is contained in:
Bryan Crowe 2013-10-09 19:38:16 -04:00
parent ce1939c4d6
commit 4242bd4f3d
17 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -11,7 +11,7 @@ Some Handy Links
[CakePHP](http://www.cakephp.org) - The rapid development PHP framework [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 [Plugins](http://plugins.cakephp.org/) - A repository of extensions to the framework

2
app/Config/acl.php
View file

@ -2,7 +2,7 @@
/** /**
* This is the PHP base ACL configuration file. * 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 * PHP 5
* *

4
app/View/Pages/home.ctp
View file

@ -111,11 +111,11 @@ if (isset($filePresent)):
<?php <?php
if ($connected && $connected->isConnected()): if ($connected && $connected->isConnected()):
echo '<span class="notice success">'; 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>'; echo '</span>';
else: else:
echo '<span class="notice">'; 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 '<br /><br />';
echo $errorMsg; echo $errorMsg;
echo '</span>'; echo '</span>';

2
lib/Cake/Console/Command/AclShell.php
View file

@ -76,7 +76,7 @@ class AclShell extends AppShell {
App::uses($class, $plugin . 'Controller/Component/Acl'); App::uses($class, $plugin . 'Controller/Component/Acl');
if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) { if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) {
$out = "--------------------------------------------------\n"; $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 .= __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 .= "--------------------------------------------------\n";
$out .= __d('cake_console', 'Current ACL Classname: %s', $class) . "\n"; $out .= __d('cake_console', 'Current ACL Classname: %s', $class) . "\n";

2
lib/Cake/Console/ShellDispatcher.php
View file

@ -98,7 +98,7 @@ class ShellDispatcher {
*/ */
protected function _initEnvironment() { protected function _initEnvironment() {
if (!$this->_bootstrap()) { 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); throw new CakeException($message);
} }

2
lib/Cake/Console/Templates/skel/Config/acl.ini.php
View file

@ -10,7 +10,7 @@
; * @since CakePHP(tm) v 0.10.0.1076 ; * @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. ; Use this file to specify user permissions.
; aco = access control object (something in your application) ; aco = access control object (something in your application)

2
lib/Cake/Console/Templates/skel/Config/acl.php
View file

@ -2,7 +2,7 @@
/** /**
* This is the PHP base ACL configuration file. * 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 * PHP 5
* *

4
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
View file

@ -111,11 +111,11 @@ if (isset($filePresent)):
<?php <?php
if ($connected && $connected->isConnected()): if ($connected && $connected->isConnected()):
echo '<span class="notice success">'; 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>'; echo '</span>';
else: else:
echo '<span class="notice">'; 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 '<br /><br />';
echo $errorMsg; echo $errorMsg;
echo '</span>'; echo '</span>';

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

@ -713,7 +713,7 @@ class Controller extends Object implements CakeEventListener {
/** /**
* Loads and instantiates models required by this controller. * 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. * dynamic models for the time being.
* *
* @param string $modelClass Name of model class to load * @param string $modelClass Name of model class to load

2
lib/Cake/Core/Configure.php
View file

@ -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. * possible to store `null` values in Configure.
* *
* Usage: * Usage:

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

@ -2,7 +2,7 @@
/** /**
* Object-relational mapper. * 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 * PHP 5
* *

2
lib/Cake/Model/ModelBehavior.php
View file

@ -2,7 +2,7 @@
/** /**
* Model behaviors base class. * Model behaviors base class.
* *
* Adds methods and automagic functionality to Cake Models. * Adds methods and automagic functionality to CakePHP Models.
* *
* PHP 5 * PHP 5
* *

4
lib/Cake/Network/CakeSocket.php
View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Cake Socket connection class. * CakePHP Socket connection class.
* *
* PHP 5 * PHP 5
* *
@ -21,7 +21,7 @@
App::uses('Validation', 'Utility'); App::uses('Validation', 'Utility');
/** /**
* Cake network socket connection class. * CakePHP network socket connection class.
* *
* Core base class for network communication. * Core base class for network communication.
* *

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

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Cake E-Mail * CakePHP Email
* *
* PHP 5 * PHP 5
* *
@ -26,7 +26,7 @@ App::uses('String', 'Utility');
App::uses('View', 'View'); App::uses('View', 'View');
/** /**
* Cake e-mail class. * CakePHP email class.
* *
* This class is used for handling Internet Message Format based * This class is used for handling Internet Message Format based
* based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt * based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt

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

@ -23,7 +23,7 @@ App::uses('Router', 'Routing');
App::uses('Hash', 'Utility'); 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 * Core base class for HTTP network communication. HttpSocket can be used as an
* Object Oriented replacement for cURL in many places. * Object Oriented replacement for cURL in many places.

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

@ -372,7 +372,7 @@ class Router {
* routes that end in `*` are greedy. As you can remap URLs and not loose any passed/named args. * 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 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 * @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 * 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. * shifted into the passed arguments. As well as supplying patterns for routing parameters.

2
lib/Cake/basics.php
View file

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Basic Cake functionality. * Basic CakePHP functionality.
* *
* Core functions for including other source files, loading models and so forth. * Core functions for including other source files, loading models and so forth.
* *