Fix naming and CS

symfony · dunglas · Apr 4, 2017 · Apr 4, 2017 · Apr 5, 2017 · Apr 6, 2017
commit aaa54c23130c0cbd9cc84445224d2799f7b66ff9
diff --git a/composer.json b/composer.json
@@ -78,6 +78,7 @@
         "symfony/twig-bundle": "self.version",
         "symfony/validator": "self.version",
         "symfony/var-dumper": "self.version",
+        "symfony/web-link": "self.version",
         "symfony/web-profiler-bundle": "self.version",
         "symfony/web-server-bundle": "self.version",
         "symfony/workflow": "self.version",

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -35,7 +35,7 @@
         "symfony/console": "~2.8|~3.0",
         "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2",
         "symfony/expression-language": "~2.8|~3.0",
-        "symfony/weblink": "~3.3"
+        "symfony/web-link": "~3.3"
     },
     "suggest": {
         "symfony/finder": "",
@@ -49,7 +49,8 @@
         "symfony/security": "For using the SecurityExtension",
         "symfony/stopwatch": "For using the StopwatchExtension",
         "symfony/var-dumper": "For using the DumpExtension",
-        "symfony/expression-language": "For using the ExpressionExtension"
+        "symfony/expression-language": "For using the ExpressionExtension",
+        "symfony/web-link": "For using the WebLinkExtension"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bridge\\Twig\\": "" },

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -18,10 +18,10 @@
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Form\Form;
-use Symfony\Component\WebLink\WebLinkManagerInterface;
 use Symfony\Component\Serializer\Serializer;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Validator\Validation;
+use Symfony\Component\WebLink\WebLinkManagerInterface;
 
 /**
  * FrameworkExtension configuration structure.

diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -15,8 +15,10 @@
 use Symfony\Bridge\Monolog\Processor\DebugProcessor;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Config\Resource\DirectoryResource;
+use Symfony\Component\Console\Application;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -28,17 +30,15 @@
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\Config\FileLocator;
-use Symfony\Component\WebLink\WebLinkManagerInterface;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 use Symfony\Component\Serializer\Encoder\YamlEncoder;
 use Symfony\Component\Serializer\Encoder\CsvEncoder;
 use Symfony\Component\Serializer\Mapping\Factory\CacheClassMetadataFactory;
 use Symfony\Component\Serializer\Normalizer\DataUriNormalizer;
 use Symfony\Component\Serializer\Normalizer\DateTimeNormalizer;
 use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
+use Symfony\Component\WebLink\WebLinkManagerInterface;
 use Symfony\Component\Workflow;
-use Symfony\Component\Console\Application;
 
 /**
  * FrameworkExtension.

diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -53,7 +53,7 @@
         "symfony/workflow": "~3.3",
         "symfony/yaml": "~3.2",
         "symfony/property-info": "~3.3",
-        "symfony/weblink": "~3.3",
+        "symfony/web-link": "~3.3",
         "doctrine/annotations": "~1.0",
         "phpdocumentor/reflection-docblock": "^3.0",
         "twig/twig": "~1.26|~2.0",

diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -34,7 +34,7 @@
         "symfony/templating": "~2.8|~3.0",
         "symfony/yaml": "~2.8|~3.0",
         "symfony/framework-bundle": "^3.2.2",
-        "symfony/weblink": "~3.3",
+        "symfony/web-link": "~3.3",
         "doctrine/annotations": "~1.0"
     },
     "conflict": {

diff --git a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php
@@ -11,11 +11,11 @@
 
 namespace Symfony\Component\WebLink\EventListener;
 
-use Symfony\Component\WebLink\HttpHeaderSerializer;
-use Symfony\Component\WebLink\WebLinkManagerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\WebLink\HttpHeaderSerializer;
+use Symfony\Component\WebLink\WebLinkManagerInterface;
 
 /**
  * Adds the Link HTTP header to the response.

diff --git a/src/Symfony/Component/WebLink/README.md b/src/Symfony/Component/WebLink/README.md
@@ -1,7 +1,7 @@
 WebLink Component
 =================
 
-The Link component manages links between resources. It is particularly useful to advise clients
+The WebLink component manages links between resources. It is particularly useful to advise clients
 to preload and prefetch documents through HTTP and HTTP/2 pushes.
 
 This component implements the [HTML5's Links](https://www.w3.org/TR/html5/links.html), [Preload](https://www.w3.org/TR/preload/)

diff --git a/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php b/src/Symfony/Component/WebLink/Tests/HttpHeaderSerializerTest.php
@@ -23,11 +23,13 @@ class HttpHeaderSerializerTest extends TestCase
      */
     private $serializer;
 
-    protected function setUp() {
+    protected function setUp()
+    {
         $this->serializer = new HttpHeaderSerializer();
     }
 
-    public function testSerialize() {
+    public function testSerialize()
+    {
         $linkProvider = new GenericLinkProvider(array(
             new Link('prerender', '/1'),
             (new Link('dns-prefetch', '/2'))->withAttribute('pr', 0.7),
@@ -39,7 +41,8 @@ public function testSerialize() {
         $this->assertEquals('</1>; rel="prerender",</2>; rel="dns-prefetch"; pr="0.7",</3>; rel="preload"; as="script",</4>; rel="preload"; as="image"; nopush,</5>; rel="alternate next"; hreflang="fr"; hreflang="de"; title="Hello"', $this->serializer->serialize($linkProvider));
     }
 
-    public function testSerializeEmpty() {
+    public function testSerializeEmpty()
+    {
         $this->assertNull($this->serializer->serialize(new GenericLinkProvider()));
     }
 }
diff --git a/src/Symfony/Component/WebLink/Tests/WebLinkManagerTest.php b/src/Symfony/Component/WebLink/Tests/WebLinkManagerTest.php
@@ -41,7 +41,8 @@ public function testAdd()
         $this->assertSame(array($link1, $link2), array_values($this->manager->getLinkProvider()->getLinks()));
     }
 
-    public function testClear() {
+    public function testClear()
+    {
         $this->manager->add($link1 = new Link());
         $this->manager->add($link2 = new Link());
 

diff --git a/src/Symfony/Component/WebLink/composer.json b/src/Symfony/Component/WebLink/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "symfony/weblink",
+    "name": "symfony/web-link",
     "type": "library",
     "description": "Symfony WebLink Component",
     "keywords": ["link", "psr13", "http", "HTTP/2", "preload", "prefetch", "pre-render", "dns-prefetch", "push", "performance"],