Merge branch '2.3' into 2.7

* 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

Author: fabpot

Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php

@@ -64,7 +64,7 @@ public function testValidationGroupsCanBeSetToCallback()
     public function testValidationGroupsCanBeSetToClosure()
     {
         $form = $this->createForm(array(
-            'validation_groups' => function (FormInterface $form) { return; },
+            'validation_groups' => function (FormInterface $form) { },
         ));
 
         $this->assertTrue(is_callable($form->getConfig()->getOption('validation_groups')));

Tests/Util/OrderedHashMapTest.php

@@ -482,6 +482,6 @@ public function testCount()
         unset($map[0]);
         $map[] = 3;
 
-        $this->assertSame(2, count($map));
+        $this->assertCount(2, $map);
     }
 }