Merge branch 'develop'

dvelum · Feb 11, 2021 · 00f24ef · 00f24ef
2 parents fc3d586 + 17a6c9e
commit 00f24ef
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 36 deletions.
diff --git a/application/configs/common/dist/versions.php b/application/configs/common/dist/versions.php
@@ -1,4 +1,4 @@
 <?php
 return array(
-  'core'=>'3.1.0',
+  'core'=>'3.2.0',
 );
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "dvelum/dvelum-core",
-    "version": "3.1.0",
+    "version": "3.2.0",
     "type": "project",
     "description": "DVelum 3.x core",
     "keywords": ["dvelum","php"],

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,31 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<phpunit bootstrap="tests/unit/bootstrap.php"
-    colors="true"
-    convertErrorsToExceptions="false"
-    convertNoticesToExceptions="false"
-    convertWarningsToExceptions="false"
-    backupGlobals="false"
-    processIsolation="false"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false">
-    <testsuite name="Main Test Suite">
-        <directory>./tests/unit/</directory>
-    </testsuite>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./application/classes</directory>
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory suffix=".phtml">./</directory>
-                <file>./bootstrap.php</file>
-                <file>./console.php</file>
-                <file>./console_client.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="./data/phpunit_report" lowUpperBound="35" highLowerBound="70"/>
-    </logging>
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/unit/bootstrap.php" colors="true" convertErrorsToExceptions="false" convertNoticesToExceptions="false" convertWarningsToExceptions="false" backupGlobals="false" processIsolation="false" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./application/classes</directory>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <exclude>
+      <directory suffix=".phtml">./</directory>
+      <file>./bootstrap.php</file>
+      <file>./console.php</file>
+      <file>./console_client.php</file>
+    </exclude>
+    <report>
+      <html outputDirectory="./data/phpunit_report" lowUpperBound="35" highLowerBound="70"/>
+    </report>
+  </coverage>
+  <testsuite name="Main Test Suite">
+    <directory>./tests/unit/</directory>
+  </testsuite>
+  <logging/>
 </phpunit>
diff --git a/src/Dvelum/Db/Model.php b/src/Dvelum/Db/Model.php
@@ -194,6 +194,7 @@ public function update(int $recordId, array $data, string $keyField = 'id'): boo
      * @param int $recordId
      * @param string $keyField
      * @return array
+     * @throws \Exception
      */
     public function getItem(int $recordId, string $keyField = 'id'): array
     {
@@ -222,6 +223,7 @@ public function getLogsAdapter(): ?LogInterface
      * @param int $lifetime
      * @param string $keyField
      * @return array
+     * @throws \Exception
      */
     public function getCachedItem(int $recordId, int $lifetime, string $keyField = 'id'): array
     {

diff --git a/src/Dvelum/Db/Query.php b/src/Dvelum/Db/Query.php
@@ -293,34 +293,37 @@ public function __toString(): string
     /**
      * Fetch all records
      * @return array
+     * @throws \Exception
      */
     public function fetchAll(): array
     {
         try {
             return $this->db->fetchAll($this->__toString());
         } catch (\Exception $e) {
             $this->model->logError($e->getMessage());
-            return [];
+            throw $e;
         }
     }
 
     /**
      * Fetch one
      * @return mixed
+     * @throws \Exception
      */
     public function fetchOne()
     {
         try {
             return $this->db->fetchOne($this->__toString());
         } catch (\Exception $e) {
             $this->model->logError($e->getMessage());
-            return null;
+            throw $e;
         }
     }
 
     /**
      * Fetch first result row
      * @return array
+     * @throws \Exception
      */
     public function fetchRow(): array
     {
@@ -332,27 +335,29 @@ public function fetchRow(): array
             return $result;
         } catch (\Exception $e) {
             $this->model->logError($e->getMessage());
-            return [];
+            throw $e;
         }
     }
 
     /**
      * Fetch column
      * @return array
+     * @throws \Exception
      */
     public function fetchCol(): array
     {
         try {
             return $this->db->fetchCol($this->__toString());
         } catch (\Exception $e) {
             $this->model->logError($e->getMessage());
-            return [];
+            throw $e;
         }
     }
 
     /**
      * Count the number of rows that satisfy the filters
      * @return int
+     * @throws \Exception
      */
     public function getCount(): int
     {