missing tests

juliangut · Jul 15, 2017 · d9d5fdd · d9d5fdd
1 parent d850de3
commit d9d5fdd
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ $configuration->setDefinitions('/path/to/definitions/file.php');
 * `useAutoWiring`, whether or not to use auto wiring (true by default)
 * `useAnnotations`, whether or not to use annotations (false by default)
 * `ignorePhpDocErrors`, whether or not to ignore phpDoc errors on annotations (false by default)
-* `wrapperContainer`, wrapping container (none by default)
+* `wrapContainer`, wrapping container (none by default)
 * `proxiesPath`, path where PHP-DI creates its proxy files (none by default)
 * `compilationPath`, path to where PHP-DI creates its compiled container (none by default)
 

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -44,7 +44,7 @@ class Configuration
     /**
      * @var ContainerInterface
      */
-    protected $wrapperContainer;
+    protected $wrapContainer;
 
     /**
      * @var string
@@ -89,7 +89,7 @@ protected function seedConfigurations($configurations)
             'useAutoWiring',
             'useAnnotations',
             'ignorePhpDocErrors',
-            'wrapperContainer',
+            'wrapContainer',
             'proxiesPath',
             'compilationPath',
             'definitions',
@@ -217,21 +217,21 @@ public function setIgnorePhpDocErrors($ignorePhpDocErrors)
      *
      * @return ContainerInterface
      */
-    public function getWrapperContainer()
+    public function getWrapContainer()
     {
-        return $this->wrapperContainer;
+        return $this->wrapContainer;
     }
 
     /**
      * Set wrapping container.
      *
-     * @param ContainerInterface $wrapperContainer
+     * @param ContainerInterface $wrapContainer
      *
      * @return $this
      */
-    public function setWrapperContainer(ContainerInterface $wrapperContainer)
+    public function setWrapContainer(ContainerInterface $wrapContainer)
     {
-        $this->wrapperContainer = $wrapperContainer;
+        $this->wrapContainer = $wrapContainer;
 
         return $this;
     }

diff --git a/src/ContainerBuilder.php b/src/ContainerBuilder.php
@@ -74,8 +74,8 @@ private static function getContainerBuilder(Configuration $configuration): DICon
         $containerBuilder->useAnnotations($configuration->doesUseAnnotations());
         $containerBuilder->ignorePhpDocErrors($configuration->doesIgnorePhpDocErrors());
 
-        if ($configuration->getWrapperContainer()) {
-            $containerBuilder->wrapContainer($configuration->getWrapperContainer());
+        if ($configuration->getWrapContainer()) {
+            $containerBuilder->wrapContainer($configuration->getWrapContainer());
         }
 
         if ($configuration->getProxiesPath()) {

diff --git a/tests/PHPDI/ConfigurationTest.php b/tests/PHPDI/ConfigurationTest.php
@@ -17,6 +17,7 @@
 use Jgut\Slim\PHPDI\Configuration;
 use Jgut\Slim\PHPDI\Container;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 /**
  * Configuration tests.
@@ -47,14 +48,20 @@ public function testDefaults()
 
     public function testCreationConfigurations()
     {
+        /** @var ContainerInterface $containerStub */
+        $containerStub = $this->getMockBuilder(ContainerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $configs = [
             'containerClass' => DIContainer::class,
             'useAutoWiring' => false,
             'useAnnotations' => true,
             'ignorePhpDocErrors' => true,
-            'definitions' => __DIR__ . '/files/definitions/valid/definitions.php',
+            'wrapContainer' => $containerStub,
             'proxiesPath' => sys_get_temp_dir(),
             'compilationPath' => __DIR__,
+            'definitions' => __DIR__ . '/files/definitions/valid/definitions.php',
         ];
 
         $configuration = new Configuration($configs);
@@ -63,9 +70,10 @@ public function testCreationConfigurations()
         self::assertFalse($configuration->doesUseAutowiring());
         self::assertTrue($configuration->doesUseAnnotations());
         self::assertTrue($configuration->doesIgnorePhpDocErrors());
-        self::assertEquals([__DIR__ . '/files/definitions/valid/definitions.php'], $configuration->getDefinitions());
+        self::assertEquals($containerStub, $configuration->getWrapContainer());
         self::assertEquals(sys_get_temp_dir(), $configuration->getProxiesPath());
         self::assertEquals(__DIR__, $configuration->getCompilationPath());
+        self::assertEquals([__DIR__ . '/files/definitions/valid/definitions.php'], $configuration->getDefinitions());
     }
 
     /**

diff --git a/tests/PHPDI/ContainerBuilderTest.php b/tests/PHPDI/ContainerBuilderTest.php
@@ -17,6 +17,7 @@
 use Jgut\Slim\PHPDI\Configuration;
 use Jgut\Slim\PHPDI\ContainerBuilder;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 /**
  * Container builder tests.
@@ -52,20 +53,26 @@ public function testInvalidDefinitionsFile()
 
     public function testCreation()
     {
+        /** @var ContainerInterface $containerStub */
+        $containerStub = $this->getMockBuilder(ContainerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $configuration = new Configuration([
             'containerClass' => Container::class,
             'useAutowiring' => true,
             'useAnnotations' => true,
             'ignorePhpDocErrors' => true,
+            'wrapContainer' => $containerStub,
+            'proxiesPath' => sys_get_temp_dir(),
+            'compilationPath' => __DIR__ . '/files',
             'definitions' => [
                 __DIR__ . '/files/definitions/valid/definitions.php',
                 __DIR__ . '/files/definitions/valid',
                 [
                     'valid' => 'definition',
                 ],
             ],
-            'proxiesPath' => sys_get_temp_dir(),
-            'compilationPath' => __DIR__ . '/files',
         ]);
 
         $container = ContainerBuilder::build($configuration);