Merge branch '2.3' into 2.5

fabpot · fabpot · commit e53888d0f1c8 · 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/ConstraintViolationInterface.php b/ConstraintViolationInterface.php
@@ -65,7 +65,7 @@ public function getMessageTemplate();
      * @return array A possibly empty list of parameters indexed by the names
      *               that appear in the message template.
      *
-     * @see getMessageTemplate
+     * @see getMessageTemplate()
      *
      * @api
      */
diff --git a/GlobalExecutionContextInterface.php b/GlobalExecutionContextInterface.php
@@ -44,7 +44,7 @@ public function getViolations();
      *
      * @return mixed The root value.
      *
-     * @see ExecutionContextInterface::getRoot
+     * @see ExecutionContextInterface::getRoot()
      */
     public function getRoot();
 
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/Mapping/Loader/FilesLoader.php b/Mapping/Loader/FilesLoader.php
@@ -18,8 +18,8 @@
  *
  * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
  *
- * @see    Symfony\Component\Validator\Mapping\Loader\YamlFileLoader
- * @see    Symfony\Component\Validator\Mapping\Loader\XmlFileLoader
+ * @see YamlFileLoader
+ * @see XmlFileLoader
  */
 abstract class FilesLoader extends LoaderChain
 {
diff --git a/Mapping/Loader/XmlFilesLoader.php b/Mapping/Loader/XmlFilesLoader.php
@@ -16,7 +16,7 @@
  *
  * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
  *
- * @see    Symfony\Component\Validator\Mapping\Loader\FilesLoader
+ * @see FilesLoader
  */
 class XmlFilesLoader extends FilesLoader
 {
diff --git a/Mapping/Loader/YamlFilesLoader.php b/Mapping/Loader/YamlFilesLoader.php
@@ -16,7 +16,7 @@
  *
  * @author Bulat Shakirzyanov <mallluhuct@gmail.com>
  *
- * @see    Symfony\Component\Validator\Mapping\Loader\FilesLoader
+ * @see FilesLoader
  */
 class YamlFilesLoader extends FilesLoader
 {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function getMessageTemplate();`
`65`	`65`	`* @return array A possibly empty list of parameters indexed by the names`
`66`	`66`	`* that appear in the message template.`
`67`	`67`	`*`
`68`		`- * @see getMessageTemplate`
	`68`	`+ * @see getMessageTemplate()`
`69`	`69`	`*`
`70`	`70`	`* @api`
`71`	`71`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function getViolations();`
`44`	`44`	`*`
`45`	`45`	`* @return mixed The root value.`
`46`	`46`	`*`
`47`		`- * @see ExecutionContextInterface::getRoot`
	`47`	`+ * @see ExecutionContextInterface::getRoot()`
`48`	`48`	`*/`
`49`	`49`	`public function getRoot();`
`50`	`50`
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
`@@ -18,8 +18,8 @@`
`18`	`18`	`*`
`19`	`19`	`* @author Bulat Shakirzyanov <[email protected]>`
`20`	`20`	`*`
`21`		`- * @see Symfony\Component\Validator\Mapping\Loader\YamlFileLoader`
`22`		`- * @see Symfony\Component\Validator\Mapping\Loader\XmlFileLoader`
	`21`	`+ * @see YamlFileLoader`
	`22`	`+ * @see XmlFileLoader`
`23`	`23`	`*/`
`24`	`24`	`abstract class FilesLoader extends LoaderChain`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* @author Bulat Shakirzyanov <[email protected]>`
`18`	`18`	`*`
`19`		`- * @see Symfony\Component\Validator\Mapping\Loader\FilesLoader`
	`19`	`+ * @see FilesLoader`
`20`	`20`	`*/`
`21`	`21`	`class XmlFilesLoader extends FilesLoader`
`22`	`22`	`{`