Fixing this branch to be 2.0 compatible.

FaaPz · Jan 21, 2020 · e753cd9 · e753cd9
1 parent a32be98
commit e753cd9
Show file tree

Hide file tree

Showing 30 changed files with 150 additions and 118 deletions.
diff --git a/src/AbstractStatement.php b/src/AbstractStatement.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO;
 
 use PDO;
@@ -26,7 +24,7 @@ public function __construct(PDO $dbh)
     }
 
     /**
-     * @throws PDOException
+     * @throws DatabaseException
      *
      * @return mixed
      */
@@ -37,14 +35,12 @@ public function execute()
         try {
             $success = $stmt->execute($this->getValues());
             if (!$success) {
-                list($state, $code, $message) = $stmt->errorInfo();
+                $info = $stmt->errorInfo();
 
-                // We are not in exception mode, raise error.
-                user_error("SQLSTATE[{$state}] [{$code}] {$message}", E_USER_ERROR);
+                throw new DatabaseException($info[2], $info[0]);
             }
         } catch (PDOException $e) {
-            // We are in exception mode, carry on.
-            throw $e;
+            throw new DatabaseException($e->getMessage(), $e->getCode(), $e);
         }
 
         return $stmt;

diff --git a/src/AdvancedStatement.php b/src/AdvancedStatement.php
@@ -5,13 +5,11 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO;
 
 abstract class AdvancedStatement extends AbstractStatement
 {
-    /** @var Clause\Join[] $join */
+    /** @var Clause\Join[] */
     protected $join = [];
 
     /** @var Clause\Conditional $where */

diff --git a/src/Clause/Conditional.php b/src/Clause/Conditional.php
@@ -5,10 +5,9 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Clause;
 
+use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\QueryInterface;
 
 class Conditional implements QueryInterface
@@ -48,6 +47,8 @@ public function getValues(): array
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return string
      */
     public function __toString(): string
@@ -57,7 +58,7 @@ public function __toString(): string
             case 'BETWEEN':
             case 'NOT BETWEEN':
                 if (count($this->getValues()) != 2) {
-                    trigger_error('Conditional operator "BETWEEN" requires two arguments', E_USER_ERROR);
+                    throw new DatabaseException('Conditional operator "BETWEEN" requires two arguments');
                 }
 
                 $sql .= ' (? AND ?)';
@@ -66,7 +67,7 @@ public function __toString(): string
             case 'IN':
             case 'NOT IN':
                 if (count($this->getValues()) < 1) {
-                    trigger_error('Conditional operator "IN" requires at least one argument', E_USER_ERROR);
+                    throw new DatabaseException('Conditional operator "IN" requires at least one argument');
                 }
 
                 $sql .= ' (' . substr(str_repeat('?, ', count($this->getValues())), 0, -2) . ')';

diff --git a/src/Clause/Grouping.php b/src/Clause/Grouping.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Clause;
 
 class Grouping extends Conditional

diff --git a/src/Clause/Join.php b/src/Clause/Join.php
@@ -5,10 +5,9 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Clause;
 
+use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\QueryInterface;
 use FaaPz\PDO\Statement\Select;
 
@@ -44,6 +43,8 @@ public function getValues(): array
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return string
      */
     public function __toString(): string
@@ -53,7 +54,7 @@ public function __toString(): string
             reset($this->subject);
             $alias = key($this->subject);
             if (!is_string($alias)) {
-                trigger_error('Invalid subject array, use string keys for alias', E_USER_ERROR);
+                throw new DatabaseException('Invalid subject array, use string keys for alias');
             }
 
             $table = $this->subject[$alias];
@@ -62,7 +63,7 @@ public function __toString(): string
             }
             $table .= " AS {$alias}";
         } elseif (!is_string($this->subject)) {
-            trigger_error('Invalid subject value, use array with string key for alias', E_USER_ERROR);
+            throw new DatabaseException('Invalid subject value, use array with string key for alias');
         }
 
         $sql = "JOIN {$table} ON {$this->on}";

diff --git a/src/Clause/Limit.php b/src/Clause/Limit.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Clause;
 
 use FaaPz\PDO\QueryInterface;
@@ -23,7 +21,7 @@ class Limit implements QueryInterface
      * @param int      $size
      * @param int|null $offset
      */
-    public function __construct(int $size, ?int $offset = null)
+    public function __construct(int $size, int $offset = null)
     {
         $this->size = $size;
         $this->offset = $offset;
@@ -35,7 +33,7 @@ public function __construct(int $size, ?int $offset = null)
     public function getValues(): array
     {
         $values = [];
-        if ($this->offset !== null) {
+        if (isset($this->offset)) {
             $values[] = $this->offset;
         }
         $values[] = $this->size;
@@ -48,8 +46,8 @@ public function getValues(): array
      */
     public function __toString(): string
     {
-        $sql = 'LIMIT ?';
-        if ($this->offset !== null) {
+        $sql = '?';
+        if (isset($this->offset)) {
             $sql .= ', ?';
         }
 

diff --git a/src/Clause/Method.php b/src/Clause/Method.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Clause;
 
 use FaaPz\PDO\QueryInterface;

diff --git a/src/Clause/Raw.php b/src/Clause/Raw.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Clause;
 
 use FaaPz\PDO\QueryInterface;

diff --git a/src/Database.php b/src/Database.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO;
 
 use PDO;

diff --git a/src/DatabaseException.php b/src/DatabaseException.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @license MIT
+ * @license http://opensource.org/licenses/MIT
+ */
+
+namespace FaaPz\PDO;
+
+use Exception;
+use RuntimeException;
+
+class DatabaseException extends RuntimeException
+{
+    /** @var string $code */
+    protected $code;
+
+    /**
+     * @param string         $message
+     * @param string         $code
+     * @param Exception|null $previous
+     */
+    public function __construct(string $message = '', string $code = 'database_error', Exception $previous = null)
+    {
+        parent::__construct($message, 0, $previous);
+        $this->code = $code;
+    }
+}
diff --git a/src/QueryInterface.php b/src/QueryInterface.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO;
 
 interface QueryInterface

diff --git a/src/Statement/Call.php b/src/Statement/Call.php
@@ -5,12 +5,11 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Statement;
 
 use FaaPz\PDO\AbstractStatement;
 use FaaPz\PDO\Clause;
+use FaaPz\PDO\DatabaseException;
 use PDO;
 use PDOStatement;
 
@@ -56,14 +55,18 @@ public function getValues(): array
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return string
      */
     public function __toString(): string
     {
         if (!$this->method instanceof Clause\Method) {
-            trigger_error('No method set for call statement', E_USER_ERROR);
+            throw new DatabaseException('No method is set for stored procedure call');
         }
 
-        return "CALL {$this->method}";
+        $sql = "CALL {$this->method}";
+
+        return $sql;
     }
 }
diff --git a/src/Statement/Delete.php b/src/Statement/Delete.php
@@ -5,11 +5,10 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Statement;
 
 use FaaPz\PDO\AdvancedStatement;
+use FaaPz\PDO\DatabaseException;
 use PDO;
 
 class Delete extends AdvancedStatement
@@ -68,12 +67,14 @@ public function getValues(): array
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return string
      */
     public function __toString(): string
     {
         if (empty($this->table)) {
-            trigger_error('No table set for delete statement', E_USER_ERROR);
+            throw new DatabaseException('No table is set for deletion');
         }
 
         $sql = 'DELETE';
@@ -107,13 +108,15 @@ public function __toString(): string
         }
 
         if ($this->limit != null) {
-            $sql .= " {$this->limit}";
+            $sql .= " LIMIT {$this->limit}";
         }
 
         return $sql;
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return int
      */
     public function execute()

diff --git a/src/Statement/Insert.php b/src/Statement/Insert.php
@@ -5,11 +5,10 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Statement;
 
 use FaaPz\PDO\AbstractStatement;
+use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\QueryInterface;
 use PDO;
 
@@ -98,20 +97,22 @@ public function ignore(): self
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return string
      */
     public function __toString(): string
     {
         if (empty($this->table)) {
-            trigger_error('No table set for insert statement', E_USER_ERROR);
+            throw new DatabaseException('No table is set for insertion');
         }
 
         if (empty($this->columns)) {
-            trigger_error('No columns set for insert statement', E_USER_ERROR);
+            throw new DatabaseException('Missing columns for insertion');
         }
 
         if (empty($this->values) || count($this->columns) != count($this->values)) {
-            trigger_error('No values set for insert statement', E_USER_ERROR);
+            throw new DatabaseException('Missing values for insertion');
         }
 
         $placeholders = '';
@@ -157,6 +158,8 @@ public function getValues(): array
     }
 
     /**
+     * @throws DatabaseException
+     *
      * @return int|string
      */
     public function execute()