bug #316 Skip embedded fields in embeddables (cedricziel)

This PR was squashed before being merged into the 1.0-dev branch (closes #316).

Discussion
----------

Skip embedded fields in embeddables

This change skips the creation of mapped fields inside embeddables.

Consider the PHP Money class:

```php
public class Invoice {
  /**
   * @var Money
   *
   * @Orm\Embedded(class="Money\Money")
   */
  private $total;
}
```

```php
final class Money implements \JsonSerializable {
   /**
    * @var Currency
    */
   private $currency;
}
```

Here, Money has the mapped field `Currency`. In doctrine Metadata,
this is correctly reflected as `total.currency`.

The EntityRegenerator declares a private field `$total.currency` afterwards.

The changeset suppresses this behaviour by skipping fields containing a
dot as is done a few lines below.

Commits
-------

a4d4787 Embed money objects
074f836 Remove double slash
6b9f7d8 Map embeddable money test with XML for convenience
84e2f58 Add small test to embeddable test
5c48add Skip embedded fields in embeddables

Author: weaverryan

src/Doctrine/EntityRegenerator.php

@@ -76,6 +76,10 @@ public function regenerateEntities(string $classOrNamespace)
             $embeddedClasses = [];
 
             foreach ($classMetadata->embeddedClasses as $fieldName => $mapping) {
+                if (false !== strpos($fieldName, '.')) {
+                    continue;
+                }
+
                 $className = $mapping['class'];
 
                 $embeddedClasses[$fieldName] = $this->getPathOfClass($className);

tests/Maker/FunctionalTest.php

@@ -1136,6 +1136,18 @@ public function getCommandEntityTests()
             ->setRequiredPhpVersion(70100)
         ];
 
+        yield 'entity_regenerate_embeddable_object' => [MakerTestDetails::createTest(
+            $this->getMakerInstance(MakeEntity::class),
+            [
+                // namespace: use default App\Entity
+                '',
+            ])
+            ->setArgumentsString('--regenerate')
+            ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeEntityRegenerateEmbeddableObject')
+            ->configureDatabase()
+            ->setRequiredPhpVersion(70100)
+        ];
+
         yield 'entity_regenerate_embeddable' => [MakerTestDetails::createTest(
             $this->getMakerInstance(MakeEntity::class),
             [

tests/fixtures/MakeEntityRegenerateEmbeddableObject/src/Entity/Currency.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable()
+ */
+class Currency
+{
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="currency", type="string")
+     */
+    private $currency;
+
+    public function __construct($currency)
+    {
+        $this->currency = $currency;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCurrency()
+    {
+        return $this->currency;
+    }
+
+    /**
+     * @param string $currency
+     * @return Currency
+     */
+    public function setCurrency($currency)
+    {
+        $this->currency = $currency;
+        return $this;
+    }
+
+
+}

tests/fixtures/MakeEntityRegenerateEmbeddableObject/src/Entity/Invoice.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity()
+ */
+class Invoice
+{
+    /**
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(name="title", type="string", length=255)
+     */
+    private $title;
+
+    /**
+     * @ORM\Embedded(class="App\Entity\Money")
+     */
+    private $total;
+}

tests/fixtures/MakeEntityRegenerateEmbeddableObject/src/Entity/Money.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+class Money
+{
+    /**
+     * @var Currency
+     *
+     * @ORM\Embedded(class="App\Entity\Currency")
+     */
+    private $currency;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="amount", type="integer")
+     */
+    private $amount;
+
+    public function __construct($amount, Currency $currency)
+    {
+        $this->amount = $amount;
+        $this->currency = $currency;
+    }
+}

tests/fixtures/MakeEntityRegenerateEmbeddableObject/tests/GeneratedEntityTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Tests;
+
+use App\Entity\Invoice;
+use Money\Currency;
+use Money\Money;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Doctrine\ORM\EntityManager;
+
+class GeneratedEntityTest extends KernelTestCase
+{
+    public function testGeneratedEntity()
+    {
+        self::bootKernel();
+        /** @var EntityManager $em */
+        $em = self::$kernel->getContainer()
+            ->get('doctrine')
+            ->getManager();
+
+        $em->createQuery('DELETE FROM App\\Entity\\Invoice i')->execute();
+
+        $invoice = new Invoice();
+        // check that the constructor was instantiated properly
+        $this->assertInstanceOf(Money::class, $invoice->getTotal());
+        // fields should now have setters
+        $invoice->setTitle('Borscht');
+
+        $total = new Money(100, new Currency('EUR'));
+        $invoice->setTotal($total);
+
+        $em->persist($invoice);
+
+        $em->flush();
+        $em->refresh($invoice);
+
+        /** @var Invoice[] $actualInvoice */
+        $actualInvoice = $em->getRepository(Invoice::class)
+            ->findAll();
+
+        $this->assertcount(1, $actualInvoice);
+
+        /** @var Money $actualTotal */
+        $actualTotal = $actualInvoice[0]->getTotal();
+
+        $this->assertInstanceOf(Money::class, $actualTotal);
+    }
+}