diff options
author | Ignace Nyamagana Butera <nyamsprod@gmail.com> | 2014-02-14 10:29:44 +0100 |
---|---|---|
committer | Ignace Nyamagana Butera <nyamsprod@gmail.com> | 2014-02-14 10:40:09 +0100 |
commit | cfc39411c0645fe782803254cedd682d7fdc494f (patch) | |
tree | 8d323af62d9d680a18f65bfbfe6a7d257365bacc | |
parent | 80b7f26c8e0f2e76c2d4c9a66642ae77fa98fa05 (diff) | |
download | csv-cfc39411c0645fe782803254cedd682d7fdc494f.zip csv-cfc39411c0645fe782803254cedd682d7fdc494f.tar.gz csv-cfc39411c0645fe782803254cedd682d7fdc494f.tar.bz2 |
regroup Iterator function class and method under the same namespace
-rw-r--r-- | composer.json | 2 | ||||
-rw-r--r-- | src/Bakame/Csv/Iterator/IteratorQuery.php (renamed from src/Bakame/Csv/Traits/IteratorQuery.php) | 3 | ||||
-rw-r--r-- | src/Bakame/Csv/Reader.php | 2 | ||||
-rw-r--r-- | test/Bakame/Csv/Iterator/IteratorQueryTest.php (renamed from test/Bakame/Csv/Traits/IteratorQueryTest.php) | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/composer.json b/composer.json index bc6b88d..38e7c5d 100644 --- a/composer.json +++ b/composer.json @@ -22,4 +22,4 @@ "Bakame": ["src", "test"] } } -} +}
\ No newline at end of file diff --git a/src/Bakame/Csv/Traits/IteratorQuery.php b/src/Bakame/Csv/Iterator/IteratorQuery.php index e740c41..5541b43 100644 --- a/src/Bakame/Csv/Traits/IteratorQuery.php +++ b/src/Bakame/Csv/Iterator/IteratorQuery.php @@ -30,14 +30,13 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -namespace Bakame\Csv\Traits; +namespace Bakame\Csv\Iterator; use ArrayObject; use CallbackFilterIterator; use InvalidArgumentException; use Iterator; use LimitIterator; -use Bakame\Csv\Iterator\MapIterator; /** * A Trait to filter in a SQL-like manner Iterators diff --git a/src/Bakame/Csv/Reader.php b/src/Bakame/Csv/Reader.php index 0763cd0..84394ff 100644 --- a/src/Bakame/Csv/Reader.php +++ b/src/Bakame/Csv/Reader.php @@ -35,7 +35,7 @@ namespace Bakame\Csv; use InvalidArgumentException; use CallbackFilterIterator; use Bakame\Csv\Iterator\MapIterator; -use Bakame\Csv\Traits\IteratorQuery; +use Bakame\Csv\Iterator\IteratorQuery; /** * A class to manage extracting and filtering a CSV diff --git a/test/Bakame/Csv/Traits/IteratorQueryTest.php b/test/Bakame/Csv/Iterator/IteratorQueryTest.php index d696f24..45e7b6f 100644 --- a/test/Bakame/Csv/Traits/IteratorQueryTest.php +++ b/test/Bakame/Csv/Iterator/IteratorQueryTest.php @@ -1,6 +1,6 @@ <?php -namespace Bakame\Csv\Traits; +namespace Bakame\Csv\Iterator; use ArrayIterator; use ReflectionClass; @@ -26,7 +26,7 @@ class IteratorQueryTest extends PHPUnit_Framework_TestCase private function createTraitObject() { - return $this->getObjectForTrait('\Bakame\Csv\Traits\IteratorQuery'); + return $this->getObjectForTrait('\Bakame\Csv\Iterator\IteratorQuery'); } public function setUp() |