From 314f11cb61a98fce96ce3a27c9ba5ec1936413fb Mon Sep 17 00:00:00 2001 From: Mark Story Date: Thu, 2 Nov 2017 21:45:43 -0400 Subject: [PATCH] Add a bit more documentation and fix up tests. --- src/Database/Expression/IdentifierExpression.php | 7 ++++++- tests/TestCase/Database/QueryTest.php | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Database/Expression/IdentifierExpression.php b/src/Database/Expression/IdentifierExpression.php index 7daed9b8ee3..8aa9a209cfe 100644 --- a/src/Database/Expression/IdentifierExpression.php +++ b/src/Database/Expression/IdentifierExpression.php @@ -18,7 +18,12 @@ use Cake\Database\ValueBinder; /** - * Represents a single identifier name in the database + * Represents a single identifier name in the database. + * + * Identifier values are unsafe with user supplied data. + * Values will be quoted when identifier quoting is enabled. + * + * @see \Cake\Database\Query::identifier() */ class IdentifierExpression implements ExpressionInterface { diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php index db19f87a3a2..681d254e1de 100644 --- a/tests/TestCase/Database/QueryTest.php +++ b/tests/TestCase/Database/QueryTest.php @@ -16,7 +16,6 @@ use Cake\Database\Expression\IdentifierExpression; use Cake\Database\ExpressionInterface; -use Cake\Database\IdentifierInterface; use Cake\Database\Query; use Cake\Database\StatementInterface; use Cake\Database\TypeMap; @@ -3394,13 +3393,9 @@ public function testIdentifierExpression() public function testIdentifierInterface() { $query = new Query($this->connection); - /* @var \Cake\Database\IdentifierInterface $identifier */ $identifier = $query->identifier('description'); - // should support these interfaces - $this->assertInstanceOf(IdentifierInterface::class, $identifier); $this->assertInstanceOf(ExpressionInterface::class, $identifier); - $this->assertEquals('description', $identifier->getIdentifier()); $identifier->setIdentifier('title');