Merge branch '2.7' into 2.8

fabpot · fabpot · commit 9fb3286d55b9 · 2015-04-11T10:55:16.000+02:00
* 2.7: [HttpKernel] fixed a regression when no exception listeners are registered renamed some confusing tests propel/propel1 is now useless bumped Symfony version to 2.7.0 updated VERSION for 2.7.0-BETA1 updated CHANGELOG for 2.7.0-BETA1 [2.3] Fix @link annotations [2.7] For @link annotations [2.6] Fix @link annotations [2.7][Console] Count the array instead of [Config][cache factory] check type of callback argument. Fix javascript [2.3][Translation] test refresh cache when resources File change. Added deprecation message and original color back [Translator] Cache does not take fallback locales into consideration
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 <bschussek@gmail.com>`
`19`	`19`	`*/`