bundle cleanup, followed by http://php-and-symfony.matthiasnoback.nl/…

…2013/10/symfony2-some-things-i-dont-like-about-bundles/
8p · Dec 12, 2013 · 5eb2dc7 · 5eb2dc7
1 parent 91c7965
commit 5eb2dc7
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,10 @@
 .DS_STORE
 coverage
 
+# Ignore IDE settings
+/.idea
+/atlassian-ide-plugin.xml
+
 # Ignore potentially sensitive phpunit file
 phpunit.xml
 
@@ -12,4 +16,4 @@ composer-test.lock
 vendor/
 
 # Ignore subsplit working directory
-.subsplit
+.subsplit
diff --git a/DependencyInjection/GuzzleExtension.php b/DependencyInjection/GuzzleExtension.php
@@ -35,10 +35,8 @@ class GuzzleExtension extends Extension {
      */
     public function load(array $configs, ContainerBuilder $container) {
 
-        $loader = new XmlFileLoader(
-            $container,
-            new FileLocator(implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'Resources', 'config')))
-        );
+        $configPath = implode(DIRECTORY_SEPARATOR, array(__DIR__, '..', 'Resources', 'config'));
+        $loader     = new XmlFileLoader($container, new FileLocator($configPath));
 
         $loader->load('services.xml');
 
@@ -103,4 +101,18 @@ protected function setUpWsse(array $config, ContainerBuilder $container) {
                       ->addMethodCall('addSubscriber', array($container->getDefinition('guzzle.plugin.wsse')));
         }
     } // end: setUpWsse
+
+    /**
+     * Returns alias of class
+     *
+     * @author  Florian Preusner
+     * @version 1.1
+     * @since   2013-12
+     *
+     * @return  string
+     */
+    public function getAlias() {
+
+        return 'guzzle';
+    } // end: getAlias
 } // end: GuzzleExtension
diff --git a/GuzzleBundle.php b/GuzzleBundle.php
@@ -2,8 +2,11 @@
 
 namespace EightPoints\Bundle\GuzzleBundle;
 
+use       EightPoints\Bundle\GuzzleBundle\DependencyInjection\GuzzleExtension;
+
 use       Symfony\Component\HttpKernel\Bundle\Bundle,
-          Symfony\Component\DependencyInjection\ContainerBuilder;
+          Symfony\Component\DependencyInjection\ContainerBuilder,
+          Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
 /**
  * Class GuzzleBundle
@@ -32,4 +35,37 @@ public function build(ContainerBuilder $container) {
 
         parent::build($container);
     } // end: build
+
+    /**
+     * Overwrite getContainerExtension
+     *  - no naming convention of alias needed
+     *  - extension class can be moved easily now
+     *
+     * @see     getContainerExtension
+     *
+     * @author  Florian Preusner
+     * @version 1.1
+     * @since   2013-12
+     *
+     * @return  ExtensionInterface|null The container extension
+     * @throws  \LogicException
+     */
+    public function getContainerExtension() {
+
+        if(null === $this->extension) {
+
+            $extension = new GuzzleExtension();
+
+            if(!$extension instanceof ExtensionInterface) {
+
+                $message = sprintf('%s is not a instance of ExtensionInterface', $extension->getClass());
+
+                throw new \LogicException($message);
+            }
+
+            $this->extension = $extension;
+        }
+
+        return $this->extension;
+    } // end: getContainerExtension
 } // end: GuzzleBundle