all file names correspond with class name

dibi/drivers/DibiMsSql2005Driver.php

@@ -10,7 +10,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/mssql2005.reflector.php';
+require_once dirname(__FILE__) . '/DibiMsSql2005Reflector.php';
 
 
 /**

dibi/drivers/DibiMsSql2005Reflector.php

@@ -17,7 +17,7 @@
  * @package    dibi\drivers
  * @internal
  */
-class DibiMssql2005Reflector extends DibiObject implements IDibiReflector
+class DibiMsSql2005Reflector extends DibiObject implements IDibiReflector
 {
 	/** @var IDibiDriver */
 	private $driver;

dibi/drivers/DibiMsSqlDriver.php

@@ -9,7 +9,7 @@
  * the file license.txt that was distributed with this source code.
  */
 
-require_once dirname(__FILE__) . '/mssql.reflector.php';
+require_once dirname(__FILE__) . '/DibiMsSqlReflector.php';
 
 /**
  * The dibi driver for MS SQL database.

dibi/drivers/DibiMySqlDriver.php

@@ -10,7 +10,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/mysql.reflector.php';
+require_once dirname(__FILE__) . '/DibiMySqlReflector.php';
 
 
 /**

dibi/drivers/DibiMySqliDriver.php

@@ -10,7 +10,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/mysql.reflector.php';
+require_once dirname(__FILE__) . '/DibiMySqlReflector.php';
 
 
 /**

dibi/drivers/DibiPdoDriver.php

@@ -10,8 +10,8 @@
  */
 
 
-require_once dirname(__FILE__) . '/mysql.reflector.php';
-require_once dirname(__FILE__) . '/sqlite.reflector.php';
+require_once dirname(__FILE__) . '/DibiMySqlReflector.php';
+require_once dirname(__FILE__) . '/DibiSqliteReflector.php';
 
 
 /**

dibi/drivers/DibiSqlite3Driver.php

@@ -10,7 +10,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/sqlite.reflector.php';
+require_once dirname(__FILE__) . '/DibiSqliteReflector.php';
 
 
 /**

dibi/drivers/DibiSqliteDriver.php

@@ -10,7 +10,7 @@
  */
 
 
-require_once dirname(__FILE__) . '/sqlite.reflector.php';
+require_once dirname(__FILE__) . '/DibiSqliteReflector.php';
 
 
 /**

dibi/libs/DibiConnection.php

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

dibi/libs/DibiDataSource.php

@@ -75,7 +75,7 @@ class DibiDataSource extends DibiObject implements IDataSource
 	/**
 	 * Selects columns to query.
 	 * @param  string|array  column name or array of column names
-	 * @param  string  		 column alias
+	 * @param  string        column alias
 	 * @return DibiDataSource  provides a fluent interface
 	 */
 	public function select($col, $as = NULL)
@@ -113,7 +113,7 @@ class DibiDataSource extends DibiObject implements IDataSource
 	/**
 	 * Selects columns to order by.
 	 * @param  string|array  column name or array of column names
-	 * @param  string  		 sorting direction
+	 * @param  string        sorting direction
 	 * @return DibiDataSource  provides a fluent interface
 	 */
 	public function orderBy($row, $sorting = 'ASC')

dibi/libs/DibiTranslator.php

@@ -218,7 +218,7 @@ final class DibiTranslator extends DibiObject
 
 						} else {
 							$v = $this->formatValue($v, $pair[1]);
-							if ($pair[1] === 'l' || $pair[1] === 'in')	{
+							if ($pair[1] === 'l' || $pair[1] === 'in') {
 								$op = 'IN ';
 							} elseif (strpos($pair[1], 'like') !== FALSE) {
 								$op = 'LIKE ';