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

Merge branch '2.x' into 2.next

Browse source
This commit is contained in:
mark_story 2017-01-03 11:01:04 -05:00
commit 1a8f2202c0
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,7 +102,7 @@ class AclNode extends Model {
'alias' => "{$type}{$i}",
'type' => 'INNER',
'conditions' => array(
$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string')
"{$type}{$i}.alias" => $alias
)
);

3
lib/Cake/Test/Case/Utility/XmlTest.php
View file

@ -402,8 +402,7 @@ XML;
*
* @return void
*/
public function testFromArrayZeroValue()
{
public function testFromArrayZeroValue() {
$xml = array(
'tag' => array(
'@' => 0,