bug #3116 Fix HTML extension (fabpot)

This PR was merged into the 2.x branch.

Discussion
----------

Fix HTML extension

Commits
-------

5cc40a06 fixed HTML extension

.gitattributes

@@ -0,0 +1 @@
+/extra/** export-ignore

doc/filters/data_uri.rst

@@ -33,7 +33,7 @@ The ``data_uri`` filter generates a URL using the data scheme as defined in RFC
 
      Then, add it on the Twig environment::
 
-        use Twig\Html\HtmlExtension;
+        use Twig\Extra\Html\HtmlExtension;
 
         $twig = new \Twig\Environment(...);
         $twig->addExtension(new HtmlExtension());

doc/functions/html_classes.rst

@@ -26,7 +26,7 @@ names together:
 
      Then, add it on the Twig environment::
 
-        use Twig\Html\HtmlExtension;
+        use Twig\Extra\Html\HtmlExtension;
 
         $twig = new \Twig\Environment(...);
         $twig->addExtension(new HtmlExtension());

extra/html-extra/README.md

@@ -9,5 +9,5 @@ This package is a Twig extension that provides the following:
  * [`html_classes`][2] function: returns a string by conditionally joining class
    names together.
 
-[1]: https://twig.symfony.com/doc/2.x/functions/html_classes.html
-[2]: https://twig.symfony.com/doc/2.x/filters/data_uri.html
+[1]: https://twig.symfony.com/data_uri
+[2]: https://twig.symfony.com/html_classes

extra/html-extra/composer.json

@@ -23,12 +23,12 @@
     },
     "autoload": {
         "psr-4" : {
-            "Twig\\Html\\" : "src/"
+            "Twig\\Extra\\Html\\" : "src/"
         }
     },
     "autoload-dev": {
         "psr-4" : {
-            "Twig\\Html\\Tests\\" : "tests/"
+            "Twig\\Extra\\Html\\Tests\\" : "tests/"
         }
     },
     "extra": {

extra/html-extra/src/HtmlExtension.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Twig\Html {
+namespace Twig\Extra\Html {
 use Symfony\Component\Mime\MimeTypes;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFilter;

extra/html-extra/tests/IntegrationTest.php

@@ -9,9 +9,9 @@
  * file that was distributed with this source code.
  */
 
-namespace Twig\Intl\Tests;
+namespace Twig\Extra\Html\Tests;
 
-use Twig\Html\HtmlExtension;
+use Twig\Extra\Html\HtmlExtension;
 use Twig\Test\IntegrationTestCase;
 
 class IntegrationTest extends IntegrationTestCase