Merge branch 'develop' into release

composer.json

@@ -13,6 +13,8 @@
     ],
     "require": {},
     "autoload": {
-        "ProVM\\": "src/"
+        "psr-4": {
+            "ProVM\\": "src/"
+        }
     }
 }

src/Concept/Database/ResultSet.php

@@ -9,5 +9,6 @@ interface ResultSet
     public function execute(array $values): ResultSet;
     public function getAsArray(): array;
     public function getAsObject(): array;
-    public function getFirst(): mixed;
+    public function getFirstAsArray(): array;
+    public function getFirstAsObject(): object;
 }

src/Database/Exception.php

@@ -0,0 +1,11 @@
+<?php
+namespace ProVM\Database;
+
+class Exception extends \Exception
+{
+    public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)
+    {
+        $code += 300;
+        parent::__construct($message, $code, $previous);
+    }
+}

src/Database/ResultSet.php

@@ -4,6 +4,7 @@ namespace ProVM\Database;
 use PDO;
 use PDOStatement;
 use ProVM\Concept\Database\ResultSet as RSInterface;
+use ProVM\Exception\BlankResult;
 
 class ResultSet implements RSInterface
 {
@@ -31,14 +32,34 @@ class ResultSet implements RSInterface
 
     public function getAsArray(): array
     {
-        return $this->getStatement()->fetchAll(PDO::FETCH_ASSOC);
+        $rs = $this->getStatement()->fetchAll(PDO::FETCH_ASSOC);
+        if (!$rs) {
+            throw new BlankResult();
+        }
+        return $rs;
     }
     public function getAsObject(): array
     {
-        return $this->getStatement()->fetchAll(PDO::FETCH_OBJ);
+        $rs = $this->getStatement()->fetchAll(PDO::FETCH_OBJ);
+        if (!$rs) {
+            throw new BlankResult();
+        }
+        return $rs;
     }
-    public function getFirst(): mixed
+    public function getFirstAsArray(): array
     {
-        return $this->getStatement()->fetch(PDO::FETCH_OBJ);
+        $rs = $this->getStatement()->fetch(PDO::FETCH_ASSOC);
+        if (!$rs or count($rs) === 0) {
+            throw new BlankResult();
+        }
+        return $rs;
+    }
+    public function getFirstAsObject(): object
+    {
+        $rs = $this->getStatement()->fetch(PDO::FETCH_OBJ);
+        if (!$rs or count($rs) === 0) {
+            throw new BlankResult();
+        }
+        return $rs;
     }
 }

src/Exception/BlankResult.php

@@ -0,0 +1,15 @@
+<?php
+namespace ProVM\Exception;
+
+use ProVM\Database\Exception;
+use Throwable;
+
+class BlankResult extends Exception
+{
+    public function __construct(?Throwable $previous = null)
+    {
+        $message = "No results found";
+        $code = 0;
+        parent::__construct($message, $code, $previous);
+    }
+}