Merge branch '2.7' into 2.8

fabpot · fabpot · commit 0807ef13a4a4 · 2017-05-07T09:04:05.000-07:00
* 2.7:
  fixed CS
  Filesystem: annotate the one network test with a "network" group.
diff --git a/Tests/Fixtures/containers/container14.php b/Tests/Fixtures/containers/container14.php
@@ -4,7 +4,7 @@
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-/**
+/*
  * This file is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
  * and Tests\Dumper\XmlDumperTest::testCompiledContainerCanBeDumped.
  */
diff --git a/Tests/Fixtures/php/services1-1.php b/Tests/Fixtures/php/services1-1.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Symfony\Component\DependencyInjection\Dump;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?php`
	`2`	`+`
`2`	`3`	`namespace Symfony\Component\DependencyInjection\Dump;`
`3`	`4`
`4`	`5`	`use Symfony\Component\DependencyInjection\ContainerInterface;`