Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '2.1'

* 2.1:
  [Console] Fix style escaping parsing
  [Console] Make style formatter matching less greedy to avoid having to escape when not needed
  [Bundle] [FrameworkBundle] fixed indentation in esi.xml services file.
  [Component] [Security] fixed PSR-2 coding violation in ClassUtilsTest class.
  [Form] Fixed EntityChoiceList when loading objects with negative integer IDs
  [TwigBundle] There is no CSS visibility of display, should be visible instead
  [Form] corrected source node for a Danish translation
  [DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607)
  [HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled
  [CssSelector] added css selector with empty string
  [HttpFoundation] Docblock for Request::isXmlHttpRequest() now points to Wikipedia
  [DependencyInjection] refactored code to avoid logic duplication
  [Form] Deleted references in FormBuilder::getFormConfig() to improve performance
  [HttpFoundation] Update docblock for non-working method

Conflicts:
	src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
  • Loading branch information...
commit 5f1f30e85559ca00e1816bd62d33706a6f90f86d 2 parents 83f4684 + fe15d89
@fabpot fabpot authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  Tests/Core/Util/ClassUtilsTest.php
View
2  Tests/Core/Util/ClassUtilsTest.php
@@ -15,7 +15,7 @@
class ClassUtilsTest extends \PHPUnit_Framework_TestCase
{
- static public function dataGetClass()
+ public static function dataGetClass()
{
return array(
array('stdClass', 'stdClass'),
Please sign in to comment.
Something went wrong with that request. Please try again.