From 5f000198452234efa2e7314c96dd8539d5334c97 Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Thu, 11 Sep 2014 16:48:55 -0500
Subject: [PATCH 1/3] fix namespace to avoid conflicts

---
 .../PhpSpec/{ => DataProvider}/Annotation/ParserSpec.php    | 2 +-
 src/Coduo/PhpSpec/{ => DataProvider}/Annotation/Parser.php  | 2 +-
 .../PhpSpec/{ => DataProvider}/DataProviderExtension.php    | 6 +++---
 .../{ => DataProvider}/Listener/DataProviderListener.php    | 6 +++---
 .../Runner/Maintainer/DataProviderMaintainer.php            | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename spec/Coduo/PhpSpec/{ => DataProvider}/Annotation/ParserSpec.php (88%)
 rename src/Coduo/PhpSpec/{ => DataProvider}/Annotation/Parser.php (91%)
 rename src/Coduo/PhpSpec/{ => DataProvider}/DataProviderExtension.php (76%)
 rename src/Coduo/PhpSpec/{ => DataProvider}/Listener/DataProviderListener.php (94%)
 rename src/Coduo/PhpSpec/{ => DataProvider}/Runner/Maintainer/DataProviderMaintainer.php (97%)

diff --git a/spec/Coduo/PhpSpec/Annotation/ParserSpec.php b/spec/Coduo/PhpSpec/DataProvider/Annotation/ParserSpec.php
similarity index 88%
rename from spec/Coduo/PhpSpec/Annotation/ParserSpec.php
rename to spec/Coduo/PhpSpec/DataProvider/Annotation/ParserSpec.php
index 233d9e7..486de9f 100644
--- a/spec/Coduo/PhpSpec/Annotation/ParserSpec.php
+++ b/spec/Coduo/PhpSpec/DataProvider/Annotation/ParserSpec.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace spec\Coduo\PhpSpec\Annotation;
+namespace spec\Coduo\PhpSpec\Annotation\DataProvider;
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
diff --git a/src/Coduo/PhpSpec/Annotation/Parser.php b/src/Coduo/PhpSpec/DataProvider/Annotation/Parser.php
similarity index 91%
rename from src/Coduo/PhpSpec/Annotation/Parser.php
rename to src/Coduo/PhpSpec/DataProvider/Annotation/Parser.php
index e0d9dae..48268ea 100644
--- a/src/Coduo/PhpSpec/Annotation/Parser.php
+++ b/src/Coduo/PhpSpec/DataProvider/Annotation/Parser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Coduo\PhpSpec\Annotation;
+namespace Coduo\PhpSpec\DataProvider\Annotation;
 
 class Parser
 {
diff --git a/src/Coduo/PhpSpec/DataProviderExtension.php b/src/Coduo/PhpSpec/DataProvider/DataProviderExtension.php
similarity index 76%
rename from src/Coduo/PhpSpec/DataProviderExtension.php
rename to src/Coduo/PhpSpec/DataProvider/DataProviderExtension.php
index ce9153d..c75f6d5 100644
--- a/src/Coduo/PhpSpec/DataProviderExtension.php
+++ b/src/Coduo/PhpSpec/DataProvider/DataProviderExtension.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Coduo\PhpSpec;
+namespace Coduo\PhpSpec\DataProvider;
 
-use Coduo\PhpSpec\Listener\DataProviderListener;
-use Coduo\PhpSpec\Runner\Maintainer\DataProviderMaintainer;
+use Coduo\PhpSpec\DataProvider\Listener\DataProviderListener;
+use Coduo\PhpSpec\DataProvider\Runner\Maintainer\DataProviderMaintainer;
 use PhpSpec\Extension\ExtensionInterface;
 use PhpSpec\ServiceContainer;
 
diff --git a/src/Coduo/PhpSpec/Listener/DataProviderListener.php b/src/Coduo/PhpSpec/DataProvider/Listener/DataProviderListener.php
similarity index 94%
rename from src/Coduo/PhpSpec/Listener/DataProviderListener.php
rename to src/Coduo/PhpSpec/DataProvider/Listener/DataProviderListener.php
index e0b80a6..c9596ae 100644
--- a/src/Coduo/PhpSpec/Listener/DataProviderListener.php
+++ b/src/Coduo/PhpSpec/DataProvider/Listener/DataProviderListener.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Coduo\PhpSpec\Listener;
+namespace Coduo\PhpSpec\DataProvider\Listener;
 
-use Coduo\PhpSpec\Annotation\Parser;
+use Coduo\PhpSpec\DataProvider\Annotation\Parser;
 use PhpSpec\Loader\Node\ExampleNode;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use PhpSpec\Event\SpecificationEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class DataProviderListener implements EventSubscriberInterface
 {
diff --git a/src/Coduo/PhpSpec/Runner/Maintainer/DataProviderMaintainer.php b/src/Coduo/PhpSpec/DataProvider/Runner/Maintainer/DataProviderMaintainer.php
similarity index 97%
rename from src/Coduo/PhpSpec/Runner/Maintainer/DataProviderMaintainer.php
rename to src/Coduo/PhpSpec/DataProvider/Runner/Maintainer/DataProviderMaintainer.php
index a81b59d..74ac854 100644
--- a/src/Coduo/PhpSpec/Runner/Maintainer/DataProviderMaintainer.php
+++ b/src/Coduo/PhpSpec/DataProvider/Runner/Maintainer/DataProviderMaintainer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Coduo\PhpSpec\Runner\Maintainer;
+namespace Coduo\PhpSpec\DataProvider\Runner\Maintainer;
 
-use Coduo\PhpSpec\Annotation\Parser;
+use Coduo\PhpSpec\DataProvider\Annotation\Parser;
 use PhpSpec\Loader\Node\ExampleNode;
 use PhpSpec\Runner\Maintainer\MaintainerInterface;
 use PhpSpec\SpecificationInterface;

From 36f832192b870a4ed3d26e4c5f1e043feaa59407 Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Sat, 13 Sep 2014 16:06:42 -0500
Subject: [PATCH 2/3] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7f2fa3b..f1860f3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "phpspec/phpspec": "2.0.*"
+        "phpspec/phpspec": "*"
     },
     "require-dev": {
         "behat/behat": "2.4.*@stable",

From 24da27b2d69f3b799969c81d04b9203eec10e834 Mon Sep 17 00:00:00 2001
From: Luis Cordova <cordoval@gmail.com>
Date: Tue, 16 Sep 2014 06:13:32 -0500
Subject: [PATCH 3/3] fix test

---
 features/bootstrap/PHPSpecContext.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/bootstrap/PHPSpecContext.php b/features/bootstrap/PHPSpecContext.php
index 86440d3..bf9b2fb 100644
--- a/features/bootstrap/PHPSpecContext.php
+++ b/features/bootstrap/PHPSpecContext.php
@@ -49,7 +49,7 @@ public function thePhpspecdataproviderextensionIsEnabled()
     {
         $phpspecyml = <<<YML
 extensions:
-  - Coduo\PhpSpec\DataProviderExtension
+  - Coduo\PhpSpec\DataProvider\DataProviderExtension
 YML;
 
         file_put_contents($this->workDir.'phpspec.yml', $phpspecyml);