Merge branch '4.4' into 5.2

* 4.4: Leverage str_contains/str_starts_with Leverage str_ends_with
symfony · Jul 21, 2021 · c8cde33 · c8cde33
2 parents a495e17 + 236017d
commit c8cde33
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Csp/ContentSecurityPolicyHandler.php b/Csp/ContentSecurityPolicyHandler.php
@@ -221,7 +221,7 @@ private function authorizesInline(array $directivesSet, string $type): bool
     private function hasHashOrNonce(array $directives): bool
     {
         foreach ($directives as $directive) {
-            if ('\'' !== substr($directive, -1)) {
+            if (!str_ends_with($directive, '\'')) {
                 continue;
             }
             if ('\'nonce-' === substr($directive, 0, 7)) {

diff --git a/EventListener/WebDebugToolbarListener.php b/EventListener/WebDebugToolbarListener.php
@@ -101,7 +101,7 @@ public function onKernelResponse(ResponseEvent $event)
         if (self::DISABLED === $this->mode
             || !$response->headers->has('X-Debug-Token')
             || $response->isRedirection()
-            || ($response->headers->has('Content-Type') && false === strpos($response->headers->get('Content-Type'), 'html'))
+            || ($response->headers->has('Content-Type') && !str_contains($response->headers->get('Content-Type'), 'html'))
             || 'html' !== $request->getRequestFormat()
             || false !== stripos($response->headers->get('Content-Disposition', ''), 'attachment;')
         ) {

diff --git a/Profiler/TemplateManager.php b/Profiler/TemplateManager.php
@@ -78,7 +78,7 @@ public function getNames(Profile $profile)
                 continue;
             }
 
-            if ('.html.twig' === substr($template, -10)) {
+            if (str_ends_with($template, '.html.twig')) {
                 $template = substr($template, 0, -10);
             }
 

diff --git a/Twig/WebProfilerExtension.php b/Twig/WebProfilerExtension.php
@@ -90,7 +90,7 @@ public function dumpLog(Environment $env, string $message, Data $context = null)
         $message = twig_escape_filter($env, $message);
         $message = preg_replace('/&quot;(.*?)&quot;/', '&quot;<b>$1</b>&quot;', $message);
 
-        if (null === $context || false === strpos($message, '{')) {
+        if (null === $context || !str_contains($message, '{')) {
             return '<span class="dump-inline">'.$message.'</span>';
         }
 

diff --git a/composer.json b/composer.json
@@ -20,6 +20,7 @@
         "symfony/config": "^4.4|^5.0",
         "symfony/framework-bundle": "^5.1",
         "symfony/http-kernel": "^5.2",
+        "symfony/polyfill-php80": "^1.16",
         "symfony/routing": "^4.4|^5.0",
         "symfony/twig-bundle": "^4.4|^5.0",
         "twig/twig": "^2.13|^3.0.4"