remove replacing twig.extension.assets with ProxyAssetExtension

Author: iteman

src/DependencyInjection/Compiler/ReplaceAssetExtensionAndPakcagesDefinitionPass.php

@@ -23,9 +23,6 @@ class ReplaceAssetExtensionAndPakcagesDefinitionPass implements CompilerPassInte
     public function process(ContainerBuilder $container)
     {
         if ($container->hasDefinition('twig.extension.assets') && $container->hasDefinition('assets.packages')) {
-            $container->getDefinition('phpmentors_proxy_url_rewrite.proxy_asset_extension')->setArguments($container->getDefinition('twig.extension.assets')->getArguments());
-            $container->setAlias('twig.extension.assets', 'phpmentors_proxy_url_rewrite.proxy_asset_extension');
-
             $container->getDefinition('phpmentors_proxy_url_rewrite.proxy_packages')->setArguments($container->getDefinition('assets.packages')->getArguments());
             $container->setAlias('assets.packages', 'phpmentors_proxy_url_rewrite.proxy_packages');
         }

src/Resources/config/services.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
   <parameters>
-    <parameter key="phpmentors_proxy_url_rewrite.proxy_asset_extension.class">PHPMentors\ProxyURLRewriteBundle\Templating\ProxyAssetExtension</parameter>
     <parameter key="phpmentors_proxy_url_rewrite.proxy_packages.class">PHPMentors\ProxyURLRewriteBundle\Asset\ProxyPackages</parameter>
     <parameter key="phpmentors_proxy_url_rewrite.proxy_url.class">PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrl</parameter>
     <parameter key="phpmentors_proxy_url_rewrite.proxy_url_collection.class">PHPMentors\ProxyURLRewriteBundle\ProxyUrl\ProxyUrlCollection</parameter>
@@ -15,7 +14,6 @@
         <argument type="service" id="phpmentors_proxy_url_rewrite.proxy_url_matcher"/>
       </call>
     </service>
-    <service id="phpmentors_proxy_url_rewrite.proxy_asset_extension" class="%phpmentors_proxy_url_rewrite.proxy_asset_extension.class%" public="false"/>
     <service id="phpmentors_proxy_url_rewrite.proxy_url" class="%phpmentors_proxy_url_rewrite.proxy_url.class%" abstract="true">
       <factory service="phpmentors_proxy_url_rewrite.proxy_url_factory" method="create"/>
     </service>

src/Templating/ProxyAssetExtension.php

@@ -4,5 +4,5 @@
 
 {% block body %}
 <div>{{ referenceType }}</div>
-<div id="asset">{{ asset('/bundles/test/foo.png', null, referenceType) }}</div>
+<div id="asset">{{ asset('/bundles/test/foo.png') }}</div>
 {% endblock %}

tests/Functional/Bundle/TestBundle/Resources/views/UrlRewritingInTemplates/index.html.twig

@@ -67,19 +67,14 @@ public function rewriteUrlInGenerateUrlData()
     {
         return array(
             array('/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
-            array('/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://backend1.example.com/foo/bar/url-rewriting-in-controllers/'),
             array('/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//backend1.example.com/foo/bar/url-rewriting-in-controllers/'),
             array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
-            array('//example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com/foo/bar/url-rewriting-in-controllers/'),
             array('//example.com/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com/foo/bar/url-rewriting-in-controllers/'),
             array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
-            array('http://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com/foo/bar/url-rewriting-in-controllers/'),
             array('http://example.com/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com/foo/bar/url-rewriting-in-controllers/'),
             array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
-            array('https://example.com/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'https://example.com/foo/bar/url-rewriting-in-controllers/'),
             array('https://example.com/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com/foo/bar/url-rewriting-in-controllers/'),
             array('http://example.com:8180/foo/bar/', UrlGeneratorInterface::ABSOLUTE_PATH, '/foo/bar/url-rewriting-in-controllers/'),
-            array('http://example.com:8180/foo/bar/', UrlGeneratorInterface::ABSOLUTE_URL, 'http://example.com:8180/foo/bar/url-rewriting-in-controllers/'),
             array('http://example.com:8180/foo/bar/', UrlGeneratorInterface::NETWORK_PATH, '//example.com:8180/foo/bar/url-rewriting-in-controllers/'),
         );
     }

tests/Functional/UrlRewritingInControllersTest.php

@@ -68,25 +68,20 @@ protected function removeCacheDir()
     public function rewriteUrlInAssetData()
     {
         return array(
-            array('/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
-            array('//example.com/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
-            array('//example.com/foo/bar/', true, 'http://example.com/foo/bar/bundles/test/foo.png'),
-            array('http://example.com/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
-            array('http://example.com/foo/bar/', true, 'http://example.com/foo/bar/bundles/test/foo.png'),
-            array('https://example.com/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
-            array('https://example.com/foo/bar/', true, 'https://example.com/foo/bar/bundles/test/foo.png'),
-            array('http://example.com:8180/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
-            array('http://example.com:8180/foo/bar/', true, 'http://example.com:8180/foo/bar/bundles/test/foo.png'),
-            array('https://example.com:8180/foo/bar/', false, '/foo/bar/bundles/test/foo.png'),
-            array('https://example.com:8180/foo/bar/', true, 'https://example.com:8180/foo/bar/bundles/test/foo.png'),
+            array('/foo/bar/', '/foo/bar/bundles/test/foo.png'),
+            array('//example.com/foo/bar/', '/foo/bar/bundles/test/foo.png'),
+            array('http://example.com/foo/bar/', '/foo/bar/bundles/test/foo.png'),
+            array('https://example.com/foo/bar/', '/foo/bar/bundles/test/foo.png'),
+            array('http://example.com:8180/foo/bar/', '/foo/bar/bundles/test/foo.png'),
+            array('https://example.com:8180/foo/bar/', '/foo/bar/bundles/test/foo.png'),
         );
     }
 
     /**
      * @test
      * @dataProvider rewriteUrlInAssetData
      */
-    public function rewriteUrlInAsset($proxyUrl, $referenceType, $rewroteUrl)
+    public function rewriteUrlInAsset($proxyUrl, $rewroteUrl)
     {
         $client = $this->createClient(array('config' => function (ContainerBuilder $container) use ($proxyUrl) {
             $container->loadFromExtension('framework', array(
@@ -102,7 +97,7 @@ public function rewriteUrlInAsset($proxyUrl, $referenceType, $rewroteUrl)
             ));
         }));
 
-        $client->request('GET', sprintf('http://backend1.example.com:8080/url-rewriting-in-templates/?referenceType=%s', $referenceType));
+        $client->request('GET', 'http://backend1.example.com:8080/url-rewriting-in-templates/');
 
         $this->assertThat($client->getResponse()->getStatusCode(), $this->equalTo(200), $client->getResponse()->getContent());
         $this->assertThat($client->getCrawler()->filterXpath("//*[@id='asset']")->text(), $this->equalTo($rewroteUrl));