new directory structure, moved to /src

composer.json

@@ -21,7 +21,7 @@
 		"dg/dibi": "self.version"
 	},
 	"autoload": {
-		"classmap": ["dibi/"]
+		"classmap": ["src/"]
 	},
 	"extra": {
 		"branch-alias": {

dibi/bridges/Nette-2.1/config.sample.neon

@@ -1,12 +0,0 @@
-# This will create service named 'dibi.connection'.
-# Requires Nette Framework 2.1
-
-extensions:
-	dibi: DibiNette21Extension
-
-dibi:
-	host: localhost
-	username: root
-	password: ***
-	database: foo
-	lazy: TRUE

dibi/dibi.php

@@ -1,35 +1,3 @@
 <?php
-
-/**
- * dibi - smart database abstraction layer (http://dibiphp.com)
- *
- * Copyright (c) 2005, 2012 David Grudl (https://davidgrudl.com)
- */
-
-
-/**
- * Check PHP configuration.
- */
-if (version_compare(PHP_VERSION, '5.2.0', '<')) {
-	throw new Exception('dibi needs PHP 5.2.0 or newer.');
-}
-
-
-require_once dirname(__FILE__) . '/libs/interfaces.php';
-require_once dirname(__FILE__) . '/libs/Dibi.php';
-require_once dirname(__FILE__) . '/libs/DibiDateTime.php';
-require_once dirname(__FILE__) . '/libs/DibiObject.php';
-require_once dirname(__FILE__) . '/libs/DibiLiteral.php';
-require_once dirname(__FILE__) . '/libs/DibiHashMap.php';
-require_once dirname(__FILE__) . '/libs/DibiException.php';
-require_once dirname(__FILE__) . '/libs/DibiConnection.php';
-require_once dirname(__FILE__) . '/libs/DibiResult.php';
-require_once dirname(__FILE__) . '/libs/DibiResultIterator.php';
-require_once dirname(__FILE__) . '/libs/DibiRow.php';
-require_once dirname(__FILE__) . '/libs/DibiTranslator.php';
-require_once dirname(__FILE__) . '/libs/DibiDataSource.php';
-require_once dirname(__FILE__) . '/libs/DibiFluent.php';
-require_once dirname(__FILE__) . '/libs/DibiDatabaseInfo.php';
-require_once dirname(__FILE__) . '/libs/DibiEvent.php';
-require_once dirname(__FILE__) . '/libs/DibiFileLogger.php';
-require_once dirname(__FILE__) . '/libs/DibiFirePhpLogger.php';
+trigger_error('Dibi was moved to /src/loader.php', E_USER_WARNING);
+require dirname(__FILE__) . '/../src/loader.php';

examples/connecting-to-databases.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 // connects to SQlite using dibi class

examples/database-reflection.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/dumping-sql-and-result-set.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/importing-dump-from-file.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/query-language-and-conditions.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/query-language-basic-examples.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-datetime.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-fluent-syntax.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-limit-and-offset.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/using-logger.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 date_default_timezone_set('Europe/Prague');
 

examples/using-profiler.php

@@ -6,7 +6,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/using-substitutions.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

examples/using-transactions.php

@@ -4,7 +4,7 @@
 
 <?php
 
-require __DIR__ . '/../dibi/dibi.php';
+require __DIR__ . '/../src/loader.php';
 
 
 dibi::connect(array(

src/Dibi/Connection.php

@@ -75,10 +75,10 @@ class DibiConnection extends DibiObject
 			$config['driver'] = dibi::$defaultDriver;
 		}
 
-		$class = preg_replace(array('#\W#', '#sql#'), array('_', 'Sql'), ucfirst(strtolower($config['driver'])));
+		$class = $tmp = preg_replace(array('#\W#', '#sql#'), array('_', 'Sql'), ucfirst(strtolower($config['driver'])));
 		$class = "Dibi{$class}Driver";
 		if (!class_exists($class)) {
-			include_once dirname(__FILE__) . "/../drivers/$class.php";
+			include_once dirname(__FILE__) . "/Drivers/$tmp.php";
 
 			if (!class_exists($class, FALSE)) {
 				throw new DibiException("Unable to create instance of dibi driver '$class'.");

src/Dibi/Drivers/MsSql2005Driver.php

@@ -6,7 +6,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/DibiMsSql2005Reflector.php';
+require_once dirname(__FILE__) . '/MsSql2005Reflector.php';
 
 
 /**

src/Dibi/Drivers/MsSqlDriver.php

@@ -5,7 +5,7 @@
  * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
  */
 
-require_once dirname(__FILE__) . '/DibiMsSqlReflector.php';
+require_once dirname(__FILE__) . '/MsSqlReflector.php';
 
 /**
  * The dibi driver for MS SQL database.

src/Dibi/Drivers/MySqlDriver.php

@@ -6,7 +6,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/DibiMySqlReflector.php';
+require_once dirname(__FILE__) . '/MySqlReflector.php';
 
 
 /**

src/Dibi/Drivers/MySqliDriver.php

@@ -6,7 +6,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/DibiMySqlReflector.php';
+require_once dirname(__FILE__) . '/MySqlReflector.php';
 
 
 /**

src/Dibi/Drivers/PdoDriver.php

@@ -6,8 +6,8 @@
  */
 
 
-require_once dirname(__FILE__) . '/DibiMySqlReflector.php';
-require_once dirname(__FILE__) . '/DibiSqliteReflector.php';
+require_once dirname(__FILE__) . '/MySqlReflector.php';
+require_once dirname(__FILE__) . '/SqliteReflector.php';
 
 
 /**

src/Dibi/Drivers/Sqlite3Driver.php

@@ -6,7 +6,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/DibiSqliteReflector.php';
+require_once dirname(__FILE__) . '/SqliteReflector.php';
 
 
 /**

src/Dibi/Drivers/SqliteDriver.php

@@ -6,7 +6,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/DibiSqliteReflector.php';
+require_once dirname(__FILE__) . '/SqliteReflector.php';
 
 
 /**

src/loader.php

@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * This file is part of the "dibi" - smart database abstraction layer.
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+
+/**
+ * Check PHP configuration.
+ */
+if (version_compare(PHP_VERSION, '5.2.0', '<')) {
+	throw new Exception('dibi needs PHP 5.2.0 or newer.');
+}
+
+
+require_once dirname(__FILE__) . '/Dibi/interfaces.php';
+require_once dirname(__FILE__) . '/Dibi/Dibi.php';
+require_once dirname(__FILE__) . '/Dibi/DateTime.php';
+require_once dirname(__FILE__) . '/Dibi/Object.php';
+require_once dirname(__FILE__) . '/Dibi/Literal.php';
+require_once dirname(__FILE__) . '/Dibi/HashMap.php';
+require_once dirname(__FILE__) . '/Dibi/Exception.php';
+require_once dirname(__FILE__) . '/Dibi/Connection.php';
+require_once dirname(__FILE__) . '/Dibi/Result.php';
+require_once dirname(__FILE__) . '/Dibi/ResultIterator.php';
+require_once dirname(__FILE__) . '/Dibi/Row.php';
+require_once dirname(__FILE__) . '/Dibi/Translator.php';
+require_once dirname(__FILE__) . '/Dibi/DataSource.php';
+require_once dirname(__FILE__) . '/Dibi/Fluent.php';
+require_once dirname(__FILE__) . '/Dibi/Reflection/DatabaseInfo.php';
+require_once dirname(__FILE__) . '/Dibi/Event.php';
+require_once dirname(__FILE__) . '/Dibi/Loggers/FileLogger.php';
+require_once dirname(__FILE__) . '/Dibi/Loggers/FirePhpLogger.php';