Merge 7ee0fcf into 806ca40

doc/container.md

@@ -30,6 +30,10 @@ You can set entries directly on the container:
 ```php
 $container->set('foo', 'bar');
 $container->set('MyInterface', \DI\create('MyClass'));
+
+// Use \DI\value if you need to set a closure as raw value,
+// because closures are interpreted as factories by default
+$container->set('myClosure', \DI\value(function() { /* ... */ }));
 ```
 
 However it is recommended to use definition files. See the [definition documentation](definition.md).

src/Container.php

@@ -16,6 +16,7 @@
 use DI\Definition\Source\MutableDefinitionSource;
 use DI\Definition\Source\ReflectionBasedAutowiring;
 use DI\Definition\Source\SourceChain;
+use DI\Definition\ValueDefinition;
 use DI\Invoker\DefinitionParameterResolver;
 use DI\Proxy\ProxyFactory;
 use InvalidArgumentException;
@@ -282,7 +283,9 @@ public function set(string $name, $value)
             $value = new FactoryDefinition($name, $value);
         }
 
-        if ($value instanceof Definition) {
+        if ($value instanceof ValueDefinition) {
+            $this->resolvedEntries[$name] = $value->getValue();
+        } elseif ($value instanceof Definition) {
             $value->setName($name);
             $this->setDefinition($name, $value);
         } else {

tests/IntegrationTest/ContainerSetTest.php

@@ -7,6 +7,7 @@
 use DI\ContainerBuilder;
 use function DI\create;
 use function DI\get;
+use function DI\value;
 
 /**
  * Tests the set() method from the container.
@@ -58,6 +59,28 @@ public function array_entries_can_be_overridden_by_values(ContainerBuilder $buil
         $this->assertSame('hello', $container->get('foo'));
     }
 
+    /**
+     * @see https://github.com/PHP-DI/PHP-DI/issues/674
+     * @test
+     * @dataProvider provideContainer
+     */
+    public function value_definitions_are_interpreted_as_raw_values(ContainerBuilder $builder)
+    {
+        $container = $builder->build();
+
+        $foo = 'foo';
+        $bar = new ContainerSetTest\Dummy();
+        $baz = function() {};
+
+        $container->set('foo', value($foo));
+        $container->set('bar', value($bar));
+        $container->set('baz', value($baz));
+
+        $this->assertSame($foo, $container->get('foo'));
+        $this->assertSame($bar, $container->get('bar'));
+        $this->assertSame($baz, $container->get('baz'));
+    }
+
     /**
      * @test
      * @dataProvider provideContainer