From 6d9ca4a49843d46a94b7bc88cd0ee5a8ae73ff6c Mon Sep 17 00:00:00 2001 From: David Schoenbauer Date: Mon, 10 Sep 2018 21:41:33 -0500 Subject: [PATCH 1/2] Release data type requirements task: #28 --- src/Sql/Command/Select.php | 6 +++--- tests/src/Sql/Command/SelectTest.php | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Sql/Command/Select.php b/src/Sql/Command/Select.php index 5fc56e9..bc6a1e8 100644 --- a/src/Sql/Command/Select.php +++ b/src/Sql/Command/Select.php @@ -40,7 +40,7 @@ class Select extends AbstractCommand private $table; private $fields = ['*']; - private $data = []; + private $data = null; private $fetchStyle = \PDO::FETCH_ASSOC; private $fetchFlat = false; private $defaultValue = []; @@ -159,11 +159,11 @@ public function getSql() /** * acts as a cache to house ran queries - * @param array $data data to be stored + * @param mixed $data data to be stored * @return Select for method chaining * @since v1.0.0 */ - public function setData(array $data) + public function setData($data) { $this->data = $data; return $this; diff --git a/tests/src/Sql/Command/SelectTest.php b/tests/src/Sql/Command/SelectTest.php index 2830c59..e79a595 100644 --- a/tests/src/Sql/Command/SelectTest.php +++ b/tests/src/Sql/Command/SelectTest.php @@ -104,8 +104,10 @@ public function testDefaultValueConstructor() public function testData() { - $this->assertEquals([], $this->_object->getData()); + $this->assertEquals(null, $this->_object->getData()); $this->assertEquals(['id', 'name'], $this->_object->setData(['id', 'name'])->getData()); + $this->assertEquals(false, $this->_object->setData(false)->getData()); + $this->assertEquals('test', $this->_object->setData('test')->getData()); } public function testSql() From 801c673de035955090db4e7a78dd83eb042b46fd Mon Sep 17 00:00:00 2001 From: David Schoenbauer Date: Mon, 10 Sep 2018 22:12:38 -0500 Subject: [PATCH 2/2] Update NoRecordsAffectedException parent task: #27 --- src/Sql/Exception/NoRecordsAffectedException.php | 4 ++-- tests/src/Sql/Exception/NoRecordsAffectedExceptionTest.php | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Sql/Exception/NoRecordsAffectedException.php b/src/Sql/Exception/NoRecordsAffectedException.php index e81da12..36dc9bf 100644 --- a/src/Sql/Exception/NoRecordsAffectedException.php +++ b/src/Sql/Exception/NoRecordsAffectedException.php @@ -24,14 +24,14 @@ */ namespace DSchoenbauer\Sql\Exception; -use DSchoenbauer\Exception\Http\ClientError\NotFoundException; +use DSchoenbauer\Exception\Http\ClientError\ConflictException; /** * No Records are being impacted by the query * * @author David Schoenbauer */ -class NoRecordsAffectedException extends NotFoundException implements SqlExceptionInterface +class NoRecordsAffectedException extends ConflictException implements SqlExceptionInterface { } diff --git a/tests/src/Sql/Exception/NoRecordsAffectedExceptionTest.php b/tests/src/Sql/Exception/NoRecordsAffectedExceptionTest.php index 332d90c..b7c406b 100644 --- a/tests/src/Sql/Exception/NoRecordsAffectedExceptionTest.php +++ b/tests/src/Sql/Exception/NoRecordsAffectedExceptionTest.php @@ -24,6 +24,7 @@ */ namespace DSchoenbauer\Sql\Exception; +use DSchoenbauer\Exception\Http\ClientError\ConflictException; use PHPUnit\Framework\TestCase; /** @@ -33,6 +34,7 @@ */ class NoRecordsAffectedExceptionTest extends TestCase { + private $object; protected function setUp() { @@ -45,6 +47,6 @@ public function testHasBaseInterface() } public function testHasCorrectParent(){ - + $this->assertInstanceOf(ConflictException::class, $this->object); } }