Removing build() method

Author: dantleech

lib/Container.php

@@ -32,70 +32,7 @@ public function __construct(array $extensionClasses = [], array $userConfig = []
     {
         $this->extensionClasses = $extensionClasses;
         $this->userConfig = $userConfig;
-    }
-
-    /**
-     * Configure the container. This method will call the `configure()` method
-     * on each extension. Extensions must use this opportunity to register their
-     * services and define any default config.
-     *
-     * This method must be called before `build()`.
-     */
-    public function init()
-    {
-        $extensions = [];
-
-        if (empty($this->extensionClasses) && empty($this->userConfig)) {
-            return;
-        }
-
-        foreach ($this->extensionClasses as $extensionClass) {
-            if (!class_exists($extensionClass)) {
-                throw new \InvalidArgumentException(sprintf(
-                    'Extension class "%s" does not exist',
-                    $extensionClass
-                ));
-            }
-
-            $extension = new $extensionClass();
-
-            if (!$extension instanceof ExtensionInterface) {
-                throw new \InvalidArgumentException(sprintf(
-                    // add any manually specified extensions
-                    'Extension "%s" must implement the PhpBench\\Extension interface',
-                    get_class($extension)
-                ));
-            }
-
-            $extensions[] = $extension;
-
-            $this->config = array_merge(
-                $this->config,
-                $extension->getDefaultConfig()
-            );
-        }
-
-        $diff = array_diff(array_keys($this->userConfig), array_keys($this->config));
-
-        if ($diff) {
-            throw new \InvalidArgumentException(sprintf(
-                'Unknown configuration keys: "%s". Permitted keys: "%s"',
-                implode('", "', $diff), implode('", "', array_keys($this->config))
-            ));
-        }
-
-        $this->config = array_merge(
-            $this->config,
-            $this->userConfig
-        );
-
-        foreach ($extensions as $extension) {
-            $extension->load($this);
-        }
-
-        foreach ($extensions as $extension) {
-            $extension->build($this);
-        }
+        $this->init();
     }
 
     /**
@@ -240,4 +177,61 @@ public function hasParameter($name)
     {
         return array_key_exists($name, $this->config);
     }
+
+    private function init()
+    {
+        $extensions = [];
+
+        if (empty($this->extensionClasses) && empty($this->userConfig)) {
+            return;
+        }
+
+        foreach ($this->extensionClasses as $extensionClass) {
+            if (!class_exists($extensionClass)) {
+                throw new \InvalidArgumentException(sprintf(
+                    'Extension class "%s" does not exist',
+                    $extensionClass
+                ));
+            }
+
+            $extension = new $extensionClass();
+
+            if (!$extension instanceof ExtensionInterface) {
+                throw new \InvalidArgumentException(sprintf(
+                    // add any manually specified extensions
+                    'Extension "%s" must implement the PhpBench\\Extension interface',
+                    get_class($extension)
+                ));
+            }
+
+            $extensions[] = $extension;
+
+            $this->config = array_merge(
+                $this->config,
+                $extension->getDefaultConfig()
+            );
+        }
+
+        $diff = array_diff(array_keys($this->userConfig), array_keys($this->config));
+
+        if ($diff) {
+            throw new \InvalidArgumentException(sprintf(
+                'Unknown configuration keys: "%s". Permitted keys: "%s"',
+                implode('", "', $diff), implode('", "', array_keys($this->config))
+            ));
+        }
+
+        $this->config = array_merge(
+            $this->config,
+            $this->userConfig
+        );
+
+        foreach ($extensions as $extension) {
+            $extension->load($this);
+        }
+
+        foreach ($extensions as $extension) {
+            $extension->build($this);
+        }
+    }
 }

tests/Unit/ContainerTest.php

@@ -103,7 +103,6 @@ public function testRegisterExtension()
             __NAMESPACE__ . '\\TestExtension',
         ]);
 
-        $container->init();
         $object = $container->get('foobar');
         $this->assertInstanceOf('stdClass', $object);
         $this->assertEquals('bar', $object->foobar);
@@ -124,7 +123,6 @@ public function testRegisterExtensionWithUserConfig()
             ]
         );
 
-        $container->init();
         $object = $container->get('foobar');
         $this->assertInstanceOf('stdClass', $object);
         $this->assertEquals('bazz', $object->foobar);
@@ -165,7 +163,6 @@ public function testMergeParameterNonArray()
     public function testRegisterNotExistingExtension()
     {
         $container = new Container(['NotExistingExtension']);
-        $container->init();
     }
 
     /**
@@ -178,7 +175,6 @@ public function testRegisterNotExistingExtension()
     public function testRegisterNotImplementingExtension()
     {
         $container = new Container(['stdClass']);
-        $container->init();
     }
 
     /**
@@ -192,7 +188,6 @@ public function testUnknownUserConfig()
         $container = new Container([], [
             'not' => 'existing',
         ]);
-        $container->init();
     }
 
     /**