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

fixed unit tests and docs

Browse source
This commit is contained in:
Val Bancer 2017-07-09 19:24:51 +02:00
parent f0bbcb3ffc
commit 794ce22f37
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -216,7 +216,7 @@ class TranslateBehavior extends ModelBehavior {
* *
* @param Model $Model The model being worked on. * @param Model $Model The model being worked on.
* @param array $query The query array to append joins to. * @param array $query The query array to append joins to.
* @param string $addFields The fields being joined. * @param array $addFields The fields being joined.
* @return array The modified query * @return array The modified query
*/ */
protected function _addAllJoins(Model $Model, $query, $addFields) { protected function _addAllJoins(Model $Model, $query, $addFields) {

6
lib/Cake/Test/Case/Model/ModelReadTest.php
View file

@ -6442,7 +6442,7 @@ class ModelReadTest extends BaseModelTest {
'table' => (object)array( 'table' => (object)array(
'tablePrefix' => '', 'tablePrefix' => '',
'table' => 'article_i18n', 'table' => 'article_i18n',
'schemaName' => 'test', 'schemaName' => 'cakephp_test',
), ),
'conditions' => array( 'conditions' => array(
'TranslatedArticle.id' => (object)array( 'TranslatedArticle.id' => (object)array(
@ -6460,7 +6460,7 @@ class ModelReadTest extends BaseModelTest {
'table' => (object)array( 'table' => (object)array(
'tablePrefix' => '', 'tablePrefix' => '',
'table' => 'article_i18n', 'table' => 'article_i18n',
'schemaName' => 'test', 'schemaName' => 'cakephp_test',
), ),
'conditions' => array( 'conditions' => array(
'TranslatedArticle.id' => (object)array( 'TranslatedArticle.id' => (object)array(
@ -6528,7 +6528,7 @@ class ModelReadTest extends BaseModelTest {
'table' => (object)array( 'table' => (object)array(
'tablePrefix' => '', 'tablePrefix' => '',
'table' => 'article_i18n', 'table' => 'article_i18n',
'schemaName' => 'test', 'schemaName' => 'cakephp_test',
), ),
'conditions' => array( 'conditions' => array(
'TranslatedArticle.id' => (object)array( 'TranslatedArticle.id' => (object)array(