Merge remote branch 'jdhoek/master'

* jdhoek/master:
  Add missing {} around @inheritDoc to fix this class in SF beta2.
  Add missing {} around @inheritDoc to fix this class in SF beta2.

src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php

@@ -41,7 +41,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function guessType($class, $property)
     {
@@ -136,7 +136,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function guessRequired($class, $property)
     {
@@ -160,7 +160,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function guessMaxLength($class, $property)
     {
@@ -182,7 +182,7 @@ class DoctrineOrmTypeGuesser implements FormTypeGuesserInterface
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function guessMinLength($class, $property)
     {

src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php

@@ -84,7 +84,7 @@ class NativeSessionStorage implements SessionStorageInterface
     }
 
     /**
-     * @inheritDoc
+     * {@inheritDoc}
      */
     public function getId()
     {