Add missing service properties

Annotation/Service.php

@@ -50,4 +50,19 @@ final class Service
 
     /** @var array<string> */
     public $environments = array();
+
+    /** @var boolean */
+    public $lazy;
+
+    /** @var string */
+    public $factoryService;
+
+    /** @var string */
+    public $factoryMethod;
+
+    /** @var string */
+    public $factoryClass;
+
+    /** @var  array */
+    public $factoryMethodArguments = array();
 }

Metadata/ClassMetadata.php

@@ -44,6 +44,10 @@ class ClassMetadata extends BaseClassMetadata
     public $decorates;
     public $decoration_inner_name;
     public $deprecated;
+    public $lazy;
+    public $factoryService;
+    public $factoryMethod;
+    public $factoryClass;
 
     /**
      * @param string $env
@@ -76,6 +80,11 @@ public function serialize()
             $this->lookupMethods,
             $this->properties,
             $this->initMethod,
+            $this->initMethods,
+            $this->lazy,
+            $this->factoryService,
+            $this->factoryMethod,
+            $this->factoryClass,
             parent::serialize(),
             $this->environments,
             $this->decorates,
@@ -104,11 +113,16 @@ public function unserialize($str)
             $this->lookupMethods,
             $this->properties,
             $this->initMethod,
+            $this->initMethods,
             $parentStr,
             $this->environments,
             $this->decorates,
             $this->decoration_inner_name,
             $this->deprecated,
+            $this->lazy,
+            $this->factoryService,
+            $this->factoryMethod,
+            $this->factoryClass,
         ) = $data;
 
         parent::unserialize($parentStr);

Metadata/Driver/AnnotationDriver.php

@@ -85,6 +85,21 @@ public function loadMetadataForClass(\ReflectionClass $class)
                 $metadata->decorates = $annot->decorates;
                 $metadata->decoration_inner_name = $annot->decoration_inner_name;
                 $metadata->deprecated = $annot->deprecated;
+                $metadata->lazy = $annot->lazy;
+                $metadata->factoryClass = $annot->factoryClass;
+                $metadata->factoryService = $annot->factoryService;
+                $metadata->factoryMethod = $annot->factoryMethod;
+                if ($annot->factoryMethodArguments !== array()) {
+                    $params = array();
+                    foreach ($annot->factoryMethodArguments as $key => $argument) {
+                        if ($argument instanceof Inject) {
+                            $params[] = $this->convertReferenceValue($key, $argument);
+                        } else {
+                            $params[] = $argument;
+                        }
+                    }
+                    $metadata->arguments = $params;
+                }
             } else if ($annot instanceof Tag) {
                 $metadata->tags[$annot->name][] = $annot->attributes;
             } else if ($annot instanceof Validator) {

Metadata/MetadataConverter.php

@@ -81,6 +81,21 @@ public function convert(ClassHierarchyMetadata $metadata)
             if (null !== $classMetadata->deprecated && method_exists($definition, 'setDeprecated')) {
                 $definition->setDeprecated(true, $classMetadata->deprecated);
             }
+            if (null !== $classMetadata->lazy) {
+                if (!method_exists($definition, 'setLazy')) {
+                    throw new \RuntimeException(sprintf('the "lazy" attribute is not available on your Symfony version.'));
+                }
+                $definition->setLazy($classMetadata->lazy);
+            }
+            if (null !== $classMetadata->factoryClass) {
+                $definition->setFactoryClass($classMetadata->factoryClass);
+            }
+            if (null !== $classMetadata->factoryMethod) {
+                $definition->setFactoryMethod($classMetadata->factoryMethod);
+            }
+            if (null !== $classMetadata->factoryService) {
+                $definition->setFactoryService($classMetadata->factoryService);
+            }
 
             if (null === $classMetadata->id) {
                 $classMetadata->id = '_jms_di_extra.unnamed.service_'.$count++;

Tests/Functional/Bundle/TestBundle/Factory/TestClassFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Factory;
+
+use JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Model\TestClass;
+use JMS\DiExtraBundle\Annotation\Service;
+
+/**
+ * JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Factory\TestClassFactory
+ *
+ * @Service("jms_di_extra.factory.test_factory")
+ *
+ * @author Ivan Molchanov <[email protected]>
+ */
+class TestClassFactory
+{
+    /**
+     * @param string $message
+     * @return TestClass
+     */
+    public function create($message = '')
+    {
+        $class = new TestClass();
+        $class->setTestMessage($message);
+
+        return $class;
+    }
+}

Tests/Functional/Bundle/TestBundle/Model/TestClass.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Model;
+
+use JMS\DiExtraBundle\Annotation\Service;
+
+/**
+ * JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Model\TestClass
+ *
+ * @Service("jms_di_extra.model.test",
+ * factoryClass = "JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Factory\TestClassFactory",
+ * factoryMethod="create", factoryMethodArguments={
+ * "message" = "created by factory"
+ * } )
+ *
+ * @author Ivan Molchanov <[email protected]>
+ */
+class TestClass
+{
+    /**
+     * @var string
+     */
+    protected $testMessage;
+
+    /**
+     * @param string $testMessage
+     * @return TestClass
+     */
+    public function setTestMessage($testMessage)
+    {
+        $this->testMessage = $testMessage;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTestMessage()
+    {
+        return $this->testMessage;
+    }
+
+
+}

Tests/Functional/Bundle/TestBundle/Model/TestService.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Model;
+
+use JMS\DiExtraBundle\Annotation\Service;
+
+/**
+ * JMS\DiExtraBundle\Tests\Functional\Bundle\TestBundle\Model\TestService
+ *
+ * @Service("jms_di_extra.model.test_service",
+ * factoryService = "jms_di_extra.factory.test_factory",
+ * factoryMethod="create", factoryMethodArguments={
+ * "message" = "created by factory"
+ * } )
+ *
+ * @author Ivan Molchanov <[email protected]>
+ */
+class TestService
+{
+    /**
+     * @var string
+     */
+    protected $testMessage;
+
+    /**
+     * @param string $testMessage
+     * @return TestClass
+     */
+    public function setTestMessage($testMessage)
+    {
+        $this->testMessage = $testMessage;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getTestMessage()
+    {
+        return $this->testMessage;
+    }
+}

Tests/Functional/FactoryPropertiesTest.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace JMS\DiExtraBundle\Tests\Functional;
+
+/**
+ * JMS\DiExtraBundle\Tests\Functional\Bundle\FactoryPropertiesTest
+ *
+ * @author Ivan Molchanov <[email protected]>
+ */
+class FactoryPropertiesTest extends BaseTestCase
+{
+    /**
+     * @runInSeparateProcess
+     */
+    public function  testFactoryClassProperty()
+    {
+        $this->createClient();
+        $container = self::$kernel->getContainer();
+        $testClass = $container->get('jms_di_extra.model.test');
+        $this->assertEquals($testClass->getTestMessage(), 'created by factory');
+    }
+
+    /**
+     * @runInSeparateProcess
+     */
+    public function  testFactoryServiceProperty()
+    {
+        $this->createClient();
+        $container = self::$kernel->getContainer();
+        $testClass = $container->get('jms_di_extra.model.test_service');
+        $this->assertEquals($testClass->getTestMessage(), 'created by factory');
+    }
+}
+