Permalink
Browse files

merged branch raziel057/COMPONENT_Form (PR #5888)

This PR was squashed before being merged into the master branch (closes #5888).

Commits
-------

2379d86 CS Fixes - Replaced "array of type" by "Type[]" in PHPDoc block

Discussion
----------

CS Fixes - Replaced "array of type" by "Type[]" in PHPDoc block

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: no (but tests doesn't pass on master too). See Travis.
License of the code: MIT
Documentation PR: Not Applicable
Status: Finished

To improve support of the eclipse PDT pluggin (for autocompletion), I propose to change the array notation in PHPDoc blocks to match the phpDocumentor notation for "array of type".

Modifications are made for the following components:
- BrowserKit
- ClassLoader
- Config
- Console
- CssSelector
- DependencyInjection
- DomCrawler
- EventDispatcher (no changes)
- Filesystem (no changes)
- Finder
- Form
- HttpFoundation
- HttpKernel
- Locale
- OptionResolver (no changes)
- Process (no changes)
- Routing (no changes)
- Serializer (no changes)
- Templating
- Translation
- Validator
- Yaml (no changes)
- Security
- Stopwatch (no changes)

See Proposal symfony/symfony#5852

---------------------------------------------------------------------------

by pborreli at 2012-11-01T15:19:27Z

will you make a PR for each component ? why not only one PR with one commit for each component instead ?

---------------------------------------------------------------------------

by raziel057 at 2012-11-01T15:32:39Z

Ok, I'm going try to do it.

---------------------------------------------------------------------------

by raziel057 at 2012-11-01T16:12:56Z

I would like to rename my branch from COMPONENT_Form to changes-phpdoc (as all modifications would be commited in only one branch), so I tried to execute the following command but I have an error.

git remote rename COMPONENT_Form changes-phpdoc
error: Could not rename config section 'remote.COMPONENT_Form' to 'remote.changes-phpdoc'

Do you know how to do it?

---------------------------------------------------------------------------

by pborreli at 2012-11-01T16:14:26Z

don't rename it, you will have to close and make another PR which is useless here, just edit the title.

---------------------------------------------------------------------------

by stof at 2012-11-01T16:16:17Z

and ``git remote rename`` is about renaming a remote repo, not a branch

---------------------------------------------------------------------------

by raziel057 at 2012-11-03T11:36:02Z

Is it normal that all my commit are duplicated? I would like just update my master and merge with my branch.

---------------------------------------------------------------------------

by fabpot at 2012-11-06T10:22:55Z

@raziel057 Can you rebase on master? That should fix your problem.

---------------------------------------------------------------------------

by fabpot at 2012-11-09T13:28:53Z

@raziel057 Can you finish this PR?

---------------------------------------------------------------------------

by Tobion at 2012-11-09T13:34:45Z

I'll do it for the routing component this evening because I know it by heart. ^^

---------------------------------------------------------------------------

by raziel057 at 2012-11-09T15:06:26Z

@Tobion ok Thanks!

@fabpot Yes, I will try to finish it this week end.

---------------------------------------------------------------------------

by raziel057 at 2012-11-11T13:04:07Z

@Tobion Did you already change PHPDoc in the Routing component?

---------------------------------------------------------------------------

by Tobion at 2012-11-11T15:21:18Z

@raziel057 Yes I'm working on it.

---------------------------------------------------------------------------

by Tobion at 2012-11-12T15:16:31Z

@raziel057 Done. See #5994
  • Loading branch information...
2 parents 6da5370 + ca17991 commit 003a487a674175a1d2e62f205ecd91ffe85554b1 @fabpot fabpot committed Nov 19, 2012
Showing with 8 additions and 8 deletions.
  1. +2 −2 Application.php
  2. +2 −2 Formatter/OutputFormatter.php
  3. +4 −4 Input/InputDefinition.php
View
@@ -619,7 +619,7 @@ public function find($name)
*
* @param string $namespace A namespace name
*
- * @return array An array of Command instances
+ * @return Command[] An array of Command instances
*
* @api
*/
@@ -933,7 +933,7 @@ protected function getDefaultInputDefinition()
/**
* Gets the default commands that should always be available.
*
- * @return array An array of default Command instances
+ * @return Command[] An array of default Command instances
*/
protected function getDefaultCommands()
{
@@ -44,8 +44,8 @@ public static function escape($text)
/**
* Initializes console output formatter.
*
- * @param Boolean $decorated Whether this formatter should actually decorate strings
- * @param array $styles Array of "name => FormatterStyle" instances
+ * @param Boolean $decorated Whether this formatter should actually decorate strings
+ * @param FormatterStyle[] $styles Array of "name => FormatterStyle" instances
*
* @api
*/
@@ -72,7 +72,7 @@ public function setDefinition(array $definition)
/**
* Sets the InputArgument objects.
*
- * @param array $arguments An array of InputArgument objects
+ * @param InputArgument[] $arguments An array of InputArgument objects
*
* @api
*/
@@ -178,7 +178,7 @@ public function hasArgument($name)
/**
* Gets the array of InputArgument objects.
*
- * @return array An array of InputArgument objects
+ * @return InputArgument[] An array of InputArgument objects
*
* @api
*/
@@ -225,7 +225,7 @@ public function getArgumentDefaults()
/**
* Sets the InputOption objects.
*
- * @param array $options An array of InputOption objects
+ * @param InputOption[] $options An array of InputOption objects
*
* @api
*/
@@ -310,7 +310,7 @@ public function hasOption($name)
/**
* Gets the array of InputOption objects.
*
- * @return array An array of InputOption objects
+ * @return InputOption[] An array of InputOption objects
*
* @api
*/

0 comments on commit 003a487

Please sign in to comment.