Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 44865e29c139 · 2017-10-02T09:25:49.000+02:00
* 3.4:
  fix merge
  fix merge
  fix merge
  Fix in simple-phpunit script
diff --git a/Tests/Fixtures/dumper/url_matcher4.php b/Tests/Fixtures/dumper/url_matcher4.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
diff --git a/Tests/Fixtures/dumper/url_matcher5.php b/Tests/Fixtures/dumper/url_matcher5.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
diff --git a/Tests/Fixtures/dumper/url_matcher6.php b/Tests/Fixtures/dumper/url_matcher6.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
diff --git a/Tests/Fixtures/dumper/url_matcher7.php b/Tests/Fixtures/dumper/url_matcher7.php
@@ -5,8 +5,6 @@
 use Symfony\Component\Routing\RequestContext;
 
 /**
- * ProjectUrlMatcher.
- *
  * This class has been auto-generated
  * by the Symfony Routing Component.
  */
