Remove unused variables and general tidy of code (#176)

* Write tests for #115 * Implement type-safe fetch functionality, closes #115 * Use existing fetch functions * Introduce `Fetchable` trait to share code over Database, QueryCollection * Remove unused exceptions * Rename toArray->asArray for consistency with other repos * Tidy unused variables * Tidy unused variables * toArray->asArray change
PhpGt · Oct 31, 2019 · 2039db4 · 2039db4
1 parent c371fc7
commit 2039db4
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 51 deletions.
diff --git a/src/Fetchable.php b/src/Fetchable.php
@@ -130,7 +130,7 @@ protected function fetchAllTyped(
 	}
 
 	protected function castRow(string $type, Row $row) {
-		$assocArray = $row->toArray();
+		$assocArray = $row->asArray();
 		reset($assocArray);
 		$key = key($assocArray);
 		$value = $assocArray[$key];

diff --git a/src/NoSuchTableException.php b/src/NoSuchTableException.php
diff --git a/src/Query/SqlQuery.php b/src/Query/SqlQuery.php
@@ -1,8 +1,6 @@
 <?php
 namespace Gt\Database\Query;
 
-use Gt\Database\Connection\Connection;
-use Gt\Database\Connection\Driver;
 use PDO;
 use PDOException;
 use PDOStatement;
@@ -186,23 +184,23 @@ protected function escapeSpecialBinding(
 
 // TODO: In v2 we will properly parse the different parts of the special bindings.
 // See https://github.com/PhpGt/Database/issues/117
-		switch($type) {
-		// [GROUP BY {col_name | expr | position}, ... [WITH ROLLUP]]
-		case "groupBy":
-			break;
-
-		// [ORDER BY {col_name | expr | position}
-		case "orderBy":
-			break;
-
-		// [LIMIT {[offset,] row_count | row_count OFFSET offset}]
-		case "limit":
-			break;
-
-		// [LIMIT {[offset,] row_count | row_count OFFSET offset}]
-		case "offset":
-			break;
-		}
+//		switch($type) {
+// [GROUP BY {col_name | expr | position}, ... [WITH ROLLUP]]
+//		case "groupBy":
+//			break;
+//
+// [ORDER BY {col_name | expr | position}
+//		case "orderBy":
+//			break;
+//
+// [LIMIT {[offset,] row_count | row_count OFFSET offset}]
+//		case "limit":
+//			break;
+//
+// [LIMIT {[offset,] row_count | row_count OFFSET offset}]
+//		case "offset":
+//			break;
+//		}
 
 		return (string)$value;
 	}

diff --git a/src/ReadOnlyArrayAccessException.php b/src/ReadOnlyArrayAccessException.php
diff --git a/src/Result/EmptyResultSetException.php b/src/Result/EmptyResultSetException.php
diff --git a/src/Result/ResultSet.php b/src/Result/ResultSet.php
@@ -11,9 +11,9 @@
  * count and getLength
  */
 class ResultSet implements Iterator, Countable {
-	/** @var \PDOStatement */
+	/** @var PDOStatement */
 	protected $statement;
-	/** @var \Gt\Database\Result\Row */
+	/** @var Row */
 	protected $current_row;
 	protected $row_index = null;
 	/** @var string */
@@ -78,11 +78,11 @@ protected function fetchUpToIteratorIndex() {
 		}
 	}
 
-	public function toArray($elementsToArray = false):array {
+	public function asArray($elementsToArray = true):array {
 		if($elementsToArray) {
 			$data = array_map(function($element) {
 				/** @var Row $element */
-				return $element->toArray();
+				return $element->asArray();
 			},
 				$this->fetchAll()
 			);

diff --git a/src/Result/Row.php b/src/Result/Row.php
@@ -62,7 +62,7 @@ public function getDateTime(string $columnName):?DateTime {
 		return $dateTime;
 	}
 
-	public function toArray():array {
+	public function asArray():array {
 		return $this->data;
 	}
 

diff --git a/test/unit/Result/ResultSetTest.php b/test/unit/Result/ResultSetTest.php
@@ -120,6 +120,25 @@ public function testFetchAll() {
 		}
 	}
 
+	public function testAsArray() {
+		$resultSet = new ResultSet($this->getStatementMock());
+		$array = $resultSet->asArray();
+		foreach($array as $i => $rowArray) {
+			self::assertIsArray($rowArray);
+			self::assertArrayHasKey("id", $rowArray);
+			self::assertArrayHasKey("name", $rowArray);
+			self::assertIsInt($rowArray["id"]);
+		}
+	}
+
+	public function testAsArrayNoMap() {
+		$resultSet = new ResultSet($this->getStatementMock());
+		$array = $resultSet->asArray(false);
+		foreach($array as $i => $row) {
+			self::assertInstanceOf(Row::class, $row);
+		}
+	}
+
 	private function getStatementMock():PDOStatement {
 		$statement = $this->createMock(PDOStatement::class);
 		$statement->method("fetch")

diff --git a/test/unit/Result/RowTest.php b/test/unit/Result/RowTest.php
@@ -3,7 +3,6 @@
 namespace unit\Result;
 
 use DateTime;
-use Gt\Database\Result\NoSuchColumnException;
 use Gt\Database\Result\Row;
 use PHPUnit\Framework\TestCase;
 
@@ -12,12 +11,12 @@ class RowTest extends TestCase {
 	public function testFieldAccess(array $data) {
 		$row = new Row($data);
 
-		foreach($data as $key => $value) {
-			if(is_float($data[$key])) {
-				self::assertEqualsWithDelta($data[$key], $value, 0.0001);
+		foreach($row as $key => $value) {
+			if(is_float($row->$key)) {
+				self::assertEqualsWithDelta($row->$key, $value, 0.0001);
 			}
 			else {
-				self::assertEquals($data[$key], $value);
+				self::assertEquals($row->$key, $value);
 			}
 		}
 	}
@@ -34,7 +33,7 @@ public function testIsNotSet() {
 
 	public function testGetNonExistentProperty() {
 		$row = new Row(["col1" => "item"]);
-		self::assertNull($row->doink);
+		self::assertNull($row->get("doink"));
 	}
 
 	public function testEmpty() {
@@ -120,7 +119,6 @@ public function data_getTestRow():array {
 		$data = [];
 
 		$columns = ["id", "name", "example", "exampleFloat", "exampleDateTime", "exampleBool"];
-		$rows = [];
 		$rowNum = rand(2, 50);
 		for($i = 0; $i < $rowNum; $i++) {
 			$row = [];