Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Move classes into a different namespace #166

Merged
merged 1 commit into from
Apr 7, 2020
Merged

Fix: Move classes into a different namespace #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/Definition/Definition.php → src/Definition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Definition;
namespace Ergebnis\FactoryBot;

use Ergebnis\FactoryBot\FixtureFactory;
use Faker\Generator;

interface Definition
Expand Down
4 changes: 1 addition & 3 deletions src/Definition/Definitions.php → src/Definitions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Definition;
namespace Ergebnis\FactoryBot;

use Ergebnis\Classy;
use Ergebnis\FactoryBot\Exception;
use Ergebnis\FactoryBot\FixtureFactory;
use Faker\Generator;

final class Definitions
Expand Down
2 changes: 1 addition & 1 deletion ...lementDefinition/RepositoryDefinition.php → ...lementDefinition/RepositoryDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Test\Fixture\Definition\Definitions\DoesNotImplementDefinition;
namespace Ergebnis\FactoryBot\Test\Fixture\Definitions\DoesNotImplementDefinition;

use Ergebnis\FactoryBot\FixtureFactory;
use Ergebnis\FactoryBot\Test\Fixture;
Expand Down
4 changes: 2 additions & 2 deletions ...ementsDefinition/RepositoryDefinition.php → ...ementsDefinition/RepositoryDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Test\Fixture\Definition\Definitions\ImplementsDefinition;
namespace Ergebnis\FactoryBot\Test\Fixture\Definitions\ImplementsDefinition;

use Ergebnis\FactoryBot\Definition\Definition;
use Ergebnis\FactoryBot\Definition;
use Ergebnis\FactoryBot\FixtureFactory;
use Ergebnis\FactoryBot\Test\Fixture;
use Faker\Generator;
Expand Down
4 changes: 2 additions & 2 deletions ...ivateConstructor/RepositoryDefinition.php → ...ivateConstructor/RepositoryDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Test\Fixture\Definition\Definitions\ImplementsDefinitionButHasPrivateConstructor;
namespace Ergebnis\FactoryBot\Test\Fixture\Definitions\ImplementsDefinitionButHasPrivateConstructor;

use Ergebnis\FactoryBot\Definition\Definition;
use Ergebnis\FactoryBot\Definition;
use Ergebnis\FactoryBot\FixtureFactory;
use Ergebnis\FactoryBot\Test\Fixture;
use Faker\Generator;
Expand Down
4 changes: 2 additions & 2 deletions ...ionButIsAbstract/RepositoryDefinition.php → ...ionButIsAbstract/RepositoryDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Test\Fixture\Definition\Definitions\ImplementsDefinitionButIsAbstract;
namespace Ergebnis\FactoryBot\Test\Fixture\Definitions\ImplementsDefinitionButIsAbstract;

use Ergebnis\FactoryBot\Definition\Definition;
use Ergebnis\FactoryBot\Definition;
use Ergebnis\FactoryBot\FixtureFactory;
use Ergebnis\FactoryBot\Test\Fixture;
use Faker\Generator;
Expand Down
4 changes: 2 additions & 2 deletions ...ringConstruction/RepositoryDefinition.php → ...ringConstruction/RepositoryDefinition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Test\Fixture\Definition\Definitions\ImplementsDefinitionButThrowsExceptionDuringConstruction;
namespace Ergebnis\FactoryBot\Test\Fixture\Definitions\ImplementsDefinitionButThrowsExceptionDuringConstruction;

use Ergebnis\FactoryBot\Definition\Definition;
use Ergebnis\FactoryBot\Definition;
use Ergebnis\FactoryBot\FixtureFactory;
use Ergebnis\FactoryBot\Test\Fixture;
use Faker\Generator;
Expand Down
19 changes: 9 additions & 10 deletions test/Unit/Definition/DefinitionsTest.php → test/Unit/DefinitionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,17 @@
* @see https://github.com/ergebnis/factory-bot
*/

namespace Ergebnis\FactoryBot\Test\Unit\Definition;
namespace Ergebnis\FactoryBot\Test\Unit;

use Ergebnis\FactoryBot\Definition\Definitions;
use Ergebnis\FactoryBot\Definitions;
use Ergebnis\FactoryBot\Exception;
use Ergebnis\FactoryBot\FixtureFactory;
use Ergebnis\FactoryBot\Test\Fixture;
use Ergebnis\FactoryBot\Test\Unit\AbstractTestCase;

/**
* @internal
*
* @covers \Ergebnis\FactoryBot\Definition\Definitions
* @covers \Ergebnis\FactoryBot\Definitions
*
* @uses \Ergebnis\FactoryBot\EntityDefinition
* @uses \Ergebnis\FactoryBot\Exception\InvalidDefinition
Expand All @@ -37,7 +36,7 @@ public function testInRejectsNonExistentDirectory(): void
{
$this->expectException(Exception\InvalidDirectory::class);

Definitions::in(__DIR__ . '/../../Fixture/Definition/Definitions/NonExistentDirectory');
Definitions::in(__DIR__ . '/../Fixture/Definitions/NonExistentDirectory');
}

public function testInIgnoresClassesWhichDoNotImplementProviderInterface(): void
Expand All @@ -46,7 +45,7 @@ public function testInIgnoresClassesWhichDoNotImplementProviderInterface(): void

$fixtureFactory = new FixtureFactory(self::entityManager());

$definitions = Definitions::in(__DIR__ . '/../../Fixture/Definition/Definitions/DoesNotImplementDefinition');
$definitions = Definitions::in(__DIR__ . '/../Fixture/Definitions/DoesNotImplementDefinition');

$definitions->registerWith(
$fixtureFactory,
Expand All @@ -62,7 +61,7 @@ public function testInIgnoresDefinitionsThatAreAbstract(): void

$fixtureFactory = new FixtureFactory(self::entityManager());

$definitions = Definitions::in(__DIR__ . '/../../Fixture/Definition/Definitions/ImplementsDefinitionButIsAbstract');
$definitions = Definitions::in(__DIR__ . '/../Fixture/Definitions/ImplementsDefinitionButIsAbstract');

$definitions->registerWith(
$fixtureFactory,
Expand All @@ -78,7 +77,7 @@ public function testInIgnoresDefinitionsThatHavePrivateConstructors(): void

$fixtureFactory = new FixtureFactory(self::entityManager());

$definitions = Definitions::in(__DIR__ . '/../../Fixture/Definition/Definitions/ImplementsDefinitionButHasPrivateConstructor');
$definitions = Definitions::in(__DIR__ . '/../Fixture/Definitions/ImplementsDefinitionButHasPrivateConstructor');

$definitions->registerWith(
$fixtureFactory,
Expand All @@ -92,7 +91,7 @@ public function testInThrowsInvalidDefinitionExceptionWhenExceptionIsThrownDurin
{
$this->expectException(Exception\InvalidDefinition::class);

Definitions::in(__DIR__ . '/../../Fixture/Definition/Definitions/ImplementsDefinitionButThrowsExceptionDuringConstruction');
Definitions::in(__DIR__ . '/../Fixture/Definitions/ImplementsDefinitionButThrowsExceptionDuringConstruction');
}

public function testInAcceptsDefinitionsThatHaveNoIssues(): void
Expand All @@ -101,7 +100,7 @@ public function testInAcceptsDefinitionsThatHaveNoIssues(): void

$fixtureFactory = new FixtureFactory(self::entityManager());

$definitions = Definitions::in(__DIR__ . '/../../Fixture/Definition/Definitions/ImplementsDefinition');
$definitions = Definitions::in(__DIR__ . '/../Fixture/Definitions/ImplementsDefinition');

$definitions->registerWith(
$fixtureFactory,
Expand Down