Skip to content

Commit

Permalink
Merge pull request #3 from vierge-noire/#1-make-the-package-fully-fra…
Browse files Browse the repository at this point in the history
…mework-agnostic

#1 Rename Namspace
  • Loading branch information
pabloelcolombiano authored Oct 4, 2022
2 parents 5e711a3 + 7cf100c commit effed25
Show file tree
Hide file tree
Showing 22 changed files with 80 additions and 75 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
"autoload": {
"psr-4": {
"TestDataBaseCleaner\\": "src"
"TestDatabaseCleaner\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"TestDataBaseCleaner\\Test\\": "tests"
"TestDatabaseCleaner\\Test\\": "tests"
}
},
"scripts": {
Expand Down
6 changes: 5 additions & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
processIsolation="false"
stopOnFailure="false"
bootstrap="./tests/bootstrap.php"
>
>
<php>
<ini name="memory_limit" value="-1"/>
<ini name="apc.enable_cli" value="1"/>
Expand All @@ -19,4 +19,8 @@
<directory>./tests/IntegrationTest/</directory>
</testsuite>
</testsuites>

<extensions>
<extension class="TestDatabaseCleaner\PHPUnitExtension" />
</extensions>
</phpunit>
14 changes: 7 additions & 7 deletions src/ConnectionCleaner.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner;
namespace TestDatabaseCleaner;

use TestDataBaseCleaner\Error\PDOErrorException;
use TestDataBaseCleaner\Sniffer\BaseTableSniffer;
use TestDatabaseCleaner\Error\PDOErrorException;
use TestDatabaseCleaner\Sniffer\BaseTableSniffer;

/**
* Connection cleaner
*/
final class ConnectionCleaner
{
/**
* @var \TestDataBaseCleaner\Sniffer\BaseTableSniffer
* @var \TestDatabaseCleaner\Sniffer\BaseTableSniffer
*/
private $sniffer;

/**
* @param \TestDataBaseCleaner\Sniffer\BaseTableSniffer $sniffer Table Sniffer
* @param \TestDatabaseCleaner\Sniffer\BaseTableSniffer $sniffer Table Sniffer
*/
public function __construct(BaseTableSniffer $sniffer)
{
Expand All @@ -38,7 +38,7 @@ public function __construct(BaseTableSniffer $sniffer)
* Truncate all the dirty tables
*
* @return void
* @throws \TestDataBaseCleaner\Error\PDOErrorException if the query failed
* @throws \TestDatabaseCleaner\Error\PDOErrorException if the query failed
*/
public function truncateDirtyTables(): void
{
Expand All @@ -57,7 +57,7 @@ public function truncateDirtyTables(): void
}

/**
* @return \TestDataBaseCleaner\Sniffer\BaseTableSniffer
* @return \TestDatabaseCleaner\Sniffer\BaseTableSniffer
*/
public function getSniffer(): BaseTableSniffer
{
Expand Down
24 changes: 12 additions & 12 deletions src/ConnectionRegistry.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner;
namespace TestDatabaseCleaner;

use PDO;
use TestDataBaseCleaner\Error\ConfigurationErrorException;
use TestDataBaseCleaner\Error\DriverNotSupportedException;
use TestDataBaseCleaner\Sniffer\MysqlTableSniffer;
use TestDataBaseCleaner\Sniffer\PostgresTableSniffer;
use TestDataBaseCleaner\Sniffer\SqliteTableSniffer;
use TestDatabaseCleaner\Error\ConfigurationErrorException;
use TestDatabaseCleaner\Error\DriverNotSupportedException;
use TestDatabaseCleaner\Sniffer\MysqlTableSniffer;
use TestDatabaseCleaner\Sniffer\PostgresTableSniffer;
use TestDatabaseCleaner\Sniffer\SqliteTableSniffer;

/**
* Connection registry
Expand All @@ -28,7 +28,7 @@ final class ConnectionRegistry
/**
* Configuration sets.
*
* @var array<array-key, \TestDataBaseCleaner\ConnectionCleaner>
* @var array<array-key, \TestDatabaseCleaner\ConnectionCleaner>
*/
private static $connections = [];

Expand All @@ -39,8 +39,8 @@ final class ConnectionRegistry
* @param \PDO $pdo PDO
* @param string[] $ignoredTables Tables that should not be truncated (e.g. migrations tables)
* @return void
* @throws \TestDataBaseCleaner\Error\ConfigurationErrorException if the alias is already defined
* @throws \TestDataBaseCleaner\Error\DriverNotSupportedException if the driver is not supported
* @throws \TestDatabaseCleaner\Error\ConfigurationErrorException if the alias is already defined
* @throws \TestDatabaseCleaner\Error\DriverNotSupportedException if the driver is not supported
*/
public static function addConnection(string $alias, PDO $pdo, array $ignoredTables = []): void
{
Expand All @@ -52,7 +52,7 @@ public static function addConnection(string $alias, PDO $pdo, array $ignoredTabl
}

/**
* @return array<array-key, \TestDataBaseCleaner\ConnectionCleaner>
* @return array<array-key, \TestDatabaseCleaner\ConnectionCleaner>
*/
public static function getConnections(): array
{
Expand All @@ -70,8 +70,8 @@ public static function clear(): void
/**
* @param \PDO $pdo Connection
* @param string[] $ignoredTables Tables that should not be truncated (e.g. migrations tables)
* @return \TestDataBaseCleaner\ConnectionCleaner Connection cleaner
* @throws \TestDataBaseCleaner\Error\DriverNotSupportedException if the driver is not supported
* @return \TestDatabaseCleaner\ConnectionCleaner Connection cleaner
* @throws \TestDatabaseCleaner\Error\DriverNotSupportedException if the driver is not supported
*/
private static function getConnectionCleaner(PDO $pdo, array $ignoredTables): ConnectionCleaner
{
Expand Down
2 changes: 1 addition & 1 deletion src/Error/ConfigurationErrorException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Error;
namespace TestDatabaseCleaner\Error;

/**
* Configuration Exception
Expand Down
2 changes: 1 addition & 1 deletion src/Error/DriverNotSupportedException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Error;
namespace TestDatabaseCleaner\Error;

/**
* Driver not supported by the package exception
Expand Down
2 changes: 1 addition & 1 deletion src/Error/PDOErrorException.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Error;
namespace TestDatabaseCleaner\Error;

/**
* PDO Error Exception
Expand Down
7 changes: 4 additions & 3 deletions src/PHPUnitExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner;
namespace TestDatabaseCleaner;

use PHPUnit\Runner\BeforeTestHook;

Expand All @@ -28,11 +28,12 @@ class PHPUnitExtension implements BeforeTestHook
*/
public function executeBeforeTest(string $test): void
{
if (!$this->isTestUsingTruncateDirtyTableTrait($test)) {
$testClass = explode('::', $test)[0];
if (!$this->isTestUsingTruncateDirtyTableTrait($testClass)) {
return;
}

foreach (ConnectionRegistry::getConnections() as $alias => $connectionCleaners) {
foreach (ConnectionRegistry::getConnections() as $connectionCleaners) {
$connectionCleaners->truncateDirtyTables();
}
}
Expand Down
10 changes: 5 additions & 5 deletions src/Sniffer/BaseTableSniffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Sniffer;
namespace TestDatabaseCleaner\Sniffer;

use PDO;
use PDOStatement;
use TestDataBaseCleaner\Error\PDOErrorException;
use TestDatabaseCleaner\Error\PDOErrorException;

abstract class BaseTableSniffer
{
Expand Down Expand Up @@ -48,7 +48,7 @@ abstract class BaseTableSniffer
* Truncate all the dirty tables
*
* @return void
* @throws \TestDataBaseCleaner\Error\PDOErrorException if the query failed
* @throws \TestDatabaseCleaner\Error\PDOErrorException if the query failed
*/
abstract public function truncateDirtyTables(): void;

Expand Down Expand Up @@ -121,7 +121,7 @@ public function getDirtyTables(): array
/**
* @param string $cmd Command to execute
* @return \PDOStatement
* @throws \TestDataBaseCleaner\Error\PDOErrorException if the query returned false
* @throws \TestDatabaseCleaner\Error\PDOErrorException if the query returned false
* @throws \PDOException if the query failed
*/
protected function execute(string $cmd): PDOStatement
Expand Down Expand Up @@ -189,7 +189,7 @@ public function dropDirtyTableCollector()
*
* @param string $query Query to fetch
* @return string[]
* @throws \TestDataBaseCleaner\Error\PDOErrorException
* @throws \TestDatabaseCleaner\Error\PDOErrorException
*/
protected function fetchQuery(string $query): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sniffer/MysqlTableSniffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Sniffer;
namespace TestDatabaseCleaner\Sniffer;

class MysqlTableSniffer extends BaseTableSniffer
{
Expand Down
2 changes: 1 addition & 1 deletion src/Sniffer/PostgresTableSniffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Sniffer;
namespace TestDatabaseCleaner\Sniffer;

class PostgresTableSniffer extends BaseTableSniffer
{
Expand Down
4 changes: 2 additions & 2 deletions src/Sniffer/SqliteTableSniffer.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Sniffer;
namespace TestDatabaseCleaner\Sniffer;

use TestDataBaseCleaner\Error\PDOErrorException;
use TestDatabaseCleaner\Error\PDOErrorException;

class SqliteTableSniffer extends BaseTableSniffer
{
Expand Down
2 changes: 1 addition & 1 deletion src/TruncateDirtyTablesTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner;
namespace TestDatabaseCleaner;

/**
* Will truncate the test DBs before each test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Test\Fixture\Classes;
namespace TestDatabaseCleaner\Test\Fixture\Classes;

class ClassExtendingTruncateDirtyTablesTrait extends ClassUsingTruncateDirtyTablesTrait
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Test\Fixture\Classes;
namespace TestDatabaseCleaner\Test\Fixture\Classes;

class ClassUsingTraitUsingTruncateDirtyTablesTrait
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Fixture/Classes/ClassUsingTruncateDirtyTablesTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Test\Fixture\Classes;
namespace TestDatabaseCleaner\Test\Fixture\Classes;

use TestDataBaseCleaner\TruncateDirtyTablesTrait;
use TestDatabaseCleaner\TruncateDirtyTablesTrait;

class ClassUsingTruncateDirtyTablesTrait
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Fixture/Classes/TraitUsingTruncateDirtyTablesTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Test\Fixture\Classes;
namespace TestDatabaseCleaner\Test\Fixture\Classes;

use TestDataBaseCleaner\TruncateDirtyTablesTrait;
use TestDatabaseCleaner\TruncateDirtyTablesTrait;

trait TraitUsingTruncateDirtyTablesTrait
{
Expand Down
26 changes: 13 additions & 13 deletions tests/IntegrationTest/Sniffer/BaseTableSnifferIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Test\IntegrationTest\Sniffer;
namespace TestDatabaseCleaner\Test\IntegrationTest\Sniffer;

use PDO;
use PHPUnit\Framework\TestCase;
use TestDataBaseCleaner\Sniffer\BaseTableSniffer;
use TestDatabaseCleaner\Sniffer\BaseTableSniffer;

class BaseTableSnifferIntegrationTest extends TestCase
{
Expand Down Expand Up @@ -48,10 +48,10 @@ public function setUp(): void
}

/**
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::getDirtyTables
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::fetchQuery
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::execute
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::markAllTablesToCleanAsDirty
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::getDirtyTables
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::fetchQuery
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::execute
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::markAllTablesToCleanAsDirty
*/
public function testBaseTableSniffer_getDirtyTables(): void
{
Expand All @@ -62,9 +62,9 @@ public function testBaseTableSniffer_getDirtyTables(): void
}

/**
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::getAllNonIgnoredTables
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::getAllTables
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::fetchAllTables
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::getAllNonIgnoredTables
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::getAllTables
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::fetchAllTables
*/
public function testBaseTableSniffer_getAllNonIgnoredTables(): void
{
Expand All @@ -77,9 +77,9 @@ public function testBaseTableSniffer_getAllNonIgnoredTables(): void
}

/**
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::dropTriggers
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::getTriggers
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::createTriggerFor
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::dropTriggers
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::getTriggers
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::createTriggerFor
*/
public function testBaseTableSniffer_CreateTriggerFor(): void
{
Expand All @@ -97,7 +97,7 @@ public function testBaseTableSniffer_CreateTriggerFor(): void
}

/**
* @covers \TestDataBaseCleaner\Sniffer\BaseTableSniffer::createTruncateDirtyTablesProcedure
* @covers \TestDatabaseCleaner\Sniffer\BaseTableSniffer::createTruncateDirtyTablesProcedure
*/
public function testBaseTableSniffer_CreateTruncateDirtyTablesProcedure(): void
{
Expand Down
8 changes: 4 additions & 4 deletions tests/UnitTest/ConnectionCleanerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
* @since 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace TestDataBaseCleaner\Test\UnitTest;
namespace TestDatabaseCleaner\Test\UnitTest;

use PHPUnit\Framework\TestCase;
use TestDataBaseCleaner\ConnectionCleaner;
use TestDataBaseCleaner\Error\PDOErrorException;
use TestDataBaseCleaner\Sniffer\BaseTableSniffer;
use TestDatabaseCleaner\ConnectionCleaner;
use TestDatabaseCleaner\Error\PDOErrorException;
use TestDatabaseCleaner\Sniffer\BaseTableSniffer;

class ConnectionCleanerTest extends TestCase
{
Expand Down
Loading

0 comments on commit effed25

Please sign in to comment.