Merge branch '2.3' into 2.5

fabpot · fabpot · commit be317fa1dab9 · 2015-01-03T09:01:13.000+01:00
* 2.3:
  Use PHPUnit ini_set wrapper in tests
  [Process] Added a test skip check for Windows
  [Process] Removed unused variable assignment
  Fixes various phpdoc and coding standards.
  Fixes Issue #13184 - incremental output getters now return empty strings
  Updated copyright to 2015

Conflicts:
	src/Symfony/Bridge/Doctrine/Form/ChoiceList/EntityChoiceList.php
	src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
diff --git a/Extension/Core/ChoiceList/ChoiceList.php b/Extension/Core/ChoiceList/ChoiceList.php
@@ -505,7 +505,7 @@ protected function fixChoice($choice)
      *
      * @return array The fixed choices.
      *
-     * @see fixChoice
+     * @see fixChoice()
      */
     protected function fixChoices(array $choices)
     {
diff --git a/Extension/Core/ChoiceList/ChoiceListInterface.php b/Extension/Core/ChoiceList/ChoiceListInterface.php
@@ -88,7 +88,7 @@ public function getPreferredViews();
      *               choice indices as keys on the lowest levels and the choice
      *               group names in the keys of the higher levels
      *
-     * @see getPreferredValues
+     * @see getPreferredValues()
      */
     public function getRemainingViews();
 
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2014 Fabien Potencier
+Copyright (c) 2004-2015 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Tests/FormBuilderTest.php b/Tests/FormBuilderTest.php
@@ -16,9 +16,7 @@
 class FormBuilderTest extends \PHPUnit_Framework_TestCase
 {
     private $dispatcher;
-
     private $factory;
-
     private $builder;
 
     protected function setUp()
@@ -39,7 +37,7 @@ protected function tearDown()
      * Changing the name is not allowed, otherwise the name and property path
      * are not synchronized anymore.
      *
-     * @see FormType::buildForm
+     * @see FormType::buildForm()
      */
     public function testNoSetName()
     {

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ protected function fixChoice($choice)`
`505`	`505`	`*`
`506`	`506`	`* @return array The fixed choices.`
`507`	`507`	`*`
`508`		`- * @see fixChoice`
	`508`	`+ * @see fixChoice()`
`509`	`509`	`*/`
`510`	`510`	`protected function fixChoices(array $choices)`
`511`	`511`	`{`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function getPreferredViews();`
`88`	`88`	`* choice indices as keys on the lowest levels and the choice`
`89`	`89`	`* group names in the keys of the higher levels`
`90`	`90`	`*`
`91`		`- * @see getPreferredValues`
	`91`	`+ * @see getPreferredValues()`
`92`	`92`	`*/`
`93`	`93`	`public function getRemainingViews();`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2004-2014 Fabien Potencier`
	`1`	`+Copyright (c) 2004-2015 Fabien Potencier`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,7 @@`
`16`	`16`	`class FormBuilderTest extends \PHPUnit_Framework_TestCase`
`17`	`17`	`{`
`18`	`18`	`private $dispatcher;`
`19`		`-`
`20`	`19`	`private $factory;`
`21`		`-`
`22`	`20`	`private $builder;`
`23`	`21`
`24`	`22`	`protected function setUp()`
`@@ -39,7 +37,7 @@ protected function tearDown()`
`39`	`37`	`* Changing the name is not allowed, otherwise the name and property path`
`40`	`38`	`* are not synchronized anymore.`
`41`	`39`	`*`
`42`		`- * @see FormType::buildForm`
	`40`	`+ * @see FormType::buildForm()`
`43`	`41`	`*/`
`44`	`42`	`public function testNoSetName()`
`45`	`43`	`{`