Merge branch '2.3' into 2.5

* 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
Nuscly · Jan 3, 2015 · e53888d · e53888d
2 parents 90bf49a + cf603c0
commit e53888d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
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 <[email protected]>
  *
- * @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 <[email protected]>
  *
- * @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 <[email protected]>
  *
- * @see    Symfony\Component\Validator\Mapping\Loader\FilesLoader
+ * @see FilesLoader
  */
 class YamlFilesLoader extends FilesLoader
 {