Merge branch '2.3' into 2.7

fabpot · fabpot · commit c250801e6e89 · 2016-01-27T06:09:39.000+01:00
* 2.3:
  Static code analysis
  Update AnnotationDirectoryLoader.php
  [FrameworkBundle] Fix template location for PHP templates
  [FrameworkBundle] Add path verification to the template parsing test cases
diff --git a/Tests/Normalizer/GetSetMethodNormalizerTest.php b/Tests/Normalizer/GetSetMethodNormalizerTest.php
@@ -420,7 +420,6 @@ public function provideCallbacks()
             array(
                 array(
                     'bar' => function ($bar) {
-                        return;
                     },
                 ),
                 'baz',

-Original file line number
+Diff line change
             array(
                 array(
                     'bar' => function ($bar) {
 -                        return;
                     },
                 ),
                 'baz',