Skip to content
This repository has been archived by the owner on Feb 22, 2021. It is now read-only.

Commit

Permalink
Merge pull request #4 from cordoval/cordoval-namespace-fix
Browse files Browse the repository at this point in the history
fix namespace collissions
  • Loading branch information
norberttech committed Sep 22, 2014
2 parents 3ac077e + 24da27b commit 4a4a3ac
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"php": ">=5.3.0",
"phpspec/phpspec": "2.0.*"
"phpspec/phpspec": "*"
},
"require-dev": {
"behat/behat": "2.4.*@stable",
Expand Down
2 changes: 1 addition & 1 deletion features/bootstrap/PHPSpecContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace spec\Coduo\PhpSpec\Annotation;
namespace spec\Coduo\PhpSpec\Annotation\DataProvider;

use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Coduo\PhpSpec\Annotation;
namespace Coduo\PhpSpec\DataProvider\Annotation;

class Parser
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit 4a4a3ac

Please sign in to comment.