Updated to 1.1.7 version

josantonius · josantonius · commit 89c068932aab · 2017-10-27T00:28:15.000+02:00
diff --git a/README-ES.md b/README-ES.md
@@ -53,12 +53,12 @@ También puedes **clonar el repositorio** completo con Git:
 
 O **instalarlo manualmente**:
 
-Descargar [Database.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Database.php), [Provider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider/Provider.php), [PDOprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider/PDOprovider.php), [MSSQLprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider/MSSQLprovider.php) and [DBException.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Exception/DBException.php):
+Descargar [Database.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Database.php), [Provider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider.php), [PDOprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider.php), [MSSQLprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider.php) and [DBException.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Exception/DBException.php):
 
     $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Database.php
-    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider/Provider.php
-    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider/PDOprovider.php
-    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider/MSSQLprovider.php
+    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider.php
+    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider.php
+    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider.php
     $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Exception/DBException.php
 
 ### Get connection
@@ -642,6 +642,7 @@ Ejecutar todas las pruebas anteriores:
 - [x] Completar tests
 - [ ] Refactorizar código
 - [ ] Agregar métodos para consultas con SQL joins
+- [ ] Completar proveedor para MSSQL
 - [x] Mejorar la documentación
 
 ### Manejador de excepciones
diff --git a/README.md b/README.md
@@ -52,12 +52,12 @@ You can also **clone the complete repository** with Git:
 
 Or **install it manually**:
 
-Download [Database.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Database.php), [Provider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider/Provider.php), [PDOprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider/PDOprovider.php), [MSSQLprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider/MSSQLprovider.php) and [DBException.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Exception/DBException.php):
+Download [Database.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Database.php), [Provider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider.php), [PDOprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider.php), [MSSQLprovider.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider.php) and [DBException.php](https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Exception/DBException.php):
 
     $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Database.php
-    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider/Provider.php
-    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider/PDOprovider.php
-    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider/MSSQLprovider.php
+    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/Provider.php
+    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/PDOprovider.php
+    $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Provider/MSSQLprovider.php
     $ wget https://raw.githubusercontent.com/Josantonius/PHP-Database/master/src/Exception/DBException.php
 
 ### Get connection
@@ -655,6 +655,7 @@ Run all previous tests:
 - [x] Create tests
 - [ ] Refactorizate code
 - [ ] Add methods for SQL joins
+- [ ] Complete provider for MSSQL
 - [x] Improve documentation
 
 ### Exception Handler
diff --git a/src/Database.php b/src/Database.php
@@ -135,7 +135,7 @@ private function __construct(
         $password,
         $settings
     ) {
-        $provider = "Josantonius\\Database\\Provider\\$provider\\$provider";
+        $provider = "Josantonius\\Database\\Provider\\$provider";
 
         if (!class_exists($provider)) {
             throw new DBException("The provider doesn't exist: $provider");
diff --git a/src/Provider/MSSQLprovider.php b/src/Provider/MSSQLprovider.php
@@ -9,10 +9,9 @@
  * @since     1.0.0
  */
 
-namespace Josantonius\Database\Provider\MSSQLprovider;
+namespace Josantonius\Database\Provider;
 
 use Josantonius\Database\Exception\DBException;
-use Josantonius\Database\Provider\Provider;
 
 /**
  * MSSQL database provider.
diff --git a/src/Provider/PDOprovider.php b/src/Provider/PDOprovider.php
@@ -9,10 +9,9 @@
  * @since     1.0.0
  */
 
-namespace Josantonius\Database\Provider\PDOprovider;
+namespace Josantonius\Database\Provider;
 
 use Josantonius\Database\Exception\DBException;
-use Josantonius\Database\Provider\Provider;
 
 /**
  * PDO database provider.
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -78,7 +78,7 @@ public function testGetConnectionFromEliasis()
         $this->assertContains('Eliasis', $db::$id);
 
         $this->assertContains(
-            'Josantonius\Database\Provider\PDOprovider\PDOprovider',
+            'Josantonius\Database\Provider\PDOprovider',
             get_class($db->provider)
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function testGetConnectionFromEliasis()`
`78`	`78`	`$this->assertContains('Eliasis', $db::$id);`
`79`	`79`
`80`	`80`	`$this->assertContains(`
`81`		`- 'Josantonius\Database\Provider\PDOprovider\PDOprovider',`
	`81`	`+ 'Josantonius\Database\Provider\PDOprovider',`
`82`	`82`	`get_class($db->provider)`
`83`	`83`	`);`
`84`	`84`	`}`