Merge pull request #103 from skipperbent/v4-development

Version 4.10.0

Author: skipperbent

.coveralls.yml

@@ -0,0 +1,3 @@
+service_name: travis-ci
+coverage_clover: _clover/clover.xml
+json_path: _clover/coveralls-upload.json

.travis.yml

@@ -3,11 +3,32 @@ sudo: false
 language: php
 
 php:
-  - 7.1
+  - 7.2
+
+services:
+  - mysql
+
+before_install:
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'
+  - mysql test < ./tests/test.sql
 
 before_script:
-  - curl -sS http://getcomposer.org/installer | php
-  - php composer.phar install --prefer-source --no-interaction
+  - mkdir -p _clover
+  - ls -al
 
 script:
-  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpunit --coverage-clover _clover/clover.xml
+
+install:
+  # Install composer packages
+  - travis_retry composer install --no-interaction --no-suggest
+  # Install coveralls.phar
+  - wget -c -nc --retry-connrefused --tries=0 https://github.com/php-coveralls/php-coveralls/releases/download/v2.0.0/php-coveralls.phar -O coveralls.phar
+  - chmod +x coveralls.phar
+  - php coveralls.phar --version
+
+after_success:
+  # Submit coverage report to Coveralls servers, see .coveralls.yml
+  - travis_retry php coveralls.phar -v
+  # Submit coverage report to codecov.io
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -8,7 +8,9 @@ The syntax is similar to Laravel's query builder "Eloquent", but with less overh
 This library is stable, maintained and are used by sites around the world (check the [credits](#credits)).
 
 **Requirements:**
-- PHP version 7.1 or higher is required for pecee-pixie version 4.x and above. Versions prior to 4.x are available [here](https://github.com/skipperbent/pixie).
+- PHP version 7.1 or higher is required for pecee-pixie version 4.x and above (versions prior to 4.x are available [here](https://github.com/skipperbent/pixie)).
+- PDO extension.
+- PDO sql-lite extension.
 
 **Features:**
 

composer.json

@@ -34,7 +34,9 @@
     }
   ],
   "require": {
-    "php": ">=7.1"
+    "php": ">=7.1",
+    "ext-pdo": "*",
+    "ext-sqlite": "*"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0",

composer.lock

@@ -25,12 +25,12 @@ class Connection
      *
      * @var IConnectionAdapter
      */
-    protected static $adapter;
+    protected $adapter;
 
     /**
      * @var array
      */
-    protected static $adapterConfig;
+    protected $adapterConfig;
 
     /**
      * @var \PDO
@@ -74,10 +74,6 @@ public function __construct($adapter, array $adapterConfig)
      */
     public static function getStoredConnection(): self
     {
-        if (static::$storedConnection === null && static::$adapter !== null && static::$adapterConfig !== null) {
-            static::$storedConnection = new static(static::$adapter, static::$adapterConfig);
-        }
-
         return static::$storedConnection;
     }
 
@@ -102,15 +98,15 @@ public function connect(): self
      */
     public function getAdapter(): IConnectionAdapter
     {
-        return static::$adapter;
+        return $this->adapter;
     }
 
     /**
      * @return array
      */
     public function getAdapterConfig(): array
     {
-        return static::$adapterConfig;
+        return $this->adapterConfig;
     }
 
     /**
@@ -147,7 +143,7 @@ public function getQueryBuilder(): QueryBuilderHandler
      */
     public function setAdapter(IConnectionAdapter $adapter): self
     {
-        static::$adapter = $adapter;
+        $this->adapter = $adapter;
 
         return $this;
     }
@@ -159,7 +155,7 @@ public function setAdapter(IConnectionAdapter $adapter): self
      */
     public function setAdapterConfig(array $adapterConfig): self
     {
-        static::$adapterConfig = $adapterConfig;
+        $this->adapterConfig = $adapterConfig;
 
         return $this;
     }