From 40280558c3dbef636e0a58e6c0e3c91343f2135b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Kucha=C5=99?= <honza.kuchar@grifart.cz>
Date: Sat, 21 May 2016 13:32:47 +0200
Subject: [PATCH] Separated drivers into separate namespace
---
.idea/modules.xml | 2 +-
src/Cursor.php | 1 +
src/{ => Driver}/ArrayCursorDriver.php | 3 ++-
src/{ => Driver}/ICursorDriver.php | 2 +-
src/{ => Driver}/PostgresCursorDriver.php | 2 +-
src/{ => Driver}/PostgresCursorFactory.php | 4 +++-
tests/Cursor/CursorTest.phpt | 15 +--------------
tests/Cursor/PostgresCursorTest.phpt | 2 +-
tests/Cursor/SemanticCursorIntegration.phpt | 14 +-------------
tests/Cursor/TrackedCursorTest.phpt | 14 +-------------
10 files changed, 13 insertions(+), 46 deletions(-)
rename src/{ => Driver}/ArrayCursorDriver.php (98%)
rename src/{ => Driver}/ICursorDriver.php (98%)
rename src/{ => Driver}/PostgresCursorDriver.php (98%)
rename src/{ => Driver}/PostgresCursorFactory.php (91%)
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 5b8593b..fe19a38 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/../cursor/.idea/cursor.iml" filepath="$PROJECT_DIR$/../cursor/.idea/cursor.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/cursor.iml" filepath="$PROJECT_DIR$/.idea/cursor.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/src/Cursor.php b/src/Cursor.php
index 70b1bbc..131f99e 100644
--- a/src/Cursor.php
+++ b/src/Cursor.php
@@ -4,6 +4,7 @@
*/
namespace Grifart\Mappi\Cursor;
+use Grifart\Mappi\Cursor\Driver\ICursorDriver;
/**
* PostgreSQL cursor driver
diff --git a/src/ArrayCursorDriver.php b/src/Driver/ArrayCursorDriver.php
similarity index 98%
rename from src/ArrayCursorDriver.php
rename to src/Driver/ArrayCursorDriver.php
index f982f03..029dd0d 100644
--- a/src/ArrayCursorDriver.php
+++ b/src/Driver/ArrayCursorDriver.php
@@ -3,7 +3,8 @@
* This file is part of mappi/cursor.
*/
-namespace Grifart\Mappi\Cursor;
+namespace Grifart\Mappi\Cursor\Driver;
+use Grifart\Mappi\Cursor\CursorException;
/**
* Array Cursor simulates scrolling cursor as implemented in PostgreSQL 9.5.
diff --git a/src/ICursorDriver.php b/src/Driver/ICursorDriver.php
similarity index 98%
rename from src/ICursorDriver.php
rename to src/Driver/ICursorDriver.php
index e4b0d97..1fd5493 100644
--- a/src/ICursorDriver.php
+++ b/src/Driver/ICursorDriver.php
@@ -2,7 +2,7 @@
/**
* This file is part of mappi/cursor.
*/
-namespace Grifart\Mappi\Cursor;
+namespace Grifart\Mappi\Cursor\Driver;
/**
* Represents cursor
diff --git a/src/PostgresCursorDriver.php b/src/Driver/PostgresCursorDriver.php
similarity index 98%
rename from src/PostgresCursorDriver.php
rename to src/Driver/PostgresCursorDriver.php
index 6d58bdf..984424e 100644
--- a/src/PostgresCursorDriver.php
+++ b/src/Driver/PostgresCursorDriver.php
@@ -3,7 +3,7 @@
* This file is part of mappi/cursor.
*/
-namespace Grifart\Mappi\Cursor;
+namespace Grifart\Mappi\Cursor\Driver;
use Dibi\Connection;
use Dibi\Row;
diff --git a/src/PostgresCursorFactory.php b/src/Driver/PostgresCursorFactory.php
similarity index 91%
rename from src/PostgresCursorFactory.php
rename to src/Driver/PostgresCursorFactory.php
index 67b08d8..e2f2468 100644
--- a/src/PostgresCursorFactory.php
+++ b/src/Driver/PostgresCursorFactory.php
@@ -3,9 +3,11 @@
* This file is part of mappi/cursor.
*/
-namespace Grifart\Mappi\Cursor;
+namespace Grifart\Mappi\Cursor\Driver;
use Dibi\Connection;
+use Grifart\Mappi\Cursor\Cursor;
+use Grifart\Mappi\Cursor\ICursor;
final class PostgresCursorFactory
{
diff --git a/tests/Cursor/CursorTest.phpt b/tests/Cursor/CursorTest.phpt
index 2473cb4..360a1b0 100644
--- a/tests/Cursor/CursorTest.phpt
+++ b/tests/Cursor/CursorTest.phpt
@@ -5,8 +5,8 @@
namespace Grifart\Mappi\Tests\Store\Cursor;
-use Grifart\Mappi\Cursor\ArrayCursorDriver;
use Grifart\Mappi\Cursor\Cursor;
+use Grifart\Mappi\Cursor\Driver\ArrayCursorDriver;
use Grifart\Mappi\Cursor\ICursor;
require_once __DIR__ . "/../bootstrap.php";
@@ -19,11 +19,6 @@ class CursorTest extends ICursorTest
protected function setUp()
{
- //global $connection, $SQL_thousandRowsAscending;
- //$connection->begin();
-
- //$factory = new PostgresCursorFactory($connection);
- //$this->uut = $factory->create($SQL_thousandRowsAscending, true);
$driver = new ArrayCursorDriver();
$driver->createTestCursor("test", 1000);
$this->uut = new Cursor(
@@ -34,14 +29,6 @@ class CursorTest extends ICursorTest
parent::setUp();
}
- public function tearDown()
- {
-// global $connection;
-// $connection->rollback();
-
- parent::tearDown();
- }
-
}
(new CursorTest())->run();
diff --git a/tests/Cursor/PostgresCursorTest.phpt b/tests/Cursor/PostgresCursorTest.phpt
index 716babd..cd4444b 100644
--- a/tests/Cursor/PostgresCursorTest.phpt
+++ b/tests/Cursor/PostgresCursorTest.phpt
@@ -6,8 +6,8 @@
namespace Grifart\Mappi\Tests\Store\Cursor;
use Dibi\DriverException;
+use Grifart\Mappi\Cursor\Driver\PostgresCursorFactory;
use Grifart\Mappi\Cursor\ICursor;
-use Grifart\Mappi\Cursor\PostgresCursorFactory;
use Tester\Environment;
require_once __DIR__ . "/../bootstrap.php";
diff --git a/tests/Cursor/SemanticCursorIntegration.phpt b/tests/Cursor/SemanticCursorIntegration.phpt
index 5cef2c7..95dc3e0 100644
--- a/tests/Cursor/SemanticCursorIntegration.phpt
+++ b/tests/Cursor/SemanticCursorIntegration.phpt
@@ -5,8 +5,8 @@
namespace Grifart\Mappi\Tests\Store\Cursor;
-use Grifart\Mappi\Cursor\ArrayCursorDriver;
use Grifart\Mappi\Cursor\Cursor;
+use Grifart\Mappi\Cursor\Driver\ArrayCursorDriver;
use Grifart\Mappi\Cursor\SemanticCursor;
use Mockery;
@@ -27,10 +27,6 @@ class SemanticCursorIntegrationTest extends ICursorTest
protected function setUp()
{
-// global $connection, $SQL_thousandRowsAscending;
-// $connection->begin();
-
-
$driver = new ArrayCursorDriver();
$driver->createTestCursor("test", 1000);
$cursor = new Cursor(
@@ -44,14 +40,6 @@ class SemanticCursorIntegrationTest extends ICursorTest
parent::setUp();
}
- public function tearDown()
- {
-// global $connection;
-// $connection->rollback();
-
- parent::tearDown();
- }
-
}
(new SemanticCursorIntegrationTest())->run();
diff --git a/tests/Cursor/TrackedCursorTest.phpt b/tests/Cursor/TrackedCursorTest.phpt
index 0511173..cc6b98f 100644
--- a/tests/Cursor/TrackedCursorTest.phpt
+++ b/tests/Cursor/TrackedCursorTest.phpt
@@ -8,9 +8,9 @@
namespace Grifart\Mappi\Tests\Store\Cursor;
-use Grifart\Mappi\Cursor\ArrayCursorDriver;
use Grifart\Mappi\Cursor\Cursor;
use Grifart\Mappi\Cursor\CursorPosition;
+use Grifart\Mappi\Cursor\Driver\ArrayCursorDriver;
use Grifart\Mappi\Cursor\TrackedCursor;
use Tester\Assert;
@@ -27,10 +27,6 @@ class TrackedCursorTest extends ICursorTest
protected function setUp()
{
-// global $connection, $SQL_thousandRowsAscending;
-// $connection->begin();
-
-// $factory = new PostgresCursorFactory($connection);
$driver = new ArrayCursorDriver();
$driver->createTestCursor("test", 1000);
$cursor = new Cursor(
@@ -45,14 +41,6 @@ class TrackedCursorTest extends ICursorTest
parent::setUp();
}
- public function tearDown()
- {
-// global $connection;
-// $connection->rollback();
-
- parent::tearDown();
- }
-
private function assertPosition(string $position)
{
Assert::equal($position, (string)$this->uut->getPosition());
--
GitLab