Fix #31: Add support for objects as default parameter values

.github/workflows/build.yml

@@ -24,6 +24,7 @@ jobs:
         php:
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - name: Checkout

.github/workflows/static.yml

@@ -20,6 +20,7 @@ jobs:
         php:
           - "7.4"
           - "8.0"
+          - "8.1"
 
     steps:
       - name: Checkout

CHANGELOG.md

@@ -2,8 +2,8 @@
 
 ## 1.0.1 under development
 
-- no changes in this release.
+- Bug #31: Add support for objects as default parameter values (vjik)
 
 ## 1.0.0 November 30, 2021
 
-- Initial release.
+- Initial release.

phpunit.xml.dist

@@ -19,6 +19,7 @@
         <testsuite name="Yii Definitions tests">
             <directory>./tests/Unit</directory>
             <directory phpVersion="8" phpVersionOperator=">=">./tests/Php8</directory>
+            <directory phpVersion="8.1" phpVersionOperator=">=">./tests/Php8_1</directory>
         </testsuite>
     </testsuites>
 

src/ParameterDefinition.php

@@ -84,7 +84,7 @@ public function resolve(ContainerInterface $container)
                 $result = $container->get($typeName);
             } catch (Throwable $t) {
                 if ($this->parameter->isOptional()) {
-                    return null;
+                    return $this->parameter->getDefaultValue();
                 }
                 throw $t;
             }

tests/Php8_1/Helpers/DefinitionExtractorTest.php

@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Definitions\Tests\Php8_1\Helpers;
+
+use PHPUnit\Framework\TestCase;
+use ReflectionFunction;
+use Yiisoft\Definitions\Helpers\DefinitionExtractor;
+use Yiisoft\Definitions\Tests\Support\Chair;
+use Yiisoft\Definitions\Tests\Support\RedChair;
+use Yiisoft\Test\Support\Container\SimpleContainer;
+
+final class DefinitionExtractorTest extends TestCase
+{
+    public function testResolvableDependencyWithDefaultObject(): void
+    {
+        $container = new SimpleContainer([
+            Chair::class => new Chair(),
+        ]);
+
+        $definitions = DefinitionExtractor::fromFunction(
+            new ReflectionFunction(static fn (Chair $chair = new RedChair()) => true)
+        );
+
+        $this->assertInstanceOf(Chair::class, $definitions['chair']->resolve($container));
+    }
+
+    public function testResolvableNullableDependencyWithDefaultObject(): void
+    {
+        $container = new SimpleContainer([
+            Chair::class => new Chair(),
+        ]);
+
+        $definitions = DefinitionExtractor::fromFunction(
+            new ReflectionFunction(static fn (?Chair $chair = new RedChair()) => true)
+        );
+
+        $this->assertInstanceOf(Chair::class, $definitions['chair']->resolve($container));
+    }
+
+    public function testUnresolvableDependencyWithDefaultObject(): void
+    {
+        $container = new SimpleContainer();
+
+        $definitions = DefinitionExtractor::fromFunction(
+            new ReflectionFunction(static fn (Chair $chair = new RedChair()) => true)
+        );
+
+        $this->assertInstanceOf(RedChair::class, $definitions['chair']->resolve($container));
+    }
+
+    public function testUnresolvablNullableDependencyWithDefaultObject(): void
+    {
+        $container = new SimpleContainer();
+
+        $definitions = DefinitionExtractor::fromFunction(
+            new ReflectionFunction(static fn (?Chair $chair = new RedChair()) => true)
+        );
+
+        $this->assertInstanceOf(RedChair::class, $definitions['chair']->resolve($container));
+    }
+}

tests/Support/Chair.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Definitions\Tests\Support;
+
+class Chair
+{
+}

tests/Support/RedChair.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Definitions\Tests\Support;
+
+final class RedChair
+{
+}