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

Fix a few code standards errors.

Browse source
This commit is contained in:
mark_story 2012-04-06 22:56:01 -04:00
parent ff35762e92
commit a24aca6ffc
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ class ShellDispatcher {
include_once CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'Config' . DS . 'core.php';
App::build();
}
$this->setErrorHandlers();
if (!defined('FULL_BASE_URL')) {

4
lib/Cake/Model/Datasource/DboSource.php
View file

@ -1168,7 +1168,7 @@ class DboSource extends DataSource {
* @return mixed
* @throws CakeException when results cannot be created.
*/
public function queryAssociation(Model $model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
public function queryAssociation(Model $model, &$linkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet, $recursive, $stack) {
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!is_array($resultSet)) {
throw new CakeException(__d('cake_dev', 'Error in Model %s', get_class($model)));
@ -1453,7 +1453,7 @@ class DboSource extends DataSource {
* @param array $resultSet
* @return mixed
*/
public function generateAssociationQuery(Model $model, $linkModel, $type, $association = null, $assocData = array(), &$queryData, $external = false, &$resultSet) {
public function generateAssociationQuery(Model $model, $linkModel, $type, $association, $assocData, &$queryData, $external, &$resultSet) {
$queryData = $this->_scrubQueryData($queryData);
$assocData = $this->_scrubQueryData($assocData);
$modelAlias = $model->alias;

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

@ -496,7 +496,6 @@ class CakeEmail {
return $this->headerCharset = $charset;
}
/**
* Set email
*

2
lib/Cake/Test/Case/Utility/StringTest.php
View file

@ -454,7 +454,7 @@ podeís adquirirla.</span></p>
$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
$expected = '<b>This</b> is a test <b>text</b>';
$this->assertEquals($expected, $result);
$phrases = array('is', 'text');
$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>', 'regex' => "|\b%s\b|iu"));
$expected = 'This <b>is</b> a test <b>text</b>';