diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php index cde6542dce..6406bb1dd5 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php @@ -312,7 +312,7 @@ class EntityChoiceList extends ObjectChoiceList * * Otherwise a new integer is generated. * - * @param mixed $choice The choice to create an index for + * @param mixed $entity The choice to create an index for * * @return integer|string A unique index containing only ASCII letters, * digits and underscores. @@ -333,7 +333,7 @@ class EntityChoiceList extends ObjectChoiceList * * Otherwise a new integer is generated. * - * @param mixed $choice The choice to create a value for + * @param mixed $entity The choice to create a value for * * @return integer|string A unique value without character limitations. */ diff --git a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php index bc0867a859..54fe224d31 100644 --- a/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php +++ b/src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php @@ -276,7 +276,7 @@ class ModelChoiceList extends ObjectChoiceList * * Otherwise a new integer is generated. * - * @param mixed $choice The choice to create an index for + * @param mixed $model The choice to create an index for * * @return integer|string A unique index containing only ASCII letters, * digits and underscores. @@ -297,7 +297,7 @@ class ModelChoiceList extends ObjectChoiceList * * Otherwise a new integer is generated. * - * @param mixed $choice The choice to create a value for + * @param mixed $model The choice to create a value for * * @return integer|string A unique value without character limitations. */ diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php index 523bd17703..ddc5994f85 100644 --- a/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php +++ b/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php @@ -196,9 +196,10 @@ class HttpKernel extends BaseHttpKernel * * This method uses the "_internal" route, which should be available. * - * @param string $controller A controller name to execute (a string like BlogBundle:Post:index), or a relative URI - * @param array $attributes An array of request attributes - * @param array $query An array of request query parameters + * @param string $controller A controller name to execute (a string like BlogBundle:Post:index), or a relative URI + * @param array $attributes An array of request attributes + * @param array $query An array of request query parameters + * @param boolean $secure * * @return string An internal URI */ @@ -226,6 +227,7 @@ class HttpKernel extends BaseHttpKernel * Renders an HInclude tag. * * @param string $uri A URI + * @param string $defaultContent Default content */ public function renderHIncludeTag($uri, $defaultContent = null) { diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php index 6e7480ff25..11d20a4536 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php @@ -200,9 +200,9 @@ class ExprBuilderTest extends \PHPUnit_Framework_TestCase /** * Assert that the given test builder, will return the given value - * @param mixed $value The value to test - * @param TreeBuilder $test The tree builder to finalize - * @param mixed $config The config values that new to be finalized + * @param mixed $value The value to test + * @param TreeBuilder $treeBuilder The tree builder to finalize + * @param mixed $config The config values that new to be finalized */ protected function assertFinalizedValueIs($value, $treeBuilder, $config=null) { diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php index 8bf81c9da4..34b0a9ba67 100644 --- a/src/Symfony/Component/Filesystem/Filesystem.php +++ b/src/Symfony/Component/Filesystem/Filesystem.php @@ -27,9 +27,9 @@ class Filesystem * * By default, if the target already exists, it is not overridden. * - * @param string $originFile The original filename - * @param string $targetFile The target filename - * @param array $override Whether to override an existing file or not + * @param string $originFile The original filename + * @param string $targetFile The target filename + * @param boolean $override Whether to override an existing file or not * * @throws IOException When copy fails */ diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php index 9f2038453e..94bd71612b 100644 --- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php +++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php @@ -388,8 +388,8 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase $this->filesystem->chmod($file, 0400); $this->filesystem->chmod($dir, 0753); - $this->assertEquals(753, $this->getFilePermisions($dir)); - $this->assertEquals(400, $this->getFilePermisions($file)); + $this->assertEquals(753, $this->getFilePermissions($dir)); + $this->assertEquals(400, $this->getFilePermissions($file)); } public function testChmodWrongMod() @@ -414,8 +414,8 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase $this->filesystem->chmod($file, 0400, 0000, true); $this->filesystem->chmod($dir, 0753, 0000, true); - $this->assertEquals(753, $this->getFilePermisions($dir)); - $this->assertEquals(753, $this->getFilePermisions($file)); + $this->assertEquals(753, $this->getFilePermissions($dir)); + $this->assertEquals(753, $this->getFilePermissions($file)); } public function testChmodAppliesUmask() @@ -426,7 +426,7 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase touch($file); $this->filesystem->chmod($file, 0770, 0022); - $this->assertEquals(750, $this->getFilePermisions($file)); + $this->assertEquals(750, $this->getFilePermissions($file)); } public function testChmodChangesModeOfArrayOfFiles() @@ -442,8 +442,8 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase $this->filesystem->chmod($files, 0753); - $this->assertEquals(753, $this->getFilePermisions($file)); - $this->assertEquals(753, $this->getFilePermisions($directory)); + $this->assertEquals(753, $this->getFilePermissions($file)); + $this->assertEquals(753, $this->getFilePermissions($directory)); } public function testChmodChangesModeOfTraversableFileObject() @@ -459,8 +459,8 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase $this->filesystem->chmod($files, 0753); - $this->assertEquals(753, $this->getFilePermisions($file)); - $this->assertEquals(753, $this->getFilePermisions($directory)); + $this->assertEquals(753, $this->getFilePermissions($file)); + $this->assertEquals(753, $this->getFilePermissions($directory)); } public function testChown() @@ -832,7 +832,7 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase * * @return integer */ - private function getFilePermisions($filePath) + private function getFilePermissions($filePath) { return (int) substr(sprintf('%o', fileperms($filePath)), -3); } diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php index fe4536eb42..e8a1064a30 100644 --- a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php +++ b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php @@ -496,7 +496,7 @@ class ChoiceList implements ChoiceListInterface /** * Fixes the data type of the given choices to avoid comparison problems. * - * @param array $choice The choices. + * @param array $choices The choices. * * @return array The fixed choices. * diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php index 5d25007699..bf0c873dc4 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php @@ -56,8 +56,9 @@ class FormTypeCsrfExtension extends AbstractTypeExtension /** * Adds a CSRF field to the root form view. * - * @param FormView $view The form view - * @param FormInterface $form The form + * @param FormView $view The form view + * @param FormInterface $form The form + * @param array $options The options */ public function finishView(FormView $view, FormInterface $form, array $options) { diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php index 2249ddad59..6aa2da1122 100755 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php @@ -262,12 +262,12 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface * Iterates over the constraints of a property, executes a constraints on * them and returns the best guess * - * @param string $class The class to read the constraints from - * @param string $property The property for which to find constraints - * @param \Closure $closure The closure that returns a guess - * for a given constraint - * @param mixed $default The default value assumed if no other value - * can be guessed. + * @param string $class The class to read the constraints from + * @param string $property The property for which to find constraints + * @param \Closure $closure The closure that returns a guess + * for a given constraint + * @param mixed $defaultValue The default value assumed if no other value + * can be guessed. * * @return Guess The guessed value with the highest confidence */ diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php index 4abec1824d..605e130654 100644 --- a/src/Symfony/Component/Form/FormBuilder.php +++ b/src/Symfony/Component/Form/FormBuilder.php @@ -56,6 +56,7 @@ class FormBuilder extends FormConfig implements \IteratorAggregate, FormBuilderI * @param string $dataClass * @param EventDispatcherInterface $dispatcher * @param FormFactoryInterface $factory + * @param array $options */ public function __construct($name, $dataClass, EventDispatcherInterface $dispatcher, FormFactoryInterface $factory, array $options = array()) { diff --git a/src/Symfony/Component/Form/Util/PropertyPath.php b/src/Symfony/Component/Form/Util/PropertyPath.php index 6d2c8967fa..482d7ebc62 100644 --- a/src/Symfony/Component/Form/Util/PropertyPath.php +++ b/src/Symfony/Component/Form/Util/PropertyPath.php @@ -587,9 +587,9 @@ class PropertyPath implements \IteratorAggregate, PropertyPathInterface * Searches for add and remove methods. * * @param \ReflectionClass $reflClass The reflection class for the given object - * @param string|null $singular The singular form of the property name or null. + * @param string|null $singulars The singular form of the property name or null. * - * @return array|null An array containin the adder and remover when found, null otherwise. + * @return array|null An array containing the adder and remover when found, null otherwise. * * @throws InvalidPropertyException If the property does not exist. */ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php index 07b27808c2..80e250ad0f 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.php @@ -60,7 +60,7 @@ class RouterDataCollector extends DataCollector /** * Remembers the controller associated to each request. * - * @param FilterControllerEvent The filter controller event + * @param FilterControllerEvent $event The filter controller event */ public function onKernelController(FilterControllerEvent $event) { diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index 848f3ccf5b..c0133d49f4 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -43,7 +43,7 @@ class ExceptionHandler /** * Register the exception handler. * - * @return The registered exception handler + * @return ExceptionHandler The registered exception handler */ public static function register($debug = true) { diff --git a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php index ec8ad1f160..51c9f9c344 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php @@ -370,7 +370,7 @@ class RedisProfilerStorage implements ProfilerStorageInterface /** * Removes the specified keys. * - * @param array $key + * @param array $keys * * @return Boolean */ diff --git a/src/Symfony/Component/Locale/Stub/StubIntl.php b/src/Symfony/Component/Locale/Stub/StubIntl.php index b89e52f702..07e45b8b41 100644 --- a/src/Symfony/Component/Locale/Stub/StubIntl.php +++ b/src/Symfony/Component/Locale/Stub/StubIntl.php @@ -104,6 +104,8 @@ abstract class StubIntl /** * Returns the symbolic name for a given error code * + * @param integer $code The error code returned by StubIntl::getErrorCode() + * * @return string */ public static function getErrorName($code) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 6df07a1075..8d166a7689 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -525,7 +525,7 @@ class Process * * @param float $timeout The timeout in seconds * - * @return int The exitcode of the process + * @return integer The exitcode of the process * * @throws \RuntimeException if the process got signaled */ diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index a8e0dcb183..72130544ce 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -165,7 +165,7 @@ EOF; /** * Compiles a single Route to PHP code used to match it against the path info. * - * @param Route $routes A Route instance + * @param Route $route A Route instance * @param string $name The name of the Route * @param Boolean $supportsRedirections Whether redirections are supported by the base class * @param string|null $parentPrefix The prefix of the parent collection used to optimize the code diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php index b517907bc1..c417d946d7 100644 --- a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php +++ b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php @@ -151,7 +151,7 @@ class UrlMatcher implements UrlMatcherInterface * * @param string $pathinfo The path * @param string $name The route name - * @param string $route The route + * @param Route $route The route * * @return array The first element represents the status, the second contains additional information */