Merge branch '2.7' into 2.8

* 2.7:
  fixed CS
  Filesystem: annotate the one network test with a "network" group.

src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container14.php

@@ -4,7 +4,7 @@ namespace Container14;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-/**
+/*
  * This file is included in Tests\Dumper\GraphvizDumperTest::testDumpWithFrozenCustomClassContainer
  * and Tests\Dumper\XmlDumperTest::testCompiledContainerCanBeDumped.
  */

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Symfony\Component\DependencyInjection\Dump;
 
 use Symfony\Component\DependencyInjection\ContainerInterface;

src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

@@ -156,6 +156,9 @@ class FilesystemTest extends FilesystemTestCase
         $this->assertEquals('SOURCE FILE', file_get_contents($targetFilePath));
     }
 
+    /**
+     * @group network
+     */
     public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
     {
         $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';