Merge branch '2.6' into 2.7

fabpot · fabpot · commit 06746806730d · 2015-04-11T09:21:47.000+02:00
* 2.6: renamed some confusing tests [2.3] Fix @link annotations [2.6] Fix @link annotations Fix javascript [2.3][Translation] test refresh cache when resources File change. [Translator] Cache does not take fallback locales into consideration Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php src/Symfony/Component/Validator/ValidatorInterface.php
diff --git a/Exception/AccessException.php b/Exception/AccessException.php
@@ -13,7 +13,7 @@
 
 /**
  * Thrown when trying to read an option outside of or write it inside of
- * {@link Options::resolve()}.
+ * {@link \Symfony\Component\OptionsResolver\Options::resolve()}.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
  */

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* Thrown when trying to read an option outside of or write it inside of`
`16`		`- * {@link Options::resolve()}.`
	`16`	`+ * {@link \Symfony\Component\OptionsResolver\Options::resolve()}.`
`17`	`17`	`*`
`18`	`18`	`* @author Bernhard Schussek <[email protected]>`
`19`	`19`	`*/`