From afcae36eec34901c9d1eac83132d54ad62d73f6a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 16 Oct 2012 22:01:16 +0200 Subject: [PATCH] Resolved vendor confusion, its "SilverStripe", not "Behat" "Behat" as a vendor namespace is already taken by the project of the same name. --- composer.json | 8 ++++++-- init.php | 4 ++-- .../BehatExtension}/Compiler/MinkExtensionBaseUrlPass.php | 4 ++-- .../Context/Initializer/SilverStripeAwareInitializer.php | 4 ++-- .../Context/SilverStripeAwareContextInterface.php | 2 +- .../BehatExtension}/Extension.php | 4 ++-- .../BehatExtension}/services/silverstripe.yml | 0 7 files changed, 15 insertions(+), 11 deletions(-) rename src/{Behat/SilverStripeExtension => SilverStripe/BehatExtension}/Compiler/MinkExtensionBaseUrlPass.php (92%) rename src/{Behat/SilverStripeExtension => SilverStripe/BehatExtension}/Context/Initializer/SilverStripeAwareInitializer.php (95%) rename src/{Behat/SilverStripeExtension => SilverStripe/BehatExtension}/Context/SilverStripeAwareContextInterface.php (94%) rename src/{Behat/SilverStripeExtension => SilverStripe/BehatExtension}/Extension.php (95%) rename src/{Behat/SilverStripeExtension => SilverStripe/BehatExtension}/services/silverstripe.yml (100%) diff --git a/composer.json b/composer.json index a397b7c..b4e2b5e 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "behat/silverstripe-extension", + "name": "silverstripe/behat-extension", "type": "behat-extension", "description": "SilverStripe framework extension for Behat", "keywords": ["framework", "web", "bdd", "silverstripe"], @@ -7,8 +7,12 @@ "license": "MIT", "authors": [ { - "name": "Michał Ochman", + "name": "Michal Ochman", "email": "ochman.d.michal@gmail.com" + }, + { + "name": "Ingo Schommer", + "email": "ingo@silverstripe.com" } ], diff --git a/init.php b/init.php index bf9f14d..2dc3ff5 100644 --- a/init.php +++ b/init.php @@ -11,10 +11,10 @@ spl_autoload_register(function($class) { - if (false !== strpos($class, 'Behat\\SilverStripeExtension')) { + if (false !== strpos($class, 'SilverStripe\\BehatExtension')) { require_once(__DIR__ . '/src/' . str_replace('\\', '/', $class) . '.php'); return true; } }, true, false); -return new Behat\SilverStripeExtension\Extension; \ No newline at end of file +return new SilverStripe\BehatExtension\Extension; \ No newline at end of file diff --git a/src/Behat/SilverStripeExtension/Compiler/MinkExtensionBaseUrlPass.php b/src/SilverStripe/BehatExtension/Compiler/MinkExtensionBaseUrlPass.php similarity index 92% rename from src/Behat/SilverStripeExtension/Compiler/MinkExtensionBaseUrlPass.php rename to src/SilverStripe/BehatExtension/Compiler/MinkExtensionBaseUrlPass.php index a66ee28..d6d7c27 100644 --- a/src/Behat/SilverStripeExtension/Compiler/MinkExtensionBaseUrlPass.php +++ b/src/SilverStripe/BehatExtension/Compiler/MinkExtensionBaseUrlPass.php @@ -1,12 +1,12 @@ * diff --git a/src/Behat/SilverStripeExtension/Context/Initializer/SilverStripeAwareInitializer.php b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php similarity index 95% rename from src/Behat/SilverStripeExtension/Context/Initializer/SilverStripeAwareInitializer.php rename to src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php index df22643..93ad1f8 100644 --- a/src/Behat/SilverStripeExtension/Context/Initializer/SilverStripeAwareInitializer.php +++ b/src/SilverStripe/BehatExtension/Context/Initializer/SilverStripeAwareInitializer.php @@ -1,11 +1,11 @@ * diff --git a/src/Behat/SilverStripeExtension/services/silverstripe.yml b/src/SilverStripe/BehatExtension/services/silverstripe.yml similarity index 100% rename from src/Behat/SilverStripeExtension/services/silverstripe.yml rename to src/SilverStripe/BehatExtension/services/silverstripe.yml