Rebasing on 2.0 and fixing several issues. Remvoing strict types, it's annoying.

kwhat · kwhat · commit 3d53dd5ef13b · 2020-01-21T22:57:11.000-08:00
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;
diff --git a/src/AdvancedStatement.php b/src/AdvancedStatement.php
@@ -9,7 +9,7 @@
 
 abstract class AdvancedStatement extends AbstractStatement
 {
-    /** @var Clause\Join[] */
+    /** @var Clause\Join[] $join */
     protected $join = [];
 
     /** @var Clause\Conditional $where */
diff --git a/src/Clause/Conditional.php b/src/Clause/Conditional.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/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
@@ -7,7 +7,6 @@
 
 namespace FaaPz\PDO\Clause;
 
-use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\QueryInterface;
 use FaaPz\PDO\Statement\Select;
 
@@ -44,7 +43,6 @@ public function getValues(): array
 
     /**
      * @return string
-     * @throws DatabaseException
      */
     public function __toString(): string
     {
@@ -53,7 +51,7 @@ public function __toString(): string
             reset($this->subject);
             $alias = key($this->subject);
             if (!is_string($alias)) {
-                throw new DatabaseException('Invalid subject array, use string keys for alias');
+                trigger_error('Invalid subject array, use string keys for alias', E_USER_ERROR);
             }
 
             $table = $this->subject[$alias];
@@ -62,7 +60,7 @@ public function __toString(): string
             }
             $table .= " AS {$alias}";
         } elseif (!is_string($this->subject)) {
-            throw new DatabaseException('Invalid subject value, use array with string key for alias');
+            trigger_error('Invalid subject value, use array with string key for alias', E_USER_ERROR);
         }
 
         $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;
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/DatabaseException.php b/src/DatabaseException.php
diff --git a/src/Statement/Call.php b/src/Statement/Call.php
@@ -9,7 +9,6 @@
 
 use FaaPz\PDO\AbstractStatement;
 use FaaPz\PDO\Clause;
-use FaaPz\PDO\DatabaseException;
 use PDO;
 use PDOStatement;
 
@@ -56,12 +55,11 @@ public function getValues(): array
 
     /**
      * @return string
-     * @throws DatabaseException
      */
     public function __toString(): string
     {
         if (!$this->method instanceof Clause\Method) {
-            throw new DatabaseException('No method set for call statement');
+            trigger_error('No method set for call statement', E_USER_ERROR);
         }
 
         return "CALL {$this->method}";
diff --git a/src/Statement/Delete.php b/src/Statement/Delete.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Statement;
 
 use FaaPz\PDO\AdvancedStatement;
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\Clause\Raw;
 use FaaPz\PDO\QueryInterface;
 use PDO;
 
diff --git a/src/Statement/Select.php b/src/Statement/Select.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Statement;
 
 use FaaPz\PDO\AdvancedStatement;
diff --git a/src/Statement/Update.php b/src/Statement/Update.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Statement;
 
 use FaaPz\PDO\AdvancedStatement;
diff --git a/tests/AbstractStatementTest.php b/tests/AbstractStatementTest.php
@@ -8,7 +8,6 @@
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\AbstractStatement;
-use FaaPz\PDO\DatabaseException;
 use PDO;
 use PDOException;
 use PDOStatement;
@@ -68,7 +67,7 @@ public function testExecuteException()
             ->method('execute')
             ->willThrowException(new PDOException('message', 100));
 
-        $this->expectException(DatabaseException::class);
+        $this->expectException(PDOException::class);
         $this->expectExceptionCode(100);
         $this->expectExceptionMessage('message');
 
@@ -81,9 +80,8 @@ public function testExecuteFailure()
             ->method('execute')
             ->willReturn(false);
 
-        $this->expectException(DatabaseException::class);
-        $this->expectExceptionCode('HY100');
-        $this->expectExceptionMessage('near "bogus": syntax error');
+        $this->expectError();
+        $this->expectErrorMessage('SQLSTATE[HY100] [100] near "bogus": syntax error');
 
         $this->subject->execute();
     }
diff --git a/tests/Clause/ConditionalTest.php b/tests/Clause/ConditionalTest.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\Clause;
diff --git a/tests/Clause/JoinTest.php b/tests/Clause/JoinTest.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\Clause;
diff --git a/tests/DatabaseExceptionTest.php b/tests/DatabaseExceptionTest.php
diff --git a/tests/Statement/CallTest.php b/tests/Statement/CallTest.php
@@ -8,7 +8,6 @@
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\Clause;
-use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\Statement;
 use PDO;
 use PHPUnit\Framework\TestCase;
@@ -34,7 +33,8 @@ public function testToString()
 
     public function testToStringWithoutMethod()
     {
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^No method set for call statement/');
 
         $this->subject->__toString();
     }
diff --git a/tests/Statement/DeleteTest.php b/tests/Statement/DeleteTest.php
@@ -8,7 +8,6 @@
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\Clause;
-use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\Statement;
 use PDO;
 use PDOStatement;
@@ -65,7 +64,8 @@ public function testToStringWithConstructorTable()
 
     public function testToStringWithoutTable()
     {
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^No table set for delete statement/');
 
         $this->subject->__toString();
     }
diff --git a/tests/Statement/InsertTest.php b/tests/Statement/InsertTest.php
@@ -5,8 +5,6 @@
  * @license http://opensource.org/licenses/MIT
  */
 
-declare(strict_types=1);
-
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\Clause;
@@ -77,7 +75,9 @@ public function testToStringWithColumnMismatch()
             ->columns('col2')
             ->values(1, 2);
 
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^No values set for insert statement/');
+
         $this->subject->__toString();
     }
 
@@ -116,7 +116,8 @@ public function testToStringWithSelect()
 
     public function testToStringWithSelectAndArgs()
     {
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^Ignoring additional values after select for insert statement/');
 
         $select = new Statement\Select($this->createMock(PDO::class));
         $select->from('table');
diff --git a/tests/Statement/SelectTest.php b/tests/Statement/SelectTest.php
@@ -8,7 +8,6 @@
 namespace FaaPz\PDO\Test;
 
 use FaapZ\PDO\Clause;
-use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\Statement;
 use PDO;
 use PHPUnit\Framework\TestCase;
@@ -164,7 +163,8 @@ public function testToStringWithLimit()
 
     public function testToStringWithoutTable()
     {
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^No table set for select statement/');
 
         $this->subject->execute();
     }
diff --git a/tests/Statement/UpdateTest.php b/tests/Statement/UpdateTest.php
@@ -8,7 +8,6 @@
 namespace FaaPz\PDO\Test;
 
 use FaaPz\PDO\Clause;
-use FaaPz\PDO\DatabaseException;
 use FaaPz\PDO\Statement;
 use PDO;
 use PDOStatement;
@@ -117,14 +116,16 @@ public function testToStringWithLimit()
 
     public function testToStringWithoutTable()
     {
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^No table set for update statement/');
 
         $this->subject->execute();
     }
 
     public function testToStringWithoutPairs()
     {
-        $this->expectException(DatabaseException::class);
+        $this->expectError();
+        $this->expectErrorMessageMatches('/^No column \/ value pairs set for update statement/');
 
         $this->subject
             ->table('test')

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`abstract class AdvancedStatement extends AbstractStatement`
`11`	`11`	`{`
`12`		`- /** @var Clause\Join[] */`
	`12`	`+ /** @var Clause\Join[] $join */`
`13`	`13`	`protected $join = [];`
`14`	`14`
`15`	`15`	`/** @var Clause\Conditional $where */`