Prep 1.3.2

belgattitude · Jan 18, 2018 · 99ac2ea · 99ac2ea
1 parent 4553146
commit 99ac2ea
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 1.3.2 (2018-01-18) Minor zend-db cleanup
+
+## Changed
+
+- Use zend-db statement::`execute()` explicitly instead of `query()` method
+
+
 ## 1.3.1 (2017-09-15) Support for php 7.2rc1
 
 ## Added

diff --git a/src/Soluble/DbWrapper/Adapter/Zend/ZendDb2Adapter.php b/src/Soluble/DbWrapper/Adapter/Zend/ZendDb2Adapter.php
@@ -44,17 +44,15 @@ public function quoteValue($value)
     public function query($query, $resultsetType = Resultset::TYPE_ARRAY)
     {
         try {
-            $r = $this->zendAdapter->query($query)->execute();
+            $stmt = $this->zendAdapter->createStatement($query);
+            $r = $stmt->execute();
             $results = new Resultset($resultsetType);
-            if ($r instanceof \Zend\Db\ResultSet\ResultSet) {
-                foreach ($r as $row) {
-                    $results->append((array) $row);
-                }
-            } elseif ($r instanceof \Zend\Db\Adapter\Driver\ResultInterface && $r->getFieldCount() > 0) {
+            if ($r->getFieldCount() > 0) {
                 foreach ($r as $row) {
                     $results->append($row);
                 }
             }
+            unset($r);
         } catch (\Exception $e) {
             $msg = "ZendDb2 adapter query error: {$e->getMessage()} [$query]";
             throw new Exception\InvalidArgumentException($msg);

diff --git a/src/Soluble/DbWrapper/Result/Resultset.php b/src/Soluble/DbWrapper/Result/Resultset.php
@@ -186,7 +186,10 @@ public function getArrayObject()
         if ($this->returnType == self::TYPE_ARRAY) {
             return new ArrayObject($this->storage);
         } else {
-            return $this->storage;
+            /** @var ArrayObject $storageAsArrayObject to silent static code analyzers */
+            $storageAsArrayObject = $this->storage;
+
+            return $storageAsArrayObject;
         }
     }
 

diff --git a/tests/src/SolubleTest/DbWrapper/Adapter/AllAdapterMysqlTest.php b/tests/src/SolubleTest/DbWrapper/Adapter/AllAdapterMysqlTest.php
@@ -121,7 +121,6 @@ public function testGetConnection()
 
             $params = \SolubleTestFactories::getDbConfiguration('mysqli');
             self::assertEquals($params['database'], $conn->getCurrentSchema());
-
             self::assertInternalType('object', $conn->getResource());
         }
     }

diff --git a/tests/src/SolubleTest/DbWrapper/AdapterFactoryTest.php b/tests/src/SolubleTest/DbWrapper/AdapterFactoryTest.php
@@ -63,12 +63,12 @@ public function testCreateAdapterFromResourceThrowsException()
         $fct = function () {
             return true;
         };
-        $adapter = AdapterFactory::createAdapterFromResource($fct);
+        AdapterFactory::createAdapterFromResource($fct);
     }
 
     public function testCreateAdapterFromResourceThrowsExceptionInvalidType()
     {
         $this->expectException(\Soluble\DbWrapper\Exception\InvalidArgumentException::class);
-        $adapter = AdapterFactory::createAdapterFromResource('a');
+        AdapterFactory::createAdapterFromResource('a');
     }
 }