From 53bcc1550f0fc0d86d7701ddaa174daa7520fe07 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Tue, 13 Dec 2016 22:50:07 -0500
Subject: [PATCH 1/3] Fix PHPCS error.

---
 lib/Cake/Test/Case/Utility/XmlTest.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php
index d0fa9d1d5..a33663f75 100644
--- a/lib/Cake/Test/Case/Utility/XmlTest.php
+++ b/lib/Cake/Test/Case/Utility/XmlTest.php
@@ -402,8 +402,7 @@ XML;
  *
  * @return void
  */
-	public function testFromArrayZeroValue()
-	{
+	public function testFromArrayZeroValue() {
 		$xml = array(
 			'tag' => array(
 				'@' => 0,

From 95cafaec3b4ea6ecfb4560ba539374d7de6e2c00 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Fri, 23 Dec 2016 13:27:15 -0500
Subject: [PATCH 2/3] Update version number to 2.9.4

---
 lib/Cake/VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/VERSION.txt b/lib/Cake/VERSION.txt
index 594316744..ad7257725 100644
--- a/lib/Cake/VERSION.txt
+++ b/lib/Cake/VERSION.txt
@@ -17,4 +17,4 @@
 // @license       http://www.opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-2.9.3
+2.9.4

From e01f5989afa78800bb75a4ac3bc3a8c01b95072f Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Wed, 28 Dec 2016 23:18:30 -0500
Subject: [PATCH 3/3] Use array conditions for joins.

Use array style conditions instead of using lower-level DboSource API
methods to create safe SQL.

Refs #9927
---
 lib/Cake/Model/AclNode.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php
index a689ffe0e..b11d84988 100644
--- a/lib/Cake/Model/AclNode.php
+++ b/lib/Cake/Model/AclNode.php
@@ -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
 					)
 				);