Feature/gh56 move statements to object based

.gitattributes

@@ -0,0 +1,8 @@
+/tests                      export-ignore
+/phpunit.xml.dist           export-ignore
+/.scrutinizer.yml           export-ignore
+/.php-cs-fixer.php          export-ignore
+/codecov.yml                export-ignore
+/phpstan.neon.dist          export-ignore
+/static-loader-creator.php  export-ignore
+/src/loader.php             export-ignore

README.md

@@ -32,9 +32,9 @@ $thing = QB::table('someTable')->where('something','=', 'something else')->first
 
 ## Perquisites
 
-* WordPress 5.7+ (tested upto 5.9)
-* PHP 7.1+ (includes support for PHP8)
-* MySql 5.7+ or MariaDB 10.2+
+* WordPress 5.6+ `(tested on 5.6, 5.7, 5.8, 5.9)`
+* PHP 7.1+ `(tested on 7.1, 7.2, 7.3, 7.4, 8.0, 8.1)`
+* MySql 5.7+ `(tested on 5.7)` or MariaDB 10.2+ `(tested on 10.2, 10.3, 10.4, 10.5, 10.6, 10.7)`
 * Composer (optional)
 
 ## Using Composer

src/Connection.php

@@ -15,6 +15,7 @@ class Connection
     public const PREFIX            = 'prefix';
     public const SHOW_ERRORS       = 'show_errors';
     public const USE_WPDB_PREFIX   = 'use_wpdb_prefix';
+    public const THROW_ERRORS      = 'throw_errors';
 
     /**
      * @var string

src/Exception/WpdbException.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Exception for errors during WPDB operations.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @since 0.0.2
+ * @author Glynn Quelch <[email protected]>
+ * @license http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @package Gin0115\Pixie
+ * @subpackage Exception
+ */
+
+namespace Pixie\Exception;
+
+use Pixie\Exception;
+
+class WpdbException extends Exception
+{
+}

src/JSON/JsonHandler.php

@@ -18,7 +18,7 @@ class JsonHandler
     public function __construct(Connection $connection)
     {
         $this->connection = $connection;
-        $this->jsonSelectorHandler = new JsonSelectorHandler($connection);
+        $this->jsonSelectorHandler = new JsonSelectorHandler();
         $this->jsonExpressionFactory = new JsonExpressionFactory($connection);
     }
 

src/JSON/JsonSelectorHandler.php

@@ -3,32 +3,9 @@
 namespace Pixie\JSON;
 
 use Pixie\Exception;
-use Pixie\Connection;
-use Pixie\HasConnection;
-use Pixie\QueryBuilder\TablePrefixer;
 
-class JsonSelectorHandler implements HasConnection
+class JsonSelectorHandler
 {
-    use TablePrefixer;
-
-    /** @var Connection */
-    protected $connection;
-
-    public function __construct(Connection $connection)
-    {
-        $this->connection = $connection;
-    }
-
-    /**
-     * Returns the current connection instance.
-     *
-     * @return connection
-     */
-    public function getConnection(): Connection
-    {
-        return $this->connection;
-    }
-
     /**
      * Checks if the passed expression is for JSON
      * this->denotes->json

src/Parser/Criteria.php

@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Model of a criteria
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @since 0.0.2
+ * @author Glynn Quelch <[email protected]>
+ * @license http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @package Gin0115\Pixie
+ * @subpackage Parser
+ */
+
+namespace Pixie\Parser;
+
+class Criteria
+{
+    /**
+     * The SQL statement
+     *
+     * @var string
+     */
+    protected $statement;
+
+    /**
+     * The bindings for the statement
+     *
+     * @var array<int, string|int|float|bool|null>
+     */
+    protected $bindings;
+
+    /**
+     * @param string $statement
+     * @param array<int, string|int|float|bool|null> $bindings
+     */
+    public function __construct(string $statement, array $bindings)
+    {
+        $this->statement = $statement;
+        $this->bindings = $bindings;
+    }
+
+    /**
+     * Get the SQL statement
+     *
+     * @return string
+     */
+    public function getStatement(): string
+    {
+        return $this->statement;
+    }
+
+    /**
+     * Get the bindings
+     *
+     * @return array<int, string|int|float|bool|null>
+     */
+    public function getBindings(): array
+    {
+        return $this->bindings;
+    }
+}