make:entity improved: interactive field created & entity update support

.gitignore

@@ -1,5 +1,5 @@
-composer.lock
-phpunit.xml
-vendor/
-tests/tmp/*
-.php_cs.cache
+/composer.lock
+/phpunit.xml
+/vendor/
+/tests/tmp/*
+/.php_cs.cache

.travis.yml

@@ -7,7 +7,6 @@ git:
     depth: 1
 
 php:
-  - 7.0
   - 7.1
   - 7.2
 

appveyor.yml

@@ -8,6 +8,9 @@ cache:
 init:
     - SET PATH=c:\php;%PATH%
 
+environment:
+    TEST_DATABASE_DSN: sqlite:///c:\projects\maker-bundle\tests\tmp\app.db
+
 install:
     - mkdir c:\php && cd c:\php
     - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
@@ -47,4 +50,6 @@ install:
     - ./vendor/bin/simple-phpunit install
 
 test_script:
-    - ./vendor/bin/simple-phpunit
+    - ./vendor/bin/simple-phpunit --group=functional_group1
+    - ./vendor/bin/simple-phpunit --group=functional_group2
+    - ./vendor/bin/simple-phpunit --exclude-group=functional_group1,functional_group2

composer.json

@@ -12,16 +12,21 @@
         }
     ],
     "require": {
-        "php": "^7.0.8",
+        "php": "^7.1.3",
+        "doctrine/inflector": "^1.2",
+        "nikic/php-parser": "^4.0",
         "symfony/config": "^3.4|^4.0",
         "symfony/console": "^3.4|^4.0",
         "symfony/dependency-injection": "^3.4|^4.0",
         "symfony/filesystem": "^3.4|^4.0",
+        "symfony/finder": "^3.4|^4.0",
         "symfony/framework-bundle": "^3.4|^4.0",
         "symfony/http-kernel": "^3.4|^4.0"
     },
     "require-dev": {
         "allocine/twigcs": "^3.0",
+        "doctrine/doctrine-bundle": "^1.8",
+        "doctrine/orm": "^2.6",
         "friendsofphp/php-cs-fixer": "^2.8",
         "symfony/phpunit-bridge": "^3.4|^4.0",
         "symfony/process": "^3.4|^4.0"

phpunit.xml.dist

@@ -9,6 +9,7 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
+        <env name="TEST_DATABASE_DSN" value="mysql://root:@127.0.0.1:3306/test_maker" />
     </php>
 
     <testsuites>

src/DependencyBuilder.php

@@ -113,7 +113,7 @@ private function getRequiredDependencyNames(array $dependencies)
             $packages[] = $package['name'];
         }
 
-        return $packages;
+        return array_unique($packages);
     }
 
     private function calculateMissingDependencies(array $dependencies)
@@ -134,6 +134,6 @@ private function calculateMissingDependencies(array $dependencies)
             return [];
         }
 
-        return array_merge($missingPackages, $missingOptionalPackages);
+        return array_unique(array_merge($missingPackages, $missingOptionalPackages));
     }
 }

src/Doctrine/BaseCollectionRelation.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MakerBundle\Doctrine;
+
+use Symfony\Bundle\MakerBundle\Str;
+
+/**
+ * @internal
+ */
+abstract class BaseCollectionRelation extends BaseRelation
+{
+    abstract public function getOrphanRemoval(): bool;
+
+    abstract public function getTargetSetterMethodName(): string;
+
+    public function getAdderMethodName(): string
+    {
+        return 'add'.Str::asCamelCase(Str::pluralCamelCaseToSingular($this->getPropertyName()));
+    }
+
+    public function getRemoverMethodName(): string
+    {
+        return 'remove'.Str::asCamelCase(Str::pluralCamelCaseToSingular($this->getPropertyName()));
+    }
+}

src/Doctrine/BaseRelation.php

@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MakerBundle\Doctrine;
+
+/**
+ * @internal
+ */
+abstract class BaseRelation
+{
+    private $propertyName;
+    private $targetClassName;
+    private $targetPropertyName;
+    private $mapInverseRelation = true;
+
+    abstract public function isOwning(): bool;
+
+    public function getPropertyName()
+    {
+        return $this->propertyName;
+    }
+
+    public function setPropertyName($propertyName)
+    {
+        $this->propertyName = $propertyName;
+
+        return $this;
+    }
+
+    public function getTargetClassName()
+    {
+        return $this->targetClassName;
+    }
+
+    public function setTargetClassName($targetClassName)
+    {
+        $this->targetClassName = $targetClassName;
+
+        return $this;
+    }
+
+    public function getTargetPropertyName()
+    {
+        return $this->targetPropertyName;
+    }
+
+    public function setTargetPropertyName(?string $targetPropertyName)
+    {
+        $this->targetPropertyName = $targetPropertyName;
+
+        return $this;
+    }
+
+    public function getMapInverseRelation(): bool
+    {
+        return $this->mapInverseRelation;
+    }
+
+    public function setMapInverseRelation(bool $mapInverseRelation)
+    {
+        $this->mapInverseRelation = $mapInverseRelation;
+
+        return $this;
+    }
+}

src/Doctrine/BaseSingleRelation.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony MakerBundle package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\MakerBundle\Doctrine;
+
+/**
+ * @internal
+ */
+abstract class BaseSingleRelation extends BaseRelation
+{
+    private $isNullable;
+
+    public function isNullable(): bool
+    {
+        return $this->isNullable;
+    }
+
+    public function setIsNullable($isNullable)
+    {
+        $this->isNullable = $isNullable;
+
+        return $this;
+    }
+}

src/Doctrine/DoctrineMetadataFactory.php

@@ -12,6 +12,9 @@
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 
@@ -55,12 +58,7 @@ public function getMetadataForNamespace($namespace)
         return $metadata;
     }
 
-    /**
-     * @param string $entity
-     *
-     * @return ClassMetadata|null
-     */
-    public function getMetadataForClass(string $entity)
+    public function getMetadataForClass(string $entity): ?ClassMetadata
     {
         foreach ($this->registry->getManagers() as $em) {
             $cmf = new DisconnectedClassMetadataFactory();
@@ -74,6 +72,30 @@ public function getMetadataForClass(string $entity)
         return null;
     }
 
+    public function getMappingDriverForClass(string $className): ?MappingDriver
+    {
+        /** @var EntityManagerInterface $em */
+        $em = $this->registry->getManagerForClass($className);
+
+        if (null === $em) {
+            throw new \InvalidArgumentException(sprintf('Cannot find the entity manager for class "%s"', $className));
+        }
+
+        $metadataDriver = $em->getConfiguration()->getMetadataDriverImpl();
+
+        if (!$metadataDriver instanceof MappingDriverChain) {
+            return $metadataDriver;
+        }
+
+        foreach ($metadataDriver->getDrivers() as $namespace => $driver) {
+            if (0 === strpos($className, $namespace)) {
+                return $driver;
+            }
+        }
+
+        return $metadataDriver->getDefaultDriver();
+    }
+
     /**
      * @return array
      */