cleanup, test fixes

Author: codemasher

.codeclimate.yml

@@ -0,0 +1,2 @@
+ko_fi: codemasher
+custom: "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4"

.github/FUNDING.yml

@@ -0,0 +1,145 @@
+# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
+# https://github.com/sebastianbergmann/phpunit/blob/master/.github/workflows/ci.yml
+
+name: "Continuous Integration"
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+
+jobs:
+
+#  static-code-analysis:
+#    name: "Static Code Analysis"
+#
+#    runs-on: ubuntu-latest
+#
+#    env:
+#      PHAN_ALLOW_XDEBUG: 0
+#      PHAN_DISABLE_XDEBUG_WARN: 1
+#
+#    steps:
+#      - name: "Checkout"
+#        uses: actions/checkout@v2
+#
+#      - name: "Install PHP"
+#        uses: shivammathur/setup-php@v2
+#        with:
+#          php-version: "7.4"
+#          tools: pecl
+#          coverage: none
+#          extensions: ast, curl, json, simplexml, zlib
+#
+#      - name: "Update dependencies with composer"
+#        run: composer update --no-interaction --no-ansi --no-progress --no-suggest --prefer-source
+#
+#      - name: "Run phan"
+#        run: php vendor/bin/phan
+
+  tests:
+    name: "Unit Tests"
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-20.04
+          - windows-2019
+        php-version:
+          - "7.4"
+          - "8.0"
+
+    steps:
+      - name: "Configure git to avoid issues with line endings"
+        if: ${{ runner.os == 'Windows' }}
+        run: git config --global core.autocrlf false
+
+      - name: "Checkout"
+        uses: actions/checkout@v2
+
+      # pgsql is already installed on the runner, we just need to start the service
+      # https://www.cybertec-postgresql.com/en/postgresql-github-actions-continuous-integration/
+      - name: "Start PostgreSQL (Linux)"
+        if: ${{ runner.os == 'Linux' }}
+        # we also need to change the password for the default user under Linux to match the one under Windows
+        run: |
+          sudo systemctl start postgresql.service
+          pg_isready
+          sudo -u postgres psql --command="ALTER USER postgres PASSWORD 'root';"
+          sudo -u postgres createdb --echo --owner=postgres dbtest
+
+      - name: "Start PostgreSQL (Windows)"
+        if: ${{ runner.os == 'Windows' }}
+        run: |
+          $pgService = Get-Service -Name postgresql*
+          Set-Service -InputObject $pgService -Status running -StartupType automatic
+          Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
+          & $env:PGBIN\createdb --echo --owner=postgres dbtest
+
+      - name: "Install MySQL"
+        uses: shogo82148/actions-setup-mysql@v1
+        with:
+          mysql-version: '5.7'
+          auto-start: true
+
+      - name: "Create MySQL test database"
+        run: mysql --user="root" --host="127.0.0.1" -e "CREATE DATABASE dbtest character set UTF8mb4 collate utf8mb4_bin;"
+
+      - name: "Install SQLite (Linux)"
+        if: ${{ runner.os == 'Linux' }}
+        run: sudo apt-get -y install sqlite3 libsqlite3-dev
+
+      - name: "Install SQLite (Windows)"
+        if: ${{ runner.os == 'Windows' }}
+        run: choco install sqlite
+
+#      - name: "Install Firebird (Linux)"
+#        if: ${{ runner.os == 'Linux' }}
+#        run: |
+#          sudo add-apt-repository ppa:mapopa/firebird3.0
+#          sudo apt-get update
+#          sudo apt-get install -y firebird2.5-superclassic
+#          sudo cp ./config/firebird.conf /etc/firebird/2.5/firebird.conf
+#          sudo service firebird2.5 restart
+
+#      - name: "Install Firebird (Windows)"
+#        if: ${{ runner.os == 'Windows' }}
+#        run: choco install firebird --version=2.5.8 -params '/ClientAndDevTools'
+
+#      - name: "Install MSSQL Server (Linux)"
+#        if: ${{ runner.os == 'Linux' }}
+#        run: sh ./scripts/install-mssql.sh
+
+#      - name: "Start SQL LocalDB (Windows)"
+#        if: ${{ runner.os == 'Windows' }}
+#        run: |
+#          # MSSQLLocalDB is the default SQL LocalDB instance
+#          SqlLocalDB start MSSQLLocalDB
+#          SqlLocalDB info MSSQLLocalDB
+#          sqlcmd -S "(localdb)\MSSQLLocalDB" -Q "create database dbtest;"
+
+      - name: "Install PHP with extensions"
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          coverage: pcov
+          extensions: mbstring, odbc, pdo_odbc, mysqli, pdo_mysql, pgsql, pdo_pgsql, sqlite3, pdo_sqlite, sqlsrv, pdo_sqlsrv, pdo_firebird
+#          ini-values:
+
+      - name: "Install dependencies with composer"
+        run: composer update --no-ansi --no-interaction --no-progress --no-suggest --prefer-source
+
+      - name: "Run tests with phpunit"
+        run: php vendor/phpunit/phpunit/phpunit --configuration=phpunit.xml.dist
+
+      - name: "Send code coverage report to Codecov.io"
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/ci.yml

@@ -5,3 +5,4 @@ vendor
 config/.env
 storage
 *.phpunit.result.cache
+phpunit.xml

.gitignore

@@ -1,9 +1,19 @@
+build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - php-scrutinizer-run
+  environment:
+    php: 8.0.0
+
 filter:
   excluded_paths:
     - config/*
     - examples/*
-    - public/*
     - scripts/*
     - storage/*
     - tests/*
     - vendor/*
+    - .github/*
+    - .phan/*

.scrutinizer.yml

@@ -1,64 +1,55 @@
 # chillerlan/php-database
 
-A PHP 7.2+ SQL client and querybuilder for the most common databases.
+A PHP 7.4+ SQL client and querybuilder for the most common databases.
 
+[![PHP Version Support][php-badge]][php]
 [![version][packagist-badge]][packagist]
 [![license][license-badge]][license]
-[![Travis][travis-badge]][travis]
 [![Coverage][coverage-badge]][coverage]
 [![Scrunitizer][scrutinizer-badge]][scrutinizer]
-[![Packagist downloads][downloads-badge]][downloads]
-[![PayPal donate][donate-badge]][donate]
+[![Packagist downloads][downloads-badge]][downloads]<br/>
+[![Continuous Integration][gh-action-badge]][gh-action]
 
-[packagist-badge]: https://img.shields.io/packagist/v/chillerlan/php-database.svg?style=flat-square
+[php-badge]: https://img.shields.io/packagist/php-v/chillerlan/php-oauth-core?logo=php&color=8892BF
+[php]: https://www.php.net/supported-versions.php
+[packagist-badge]: https://img.shields.io/packagist/v/chillerlan/php-database.svg?logo=packagist
 [packagist]: https://packagist.org/packages/chillerlan/php-database
-[license-badge]: https://img.shields.io/github/license/chillerlan/php-database.svg?style=flat-square
+[license-badge]: https://img.shields.io/github/license/chillerlan/php-database.svg?
 [license]: https://github.com/chillerlan/php-database/blob/master/LICENSE
-[travis-badge]: https://img.shields.io/travis/chillerlan/php-database.svg?style=flat-square
-[travis]: https://travis-ci.org/chillerlan/php-database
-[coverage-badge]: https://img.shields.io/codecov/c/github/chillerlan/php-database.svg?style=flat-square
+[coverage-badge]: https://img.shields.io/codecov/c/github/chillerlan/php-database.svg?logo=codecov
 [coverage]: https://codecov.io/github/chillerlan/php-database
-[scrutinizer-badge]: https://img.shields.io/scrutinizer/g/chillerlan/php-database.svg?style=flat-square
+[scrutinizer-badge]: https://img.shields.io/scrutinizer/g/chillerlan/php-database.svg?logo=scrutinizer
 [scrutinizer]: https://scrutinizer-ci.com/g/chillerlan/php-database
-[downloads-badge]: https://img.shields.io/packagist/dt/chillerlan/php-database.svg?style=flat-square
+[downloads-badge]: https://img.shields.io/packagist/dt/chillerlan/php-database.svg?logo=packagist
 [downloads]: https://packagist.org/packages/chillerlan/php-database/stats
-[donate-badge]: https://img.shields.io/badge/donate-paypal-ff33aa.svg?style=flat-square
-[donate]: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WLYUNAT9ZTJZ4
+[gh-action-badge]: https://github.com/chillerlan/php-database/workflows/Continuous%20Integration/badge.svg
+[gh-action]: https://github.com/chillerlan/php-database/actions
 
 # Documentation
 
 ## Requirements
-- PHP 7.2+
-- one of the supported databases, set up to work with PHP
-
-## Supported databases
-- [MySQL](https://dev.mysql.com/doc/refman/5.6/en/) (5.5+) / [MariaDB](https://mariadb.com/kb/en/library/basic-sql-statements/)
-- [PostgreSQL](https://www.postgresql.org/docs/9.5/static/index.html) (9.5+)
-- [SQLite3](https://www.sqlite.org/lang.html)
-- [Firebird](https://www.firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25.html) (2.5+)
-- [Microsoft SQL Server](https://github.com/Microsoft/msphpsql) ([transact-sql](https://docs.microsoft.com/sql/t-sql/language-reference))
-- any other database supported via PDO, ODBC or native PHP extension
+- PHP 7.4+
+- one of the supported databases, set up to work with PHP:
+  - [MySQL](https://dev.mysql.com/doc/refman/5.6/en/) (5.5+) / [MariaDB](https://mariadb.com/kb/en/library/basic-sql-statements/)
+  - [PostgreSQL](https://www.postgresql.org/docs/9.5/static/index.html) (9.5+)
+  - [SQLite3](https://www.sqlite.org/lang.html)
+  - [Firebird](https://www.firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25.html) (2.5+)
+  - [Microsoft SQL Server](https://github.com/Microsoft/msphpsql) ([transact-sql](https://docs.microsoft.com/sql/t-sql/language-reference))
 
 ## Installation
 **requires [composer](https://getcomposer.org)**
 
 ### *composer.json*
- (note: replace `dev-master` with a [version boundary](https://getcomposer.org/doc/articles/versions.md#summary))
+ (note: replace `dev-main` with a [version boundary](https://getcomposer.org/doc/articles/versions.md#summary))
 ```json
 {
 	"require": {
-		"php": ">=7.2.0",
-		"chillerlan/database": "^2.1"
+		"php": "^7.4",
+		"chillerlan/database": "dev-main"
 	}
 }
 ```
 
-### Manual installation
-Download the desired version of the package from [master](https://github.com/chillerlan/php-database/archive/master.zip) or
-[release](https://github.com/chillerlan/php-database/releases) and extract the contents to your project folder. After that:
-- run `composer install` to install the required dependencies and generate `/vendor/autoload.php`.
-- if you use a custom autoloader, point the namespace `chillerlan\Database` to the folder `src` of the package
-
 Profit!
 
 ## Usage

.travis.yml

@@ -1,14 +1,28 @@
-DB_MYSQLI_HOST=localhost
+DB_MYSQLI_HOST=127.0.0.1
+#DB_MYSQLI_SOCKET=/tmp/mysql.sock
 DB_MYSQLI_PORT=3306
 DB_MYSQLI_DATABASE=dbtest
 DB_MYSQLI_USERNAME=root
-
-DB_SQLITE3_DATABASE=/home/travis/build/chillerlan/php-database/storage/dbtest.sqlite
-SQLITE_MEM_DATABASE=:memory:
+DB_MYSQLI_PASSWORD=
 
 DB_POSTGRES_HOST=localhost
 DB_POSTGRES_PORT=5432
 DB_POSTGRES_DATABASE=dbtest
 DB_POSTGRES_USERNAME=postgres
+DB_POSTGRES_PASSWORD=root
+
+DB_SQLITE3_DATABASE={STORAGE}dbtest.sqlite
+SQLITE_MEM_DATABASE=:memory:
+
+DB_FIREBIRD_HOST=127.0.0.1
+DB_FIREBIRD_PORT=3050
+#DB_FIREBIRD_SOCKET=
+DB_FIREBIRD_DATABASE={STORAGE}dbtest.fdb
+DB_FIREBIRD_USERNAME=SYSDBA
+DB_FIREBIRD_PASSWORD=masterkey
 
-IS_CI=TRUE
+DB_MSSQL_HOST=localhost
+DB_MSSQL_PORT=1433
+DB_MSSQL_DATABASE=dbtest
+DB_MSSQL_USERNAME=SA
+DB_MSSQL_PASSWORD=DBtestytest42

README.md

@@ -12,9 +12,7 @@
 use chillerlan\Database\{
 	Database,DatabaseOptions,Drivers\MySQLiDrv
 };
-use chillerlan\Logger\Log;
-use chillerlan\Logger\LogOptions;
-use chillerlan\Logger\Output\ConsoleLog;
+
 use chillerlan\SimpleCache\MemoryCache;
 use chillerlan\DotEnv\DotEnv;
 use Psr\Log\LogLevel;
@@ -35,6 +33,5 @@
 	'password'     => $env->get('DB_MYSQLI_PASSWORD'),
 ]);
 
-$log = (new Log)->addInstance(new ConsoleLog(new LogOptions(['minLogLevel' => LogLevel::DEBUG])), 'console');
 
 

config/.env_travis

@@ -15,15 +15,12 @@
 /** @var \Psr\SimpleCache\CacheInterface $cache */
 $cache   = null;
 
-/** @var \Psr\Log\LoggerInterface $log */
-$log = null;
-
 require_once __DIR__.'/common.php';
 
 $options->storage_path = __DIR__.'/../storage';
 
-$dumper = new Dumper($options, $cache, $log);
+$dumper = new Dumper($options, $cache);
 
-#$dumper->dump(['gw2_*', 'items_'], ['gw2_player_pos', 'gw2_language', 'gw2_items_test', 'gw2_current_matches']);
+$dumper->dump(['gw2_*', 'items_'], ['gw2_worlds1', 'gw2_player_pos', 'gw2_language', 'gw2_items_test', 'gw2_items', 'gw2_config', 'gw2_diff', 'gw2_current_matches']);
 $dumper->dump(['gw2_items_temp']);
 

examples/common.php

@@ -17,12 +17,9 @@
 /** @var \Psr\SimpleCache\CacheInterface $cache */
 $cache   = null;
 
-/** @var \Psr\Log\LoggerInterface $log */
-$log = null;
-
 require_once __DIR__.'/common.php';
 
-$db = new Database($options, $cache, $log);
+$db = new Database($options, $cache);
 $db->connect();
 
 $db->create