Merge pull request #28 from skipperbent/v3-development

Version 3.4.2

.gitignore

@@ -4,4 +4,5 @@ composer.lock
 .DS_Store
 .idea
 test.php
-*~
+/devel/
+*~

.travis.yml

@@ -4,7 +4,7 @@ language: php
 
 php:
   - 5.4
-  - 5.5
+  - 5.6
   - 7.0
 
 before_script:

README.md

@@ -13,7 +13,7 @@ This library is stable, maintained and are used by many sites, including:
 - [BookAndBegin.com](https://bookandbegin.com)
 
 **Requirements:**
-- PHP version 5.5 or higher is required.
+- PHP 5.6 or higher is required.
 
 #### Feedback and development
 

composer.json

@@ -34,7 +34,7 @@
     }
   ],
   "require": {
-    "php": ">=5.5.0",
+    "php": ">=5.6",
     "usmanhalalit/viocon": "1.0.1"
   },
   "require-dev": {

src/Pecee/Pixie/ConnectionAdapters/Mysql.php

@@ -11,6 +11,7 @@ class Mysql extends BaseAdapter
 {
     /**
      * @param array $config
+     *
      * @return mixed
      * @throws Exception
      */
@@ -34,6 +35,9 @@ protected function doConnect(array $config)
             $connectionString .= ";unix_socket={$config['unix_socket']}";
         }
 
+        /**
+         * @var \PDO $connection
+         */
         $connection = $this->container->build(
             \PDO::class,
             [$connectionString, $config['username'], $config['password'], $config['options']]

src/Pecee/Pixie/ConnectionAdapters/Pgsql.php

@@ -11,6 +11,7 @@ class Pgsql extends BaseAdapter
 {
     /**
      * @param array $config
+     *
      * @return mixed
      * @throws Exception
      */
@@ -26,6 +27,9 @@ protected function doConnect(array $config)
             $connectionString .= ";port={$config['port']}";
         }
 
+        /**
+         * @var \PDO $connection
+         */
         $connection = $this->container->build(
             \PDO::class,
             [$connectionString, $config['username'], $config['password'], $config['options']]

src/Pecee/Pixie/ConnectionAdapters/Sqlite.php

@@ -11,7 +11,8 @@ class Sqlite extends BaseAdapter
 {
     /**
      * @param array $config
-     * @return mixed
+     *
+     * @return \PDO
      * @throws Exception
      */
     public function doConnect(array $config)

src/Pecee/Pixie/QueryBuilder/QueryBuilderHandler.php

@@ -183,25 +183,6 @@ public function prefix($table, $alias)
         return $this->alias($table, $alias);
     }
 
-    /**
-     * Parses correct data-type for PDO parameter.
-     *
-     * @param mixed $value
-     * @return int PDO-parameter type
-     */
-    protected function parseDataType($value)
-    {
-        if (is_int($value) === true) {
-            return PDO::PARAM_INT;
-        }
-
-        if (is_bool($value) === true) {
-            return PDO::PARAM_BOOL;
-        }
-
-        return PDO::PARAM_STR;
-    }
-
     /**
      * Execute statement
      *
@@ -215,17 +196,26 @@ public function statement($sql, array $bindings = [])
 
         $pdoStatement = $this->pdo->prepare($sql);
 
+        /**
+         * NOTE:
+         * PHP 5.6 & 7 bug: https://bugs.php.net/bug.php?id=38546
+         * \PDO::PARAM_BOOL is not supported, use \PDO::PARAM_INT instead
+         */
+
         foreach ($bindings as $key => $value) {
             $pdoStatement->bindValue(
                 is_int($key) ? $key + 1 : $key,
                 $value,
-                $this->parseDataType($value)
+                ((is_int($value) === true || is_bool($value) === true) ? PDO::PARAM_INT : PDO::PARAM_STR)
             );
         }
 
         $pdoStatement->execute();
 
-        return [$pdoStatement, microtime(true) - $start];
+        return [
+            $pdoStatement,
+            microtime(true) - $start,
+        ];
     }
 
     /**
@@ -1066,7 +1056,7 @@ public function innerJoin($table, $key, $operator = null, $value = null)
      */
     public function raw($value, $bindings = null)
     {
-        if(is_array($bindings) === false) {
+        if (is_array($bindings) === false) {
             $bindings = func_get_args();
             array_shift($bindings);
         }