From 83dab527294179617bedb37f6b7ee7a4bf99cf96 Mon Sep 17 00:00:00 2001 From: Don Gilbert Date: Sat, 8 Feb 2014 17:18:10 -0800 Subject: [PATCH] Move code into src/ and use PSR-4 --- composer.json | 11 +++++------ DatabaseDriver.php => src/DatabaseDriver.php | 0 DatabaseExporter.php => src/DatabaseExporter.php | 0 DatabaseFactory.php => src/DatabaseFactory.php | 0 DatabaseImporter.php => src/DatabaseImporter.php | 0 DatabaseInterface.php => src/DatabaseInterface.php | 0 DatabaseIterator.php => src/DatabaseIterator.php | 0 DatabaseQuery.php => src/DatabaseQuery.php | 0 {Mysql => src/Mysql}/MysqlDriver.php | 0 {Mysql => src/Mysql}/MysqlExporter.php | 0 {Mysql => src/Mysql}/MysqlImporter.php | 0 {Mysql => src/Mysql}/MysqlIterator.php | 0 {Mysql => src/Mysql}/MysqlQuery.php | 0 {Mysqli => src/Mysqli}/MysqliDriver.php | 0 {Mysqli => src/Mysqli}/MysqliExporter.php | 0 {Mysqli => src/Mysqli}/MysqliImporter.php | 0 {Mysqli => src/Mysqli}/MysqliIterator.php | 0 {Mysqli => src/Mysqli}/MysqliQuery.php | 0 {Oracle => src/Oracle}/OracleDriver.php | 0 {Oracle => src/Oracle}/OracleIterator.php | 0 {Oracle => src/Oracle}/OracleQuery.php | 0 {Pdo => src/Pdo}/PdoDriver.php | 0 {Pdo => src/Pdo}/PdoIterator.php | 0 {Pdo => src/Pdo}/PdoQuery.php | 0 {Postgresql => src/Postgresql}/PostgresqlDriver.php | 0 {Postgresql => src/Postgresql}/PostgresqlExporter.php | 0 {Postgresql => src/Postgresql}/PostgresqlImporter.php | 0 {Postgresql => src/Postgresql}/PostgresqlIterator.php | 0 {Postgresql => src/Postgresql}/PostgresqlQuery.php | 0 {Query => src/Query}/LimitableInterface.php | 0 {Query => src/Query}/PreparableInterface.php | 0 {Query => src/Query}/QueryElement.php | 0 {Sqlazure => src/Sqlazure}/SqlazureDriver.php | 0 {Sqlazure => src/Sqlazure}/SqlazureIterator.php | 0 {Sqlazure => src/Sqlazure}/SqlazureQuery.php | 0 {Sqlite => src/Sqlite}/SqliteDriver.php | 0 {Sqlite => src/Sqlite}/SqliteIterator.php | 0 {Sqlite => src/Sqlite}/SqliteQuery.php | 0 {Sqlsrv => src/Sqlsrv}/SqlsrvDriver.php | 0 {Sqlsrv => src/Sqlsrv}/SqlsrvIterator.php | 0 {Sqlsrv => src/Sqlsrv}/SqlsrvQuery.php | 0 41 files changed, 5 insertions(+), 6 deletions(-) rename DatabaseDriver.php => src/DatabaseDriver.php (100%) rename DatabaseExporter.php => src/DatabaseExporter.php (100%) rename DatabaseFactory.php => src/DatabaseFactory.php (100%) rename DatabaseImporter.php => src/DatabaseImporter.php (100%) rename DatabaseInterface.php => src/DatabaseInterface.php (100%) rename DatabaseIterator.php => src/DatabaseIterator.php (100%) rename DatabaseQuery.php => src/DatabaseQuery.php (100%) rename {Mysql => src/Mysql}/MysqlDriver.php (100%) rename {Mysql => src/Mysql}/MysqlExporter.php (100%) rename {Mysql => src/Mysql}/MysqlImporter.php (100%) rename {Mysql => src/Mysql}/MysqlIterator.php (100%) rename {Mysql => src/Mysql}/MysqlQuery.php (100%) rename {Mysqli => src/Mysqli}/MysqliDriver.php (100%) rename {Mysqli => src/Mysqli}/MysqliExporter.php (100%) rename {Mysqli => src/Mysqli}/MysqliImporter.php (100%) rename {Mysqli => src/Mysqli}/MysqliIterator.php (100%) rename {Mysqli => src/Mysqli}/MysqliQuery.php (100%) rename {Oracle => src/Oracle}/OracleDriver.php (100%) rename {Oracle => src/Oracle}/OracleIterator.php (100%) rename {Oracle => src/Oracle}/OracleQuery.php (100%) rename {Pdo => src/Pdo}/PdoDriver.php (100%) rename {Pdo => src/Pdo}/PdoIterator.php (100%) rename {Pdo => src/Pdo}/PdoQuery.php (100%) rename {Postgresql => src/Postgresql}/PostgresqlDriver.php (100%) rename {Postgresql => src/Postgresql}/PostgresqlExporter.php (100%) rename {Postgresql => src/Postgresql}/PostgresqlImporter.php (100%) rename {Postgresql => src/Postgresql}/PostgresqlIterator.php (100%) rename {Postgresql => src/Postgresql}/PostgresqlQuery.php (100%) rename {Query => src/Query}/LimitableInterface.php (100%) rename {Query => src/Query}/PreparableInterface.php (100%) rename {Query => src/Query}/QueryElement.php (100%) rename {Sqlazure => src/Sqlazure}/SqlazureDriver.php (100%) rename {Sqlazure => src/Sqlazure}/SqlazureIterator.php (100%) rename {Sqlazure => src/Sqlazure}/SqlazureQuery.php (100%) rename {Sqlite => src/Sqlite}/SqliteDriver.php (100%) rename {Sqlite => src/Sqlite}/SqliteIterator.php (100%) rename {Sqlite => src/Sqlite}/SqliteQuery.php (100%) rename {Sqlsrv => src/Sqlsrv}/SqlsrvDriver.php (100%) rename {Sqlsrv => src/Sqlsrv}/SqlsrvIterator.php (100%) rename {Sqlsrv => src/Sqlsrv}/SqlsrvQuery.php (100%) diff --git a/composer.json b/composer.json index bfb447c1a..67559a5de 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "type": "joomla-package", "description": "Joomla Database Package", "keywords": ["joomla", "framework", "database"], - "homepage": "https://github.com/joomla/joomla-framework-database", + "homepage": "https://github.com/joomla-framework/database", "license": "GPL-2.0+", "require": { "php": ">=5.3.10", @@ -12,11 +12,10 @@ "require-dev": { "joomla/test": "~1.0" }, - "target-dir": "Joomla/Database", "autoload": { - "psr-0": { - "Joomla\\Database": "" + "psr-4": { + "Joomla\\Database\\": "src/", + "Joomla\\Database\\Tests\\": "Tests/" } - }, - "minimum-stability": "beta" + } } diff --git a/DatabaseDriver.php b/src/DatabaseDriver.php similarity index 100% rename from DatabaseDriver.php rename to src/DatabaseDriver.php diff --git a/DatabaseExporter.php b/src/DatabaseExporter.php similarity index 100% rename from DatabaseExporter.php rename to src/DatabaseExporter.php diff --git a/DatabaseFactory.php b/src/DatabaseFactory.php similarity index 100% rename from DatabaseFactory.php rename to src/DatabaseFactory.php diff --git a/DatabaseImporter.php b/src/DatabaseImporter.php similarity index 100% rename from DatabaseImporter.php rename to src/DatabaseImporter.php diff --git a/DatabaseInterface.php b/src/DatabaseInterface.php similarity index 100% rename from DatabaseInterface.php rename to src/DatabaseInterface.php diff --git a/DatabaseIterator.php b/src/DatabaseIterator.php similarity index 100% rename from DatabaseIterator.php rename to src/DatabaseIterator.php diff --git a/DatabaseQuery.php b/src/DatabaseQuery.php similarity index 100% rename from DatabaseQuery.php rename to src/DatabaseQuery.php diff --git a/Mysql/MysqlDriver.php b/src/Mysql/MysqlDriver.php similarity index 100% rename from Mysql/MysqlDriver.php rename to src/Mysql/MysqlDriver.php diff --git a/Mysql/MysqlExporter.php b/src/Mysql/MysqlExporter.php similarity index 100% rename from Mysql/MysqlExporter.php rename to src/Mysql/MysqlExporter.php diff --git a/Mysql/MysqlImporter.php b/src/Mysql/MysqlImporter.php similarity index 100% rename from Mysql/MysqlImporter.php rename to src/Mysql/MysqlImporter.php diff --git a/Mysql/MysqlIterator.php b/src/Mysql/MysqlIterator.php similarity index 100% rename from Mysql/MysqlIterator.php rename to src/Mysql/MysqlIterator.php diff --git a/Mysql/MysqlQuery.php b/src/Mysql/MysqlQuery.php similarity index 100% rename from Mysql/MysqlQuery.php rename to src/Mysql/MysqlQuery.php diff --git a/Mysqli/MysqliDriver.php b/src/Mysqli/MysqliDriver.php similarity index 100% rename from Mysqli/MysqliDriver.php rename to src/Mysqli/MysqliDriver.php diff --git a/Mysqli/MysqliExporter.php b/src/Mysqli/MysqliExporter.php similarity index 100% rename from Mysqli/MysqliExporter.php rename to src/Mysqli/MysqliExporter.php diff --git a/Mysqli/MysqliImporter.php b/src/Mysqli/MysqliImporter.php similarity index 100% rename from Mysqli/MysqliImporter.php rename to src/Mysqli/MysqliImporter.php diff --git a/Mysqli/MysqliIterator.php b/src/Mysqli/MysqliIterator.php similarity index 100% rename from Mysqli/MysqliIterator.php rename to src/Mysqli/MysqliIterator.php diff --git a/Mysqli/MysqliQuery.php b/src/Mysqli/MysqliQuery.php similarity index 100% rename from Mysqli/MysqliQuery.php rename to src/Mysqli/MysqliQuery.php diff --git a/Oracle/OracleDriver.php b/src/Oracle/OracleDriver.php similarity index 100% rename from Oracle/OracleDriver.php rename to src/Oracle/OracleDriver.php diff --git a/Oracle/OracleIterator.php b/src/Oracle/OracleIterator.php similarity index 100% rename from Oracle/OracleIterator.php rename to src/Oracle/OracleIterator.php diff --git a/Oracle/OracleQuery.php b/src/Oracle/OracleQuery.php similarity index 100% rename from Oracle/OracleQuery.php rename to src/Oracle/OracleQuery.php diff --git a/Pdo/PdoDriver.php b/src/Pdo/PdoDriver.php similarity index 100% rename from Pdo/PdoDriver.php rename to src/Pdo/PdoDriver.php diff --git a/Pdo/PdoIterator.php b/src/Pdo/PdoIterator.php similarity index 100% rename from Pdo/PdoIterator.php rename to src/Pdo/PdoIterator.php diff --git a/Pdo/PdoQuery.php b/src/Pdo/PdoQuery.php similarity index 100% rename from Pdo/PdoQuery.php rename to src/Pdo/PdoQuery.php diff --git a/Postgresql/PostgresqlDriver.php b/src/Postgresql/PostgresqlDriver.php similarity index 100% rename from Postgresql/PostgresqlDriver.php rename to src/Postgresql/PostgresqlDriver.php diff --git a/Postgresql/PostgresqlExporter.php b/src/Postgresql/PostgresqlExporter.php similarity index 100% rename from Postgresql/PostgresqlExporter.php rename to src/Postgresql/PostgresqlExporter.php diff --git a/Postgresql/PostgresqlImporter.php b/src/Postgresql/PostgresqlImporter.php similarity index 100% rename from Postgresql/PostgresqlImporter.php rename to src/Postgresql/PostgresqlImporter.php diff --git a/Postgresql/PostgresqlIterator.php b/src/Postgresql/PostgresqlIterator.php similarity index 100% rename from Postgresql/PostgresqlIterator.php rename to src/Postgresql/PostgresqlIterator.php diff --git a/Postgresql/PostgresqlQuery.php b/src/Postgresql/PostgresqlQuery.php similarity index 100% rename from Postgresql/PostgresqlQuery.php rename to src/Postgresql/PostgresqlQuery.php diff --git a/Query/LimitableInterface.php b/src/Query/LimitableInterface.php similarity index 100% rename from Query/LimitableInterface.php rename to src/Query/LimitableInterface.php diff --git a/Query/PreparableInterface.php b/src/Query/PreparableInterface.php similarity index 100% rename from Query/PreparableInterface.php rename to src/Query/PreparableInterface.php diff --git a/Query/QueryElement.php b/src/Query/QueryElement.php similarity index 100% rename from Query/QueryElement.php rename to src/Query/QueryElement.php diff --git a/Sqlazure/SqlazureDriver.php b/src/Sqlazure/SqlazureDriver.php similarity index 100% rename from Sqlazure/SqlazureDriver.php rename to src/Sqlazure/SqlazureDriver.php diff --git a/Sqlazure/SqlazureIterator.php b/src/Sqlazure/SqlazureIterator.php similarity index 100% rename from Sqlazure/SqlazureIterator.php rename to src/Sqlazure/SqlazureIterator.php diff --git a/Sqlazure/SqlazureQuery.php b/src/Sqlazure/SqlazureQuery.php similarity index 100% rename from Sqlazure/SqlazureQuery.php rename to src/Sqlazure/SqlazureQuery.php diff --git a/Sqlite/SqliteDriver.php b/src/Sqlite/SqliteDriver.php similarity index 100% rename from Sqlite/SqliteDriver.php rename to src/Sqlite/SqliteDriver.php diff --git a/Sqlite/SqliteIterator.php b/src/Sqlite/SqliteIterator.php similarity index 100% rename from Sqlite/SqliteIterator.php rename to src/Sqlite/SqliteIterator.php diff --git a/Sqlite/SqliteQuery.php b/src/Sqlite/SqliteQuery.php similarity index 100% rename from Sqlite/SqliteQuery.php rename to src/Sqlite/SqliteQuery.php diff --git a/Sqlsrv/SqlsrvDriver.php b/src/Sqlsrv/SqlsrvDriver.php similarity index 100% rename from Sqlsrv/SqlsrvDriver.php rename to src/Sqlsrv/SqlsrvDriver.php diff --git a/Sqlsrv/SqlsrvIterator.php b/src/Sqlsrv/SqlsrvIterator.php similarity index 100% rename from Sqlsrv/SqlsrvIterator.php rename to src/Sqlsrv/SqlsrvIterator.php diff --git a/Sqlsrv/SqlsrvQuery.php b/src/Sqlsrv/SqlsrvQuery.php similarity index 100% rename from Sqlsrv/SqlsrvQuery.php rename to src/Sqlsrv/SqlsrvQuery.php