From 369ca6eb0439091697ee9cbc34c83e9a4bdaace3 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Fri, 19 Jan 2018 15:47:34 -0500 Subject: [PATCH] Flatten source structure a bit --- .editorconfig | 20 +++++++++++++++++++ composer.json | 11 +++++++--- src/{Query => }/AbstractQueryBuilder.php | 0 src/{Query => }/BadDBDriverException.php | 0 src/{Query => }/ConnectionManager.php | 0 src/{Query => }/Drivers/AbstractDriver.php | 0 src/{Query => }/Drivers/AbstractSQL.php | 0 src/{Query => }/Drivers/AbstractUtil.php | 0 src/{Query => }/Drivers/DriverInterface.php | 0 src/{Query => }/Drivers/Firebird/Driver.php | 0 src/{Query => }/Drivers/Firebird/Result.php | 0 src/{Query => }/Drivers/Firebird/SQL.php | 0 src/{Query => }/Drivers/Firebird/Util.php | 0 src/{Query => }/Drivers/Mysql/Driver.php | 0 src/{Query => }/Drivers/Mysql/SQL.php | 0 src/{Query => }/Drivers/Mysql/Util.php | 0 src/{Query => }/Drivers/PDOInterface.php | 0 .../Drivers/PDOStatementInterface.php | 0 src/{Query => }/Drivers/Pgsql/Driver.php | 0 src/{Query => }/Drivers/Pgsql/SQL.php | 0 src/{Query => }/Drivers/Pgsql/Util.php | 0 src/{Query => }/Drivers/SQLInterface.php | 0 src/{Query => }/Drivers/Sqlite/Driver.php | 0 src/{Query => }/Drivers/Sqlite/SQL.php | 0 src/{Query => }/Drivers/Sqlite/Util.php | 0 src/{Query => }/QueryBuilder.php | 0 src/{Query => }/QueryBuilderInterface.php | 0 src/{Query => }/QueryParser.php | 0 28 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .editorconfig rename src/{Query => }/AbstractQueryBuilder.php (100%) rename src/{Query => }/BadDBDriverException.php (100%) rename src/{Query => }/ConnectionManager.php (100%) rename src/{Query => }/Drivers/AbstractDriver.php (100%) rename src/{Query => }/Drivers/AbstractSQL.php (100%) rename src/{Query => }/Drivers/AbstractUtil.php (100%) rename src/{Query => }/Drivers/DriverInterface.php (100%) rename src/{Query => }/Drivers/Firebird/Driver.php (100%) rename src/{Query => }/Drivers/Firebird/Result.php (100%) rename src/{Query => }/Drivers/Firebird/SQL.php (100%) rename src/{Query => }/Drivers/Firebird/Util.php (100%) rename src/{Query => }/Drivers/Mysql/Driver.php (100%) rename src/{Query => }/Drivers/Mysql/SQL.php (100%) rename src/{Query => }/Drivers/Mysql/Util.php (100%) rename src/{Query => }/Drivers/PDOInterface.php (100%) rename src/{Query => }/Drivers/PDOStatementInterface.php (100%) rename src/{Query => }/Drivers/Pgsql/Driver.php (100%) rename src/{Query => }/Drivers/Pgsql/SQL.php (100%) rename src/{Query => }/Drivers/Pgsql/Util.php (100%) rename src/{Query => }/Drivers/SQLInterface.php (100%) rename src/{Query => }/Drivers/Sqlite/Driver.php (100%) rename src/{Query => }/Drivers/Sqlite/SQL.php (100%) rename src/{Query => }/Drivers/Sqlite/Util.php (100%) rename src/{Query => }/QueryBuilder.php (100%) rename src/{Query => }/QueryBuilderInterface.php (100%) rename src/{Query => }/QueryParser.php (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..acaebe3 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,20 @@ +# EditorConfig is awesome: http://EditorConfig.org + +# top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file +[*] +end_of_line = lf +insert_final_newline = false +charset = utf-8 +indent_style = tab +trim_trailing_whitespace = true + +[*.{cpp,c,h,hpp,cxx}] +insert_final_newline = true + +# Yaml files +[*.{yml,yaml}] +indent_style = space +indent_size = 4 diff --git a/composer.json b/composer.json index 9a781fc..fdb83cb 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "pdepend/pdepend": "^2.5", "phploc/phploc": "^4.0", "phpmd/phpmd": "^2.4", - "phpstan/phpstan": "*", + "phpstan/phpstan": "^0.9.1", "phpunit/phpunit": "^5.5", "sebastian/phpcpd": "^2.0", "simpletest/simpletest": "^1.1", @@ -38,14 +38,19 @@ }, "autoload": { "psr-4": { - "Query\\": "src/Query" + "Query\\": "src" }, "files": ["src/common.php"] }, + "autoload-dev": { + "psr-4": { + "Query\\Tests\\": "tests" + } + }, "scripts": { "coverage": "phpdbg -qrr -- vendor/bin/phpunit -c build", "phpstan": "phpstan analyse -l 3 -c phpstan.neon src tests", - "test": "vendor/bin/phpunit" + "test": "phpunit -c build" }, "scripts-descriptions": { "coverage": "Generate test coverage report", diff --git a/src/Query/AbstractQueryBuilder.php b/src/AbstractQueryBuilder.php similarity index 100% rename from src/Query/AbstractQueryBuilder.php rename to src/AbstractQueryBuilder.php diff --git a/src/Query/BadDBDriverException.php b/src/BadDBDriverException.php similarity index 100% rename from src/Query/BadDBDriverException.php rename to src/BadDBDriverException.php diff --git a/src/Query/ConnectionManager.php b/src/ConnectionManager.php similarity index 100% rename from src/Query/ConnectionManager.php rename to src/ConnectionManager.php diff --git a/src/Query/Drivers/AbstractDriver.php b/src/Drivers/AbstractDriver.php similarity index 100% rename from src/Query/Drivers/AbstractDriver.php rename to src/Drivers/AbstractDriver.php diff --git a/src/Query/Drivers/AbstractSQL.php b/src/Drivers/AbstractSQL.php similarity index 100% rename from src/Query/Drivers/AbstractSQL.php rename to src/Drivers/AbstractSQL.php diff --git a/src/Query/Drivers/AbstractUtil.php b/src/Drivers/AbstractUtil.php similarity index 100% rename from src/Query/Drivers/AbstractUtil.php rename to src/Drivers/AbstractUtil.php diff --git a/src/Query/Drivers/DriverInterface.php b/src/Drivers/DriverInterface.php similarity index 100% rename from src/Query/Drivers/DriverInterface.php rename to src/Drivers/DriverInterface.php diff --git a/src/Query/Drivers/Firebird/Driver.php b/src/Drivers/Firebird/Driver.php similarity index 100% rename from src/Query/Drivers/Firebird/Driver.php rename to src/Drivers/Firebird/Driver.php diff --git a/src/Query/Drivers/Firebird/Result.php b/src/Drivers/Firebird/Result.php similarity index 100% rename from src/Query/Drivers/Firebird/Result.php rename to src/Drivers/Firebird/Result.php diff --git a/src/Query/Drivers/Firebird/SQL.php b/src/Drivers/Firebird/SQL.php similarity index 100% rename from src/Query/Drivers/Firebird/SQL.php rename to src/Drivers/Firebird/SQL.php diff --git a/src/Query/Drivers/Firebird/Util.php b/src/Drivers/Firebird/Util.php similarity index 100% rename from src/Query/Drivers/Firebird/Util.php rename to src/Drivers/Firebird/Util.php diff --git a/src/Query/Drivers/Mysql/Driver.php b/src/Drivers/Mysql/Driver.php similarity index 100% rename from src/Query/Drivers/Mysql/Driver.php rename to src/Drivers/Mysql/Driver.php diff --git a/src/Query/Drivers/Mysql/SQL.php b/src/Drivers/Mysql/SQL.php similarity index 100% rename from src/Query/Drivers/Mysql/SQL.php rename to src/Drivers/Mysql/SQL.php diff --git a/src/Query/Drivers/Mysql/Util.php b/src/Drivers/Mysql/Util.php similarity index 100% rename from src/Query/Drivers/Mysql/Util.php rename to src/Drivers/Mysql/Util.php diff --git a/src/Query/Drivers/PDOInterface.php b/src/Drivers/PDOInterface.php similarity index 100% rename from src/Query/Drivers/PDOInterface.php rename to src/Drivers/PDOInterface.php diff --git a/src/Query/Drivers/PDOStatementInterface.php b/src/Drivers/PDOStatementInterface.php similarity index 100% rename from src/Query/Drivers/PDOStatementInterface.php rename to src/Drivers/PDOStatementInterface.php diff --git a/src/Query/Drivers/Pgsql/Driver.php b/src/Drivers/Pgsql/Driver.php similarity index 100% rename from src/Query/Drivers/Pgsql/Driver.php rename to src/Drivers/Pgsql/Driver.php diff --git a/src/Query/Drivers/Pgsql/SQL.php b/src/Drivers/Pgsql/SQL.php similarity index 100% rename from src/Query/Drivers/Pgsql/SQL.php rename to src/Drivers/Pgsql/SQL.php diff --git a/src/Query/Drivers/Pgsql/Util.php b/src/Drivers/Pgsql/Util.php similarity index 100% rename from src/Query/Drivers/Pgsql/Util.php rename to src/Drivers/Pgsql/Util.php diff --git a/src/Query/Drivers/SQLInterface.php b/src/Drivers/SQLInterface.php similarity index 100% rename from src/Query/Drivers/SQLInterface.php rename to src/Drivers/SQLInterface.php diff --git a/src/Query/Drivers/Sqlite/Driver.php b/src/Drivers/Sqlite/Driver.php similarity index 100% rename from src/Query/Drivers/Sqlite/Driver.php rename to src/Drivers/Sqlite/Driver.php diff --git a/src/Query/Drivers/Sqlite/SQL.php b/src/Drivers/Sqlite/SQL.php similarity index 100% rename from src/Query/Drivers/Sqlite/SQL.php rename to src/Drivers/Sqlite/SQL.php diff --git a/src/Query/Drivers/Sqlite/Util.php b/src/Drivers/Sqlite/Util.php similarity index 100% rename from src/Query/Drivers/Sqlite/Util.php rename to src/Drivers/Sqlite/Util.php diff --git a/src/Query/QueryBuilder.php b/src/QueryBuilder.php similarity index 100% rename from src/Query/QueryBuilder.php rename to src/QueryBuilder.php diff --git a/src/Query/QueryBuilderInterface.php b/src/QueryBuilderInterface.php similarity index 100% rename from src/Query/QueryBuilderInterface.php rename to src/QueryBuilderInterface.php diff --git a/src/Query/QueryParser.php b/src/QueryParser.php similarity index 100% rename from src/Query/QueryParser.php rename to src/QueryParser.php