Fix Twig 3.x compatibility

VirgileZol · ostrolucky · web-flow · commit 63e55d74d58a · 2021-10-23T13:16:17.000+02:00
Co-authored-by: Gabriel Ostrolucký &lt;gabriel.ostrolucky@gmail.com&gt;
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         include:
           # Minimum supported Symfony version and lowest PHP version
-          - dependencies: "php-http/guzzle7-adapter"
+          - dependencies: "php-http/guzzle7-adapter php-http/discovery:^1.12"
             php-version: "7.3"
             dependency-versions: "lowest"
             symfony-deprecations-helper: "weak"
@@ -91,7 +91,7 @@ jobs:
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
         with:
-          dependency-versions: "${{ matrix.dependencies }}"
+          dependency-versions: "${{ matrix.dependency-versions }}"
           composer-options: "${{ matrix.composer-options }}"
 
       - name: "Run PHPUnit"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,11 @@
 
 The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
 
-# 1.24.0 - unreleased
+# 1.24.0 - 2021-10-23
 - Changed stopwatch category from default to "httplug", so it's more prominent on Execution timeline view
 - Changed tab texts inside profiler so that it shows ports in URL in case it's non-standard
 - Changed default logging plugin monolog channel from "app" to "httplug"
+- Fixed compatibility with Twig 3.x
 
 # 1.23.1 - 2021-10-13
 - Fixed issue with whitespaces in URL when URL in tab was copied
diff --git a/composer.json b/composer.json
@@ -59,7 +59,7 @@
         "symfony/dom-crawler": "^3.4.34 || ^4.2.12 || ^5.0",
         "symfony/framework-bundle": "^3.4.34 || ^4.2.12 || ^5.0",
         "symfony/http-foundation": "^3.4.35 || ~4.2.12 || ^4.3.8 || ^5.0",
-        "symfony/phpunit-bridge": "^3.4.34 || ^4.2.12 || ^5.0",
+        "symfony/phpunit-bridge": "^5.3",
         "symfony/stopwatch": "^3.4.34 || ^4.2.12 || ^5.0",
         "symfony/twig-bundle": "^3.4.34 || ^4.2.12 || ^5.0",
         "symfony/web-profiler-bundle": "^3.4.34 || ^4.2.12 || ^5.0",
diff --git a/src/Resources/views/stack.html.twig b/src/Resources/views/stack.html.twig
@@ -7,7 +7,7 @@
         {% endif %}
         <span class="label httplug-method httplug-method-{{ stack.requestMethod|lower }}">{{ stack.requestMethod }}</span>
     </div>
-    {% spaceless %}
+    {% apply spaceless %}
         <div class="label httplug-stack-header-target">
             <span class="httplug-scheme">{{ stack.requestScheme }}://</span>
             <span class="httplug-host">{{ stack.requestHost }}</span>
@@ -16,7 +16,7 @@
             {% endif %}
             <span class="httplug-target">{{ stack.requestTarget }}</span>
         </div>
-    {% endspaceless %}
+    {% endapply %}
     <div>
         <span class="label httplug-duration">{{ stack.duration|number_format }} ms</span>
         {% if stack.responseCode >= 400 and stack.responseCode <= 599 %}
diff --git a/tests/Functional/ProfilerTest.php b/tests/Functional/ProfilerTest.php
@@ -4,6 +4,8 @@
 
 namespace Http\HttplugBundle\Tests\Functional;
 
+use GuzzleHttp\Psr7\Request;
+use Http\Client\HttpClient;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
 class ProfilerTest extends WebTestCase
@@ -14,12 +16,19 @@ class ProfilerTest extends WebTestCase
     public function testShowProfiler(): void
     {
         $client = static::createClient();
+        $httpClient = $client->getContainer()->get('httplug.client.acme');
+
+        assert($httpClient instanceof HttpClient);
+
+        $httpClient->sendRequest(new Request('GET', '/posts/1'));
 
         //Browse any page to get a profile
         $client->request('GET', '/');
 
         $client->request('GET', '/_profiler/latest?panel=httplug');
         $content = $client->getResponse()->getContent();
-        $this->assertTrue(false !== strpos($content, '<h2>HTTPlug</h2>'));
+        $this->assertStringContainsString(<<<HTML
+            <div class="label httplug-stack-header-target"><span class="httplug-scheme">https://</span><span class="httplug-host">jsonplaceholder.typicode.com</span><span class="httplug-target">/posts/1</span></div>
+        HTML, $content);
     }
 }
diff --git a/tests/Resources/app/config/config_test.yml b/tests/Resources/app/config/config_test.yml
@@ -7,15 +7,14 @@ httplug:
         async_client: auto
     clients:
         acme:
-            factory: httplug.factory.guzzle7
             plugins:
                 -
                     decoder:
                         use_content_encoding: false
                 - app.http.plugin.custom
                 -
                     add_host:
-                        host: "http://localhost:8000"
+                        host: "https://jsonplaceholder.typicode.com"
                 -
                     authentication:
                         my_basic:

Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,14 @@ httplug:`
`7`	`7`	`async_client: auto`
`8`	`8`	`clients:`
`9`	`9`	`acme:`
`10`		`- factory: httplug.factory.guzzle7`
`11`	`10`	`plugins:`
`12`	`11`	`-`
`13`	`12`	`decoder:`
`14`	`13`	`use_content_encoding: false`
`15`	`14`	`- app.http.plugin.custom`
`16`	`15`	`-`
`17`	`16`	`add_host:`
`18`		`- host: "http://localhost:8000"`
	`17`	`+ host: "https://jsonplaceholder.typicode.com"`
`19`	`18`	`-`
`20`	`19`	`authentication:`
`21`	`20`	`my_basic:`