Merge remote-tracking branch 'upstream/master'

Author: sadikoff

src/Resources/doc/index.rst

@@ -13,7 +13,7 @@ Run this command to install and enable this bundle in your application:
 
 .. code-block:: terminal
 
-    $ composer require maker --dev
+    $ composer require symfony/maker-bundle --dev
 
 Usage
 -----

src/Resources/skeleton/doctrine/Entity.tpl.php

@@ -10,8 +10,8 @@
 class <?= $class_name."\n" ?>
 {
     /**
-     * @ORM\Id
-     * @ORM\GeneratedValue
+     * @ORM\Id()
+     * @ORM\GeneratedValue()
      * @ORM\Column(type="integer")
      */
     private $id;