diff --git a/ButtonBuilder.php b/ButtonBuilder.php
index 352ca88ea5..b89e01b02f 100644
--- a/ButtonBuilder.php
+++ b/ButtonBuilder.php
@@ -75,7 +75,7 @@ public function __construct($name, array $options = array())
      *
      * This method should not be invoked.
      *
-     * @param string|integer|FormBuilderInterface $child
+     * @param string|int|FormBuilderInterface     $child
      * @param string|FormTypeInterface            $type
      * @param array                               $options
      *
diff --git a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
index 199c996f1b..2270240d20 100644
--- a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
+++ b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -55,7 +55,7 @@ public function __construct($precision = null, $grouping = null, $roundingMode =
     /**
      * Transforms a number type into localized number.
      *
-     * @param int    |float $value Number value.
+     * @param int|float     $value Number value.
      *
      * @return string Localized value.
      *
diff --git a/FormBuilderInterface.php b/FormBuilderInterface.php
index 1dc4a64e7b..c0eb8c32c7 100644
--- a/FormBuilderInterface.php
+++ b/FormBuilderInterface.php
@@ -23,7 +23,7 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
      * If you add a nested group, this group should also be represented in the
      * object hierarchy.
      *
-     * @param string|integer|FormBuilderInterface $child
+     * @param string|int|FormBuilderInterface     $child
      * @param string|FormTypeInterface            $type
      * @param array                               $options
      *
diff --git a/FormConfigBuilder.php b/FormConfigBuilder.php
index d73c403d98..99a9df2add 100644
--- a/FormConfigBuilder.php
+++ b/FormConfigBuilder.php
@@ -180,7 +180,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface
     /**
      * Creates an empty form configuration.
      *
-     * @param string|integer           $name       The form name
+     * @param string|int               $name       The form name
      * @param string                   $dataClass  The class of the form's data
      * @param EventDispatcherInterface $dispatcher The event dispatcher
      * @param array                    $options    The form options
@@ -879,7 +879,7 @@ public function getFormConfig()
     /**
      * Validates whether the given variable is a valid form name.
      *
-     * @param string|integer $name The tested form name.
+     * @param string|int     $name The tested form name.
      *
      * @throws UnexpectedTypeException   If the name is not a string or an integer.
      * @throws InvalidArgumentException If the name contains invalid characters.
diff --git a/FormError.php b/FormError.php
index d9b23aa368..871db9c0dd 100644
--- a/FormError.php
+++ b/FormError.php
@@ -51,7 +51,7 @@ class FormError
      * @param string|null  $messageTemplate      The template for the error message
      * @param array        $messageParameters    The parameters that should be
      *                                           substituted in the message template.
-     * @param int    |null $messagePluralization The value for error message pluralization
+     * @param int|null     $messagePluralization The value for error message pluralization
      *
      * @see \Symfony\Component\Translation\Translator
      */
diff --git a/FormFactoryInterface.php b/FormFactoryInterface.php
index 31c46b55d7..220b470496 100644
--- a/FormFactoryInterface.php
+++ b/FormFactoryInterface.php
@@ -36,7 +36,7 @@ public function create($type = 'form', $data = null, array $options = array());
      *
      * @see createNamedBuilder()
      *
-     * @param string|integer           $name    The name of the form
+     * @param string|int               $name    The name of the form
      * @param string|FormTypeInterface $type    The type of the form
      * @param mixed                    $data    The initial data
      * @param array                    $options The options
@@ -79,7 +79,7 @@ public function createBuilder($type = 'form', $data = null, array $options = arr
     /**
      * Returns a form builder.
      *
-     * @param string|integer           $name    The name of the form
+     * @param string|int               $name    The name of the form
      * @param string|FormTypeInterface $type    The type of the form
      * @param mixed                    $data    The initial data
      * @param array                    $options The options
diff --git a/FormInterface.php b/FormInterface.php
index 5ffe76d1ce..f5a575e69f 100644
--- a/FormInterface.php
+++ b/FormInterface.php
@@ -41,7 +41,7 @@ public function getParent();
     /**
      * Adds or replaces a child to the form.
      *
-     * @param FormInterface|string|integer $child   The FormInterface instance or the name of the child.
+     * @param FormInterface|string|int     $child   The FormInterface instance or the name of the child.
      * @param string|null                  $type    The child's type, if a name was passed.
      * @param array                        $options The child's options, if a name was passed.
      *