Fix CS

twigphp · Dec 10, 2023 · aa7c454 · aa7c454
1 parent 54d34b9
commit aa7c454
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 24 deletions.
diff --git a/extra/cssinliner-extra/CssInlinerExtension.php b/extra/cssinliner-extra/CssInlinerExtension.php
@@ -33,7 +33,7 @@ public static function inlineCss(string $body, string ...$css): string
         if (null === $inliner) {
             $inliner = new CssToInlineStyles();
         }
-    
+
         return $inliner->convert($body, implode("\n", $css));
     }
 }
diff --git a/extra/cssinliner-extra/Resources/functions.php b/extra/cssinliner-extra/Resources/functions.php
@@ -13,6 +13,7 @@
 
 /**
  * @internal
+ *
  * @deprecated since Twig 3.9.0
  */
 function twig_inline_css(string $body, string ...$css): string

diff --git a/extra/cssinliner-extra/Tests/LegacyFunctionsTest.php b/extra/cssinliner-extra/Tests/LegacyFunctionsTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Twig\Extra\CssInliner\CssInlinerExtension;
+
 use function Twig\Extra\CssInliner\twig_inline_css;
 
 /**

diff --git a/extra/html-extra/Resources/functions.php b/extra/html-extra/Resources/functions.php
@@ -13,6 +13,7 @@
 
 /**
  * @internal
+ *
  * @deprecated since Twig 3.9.0
  */
 function twig_html_classes(...$args): string

diff --git a/extra/inky-extra/Resources/functions.php b/extra/inky-extra/Resources/functions.php
@@ -13,6 +13,7 @@
 
 /**
  * @internal
+ *
  * @deprecated since Twig 3.9.0
  */
 function twig_inky(string $body): string

diff --git a/extra/inky-extra/Tests/LegacyFunctionsTest.php b/extra/inky-extra/Tests/LegacyFunctionsTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Twig\Extra\Inky\InkyExtension;
+
 use function Twig\Extra\Inky\twig_inky;
 
 /**

diff --git a/extra/markdown-extra/MarkdownExtension.php b/extra/markdown-extra/MarkdownExtension.php
@@ -31,21 +31,21 @@ public function getFilters()
     public static function htmlToMarkdown(string $body, array $options = []): string
     {
         static $converters;
-    
+
         if (!class_exists(HtmlConverter::class)) {
             throw new \LogicException('You cannot use the "html_to_markdown" filter as league/html-to-markdown is not installed; try running "composer require league/html-to-markdown".');
         }
-    
+
         $options += [
             'hard_break' => true,
             'strip_tags' => true,
             'remove_nodes' => 'head style',
         ];
-    
+
         if (!isset($converters[$key = serialize($options)])) {
             $converters[$key] = new HtmlConverter($options);
         }
-    
+
         return $converters[$key]->convert($body);
     }
 }
diff --git a/extra/markdown-extra/Resources/functions.php b/extra/markdown-extra/Resources/functions.php
@@ -13,6 +13,7 @@
 
 /**
  * @internal
+ *
  * @deprecated since Twig 3.9.0
  */
 function html_to_markdown(string $body, array $options = []): string

diff --git a/extra/markdown-extra/Tests/LegacyFunctionsTest.php b/extra/markdown-extra/Tests/LegacyFunctionsTest.php
@@ -12,9 +12,11 @@
 namespace Twig\Extra\Markdown\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Twig\Extra\Markdown\MarkdownExtension;
+
 use function Twig\Extra\Markdown\html_to_markdown;
 
+use Twig\Extra\Markdown\MarkdownExtension;
+
 /**
  * @group legacy
  */

diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
@@ -653,7 +653,6 @@ public static function arrayMerge(...$arrays)
         return $result;
     }
 
-
     /**
      * Slices a variable.
      *
@@ -1215,7 +1214,7 @@ public static function lowerFilter(Environment $env, $string)
     /**
      * Strips HTML and PHP tags from a string.
      *
-     * @param string|null $string
+     * @param string|null          $string
      * @param string[]|string|null $string
      *
      * @return string

diff --git a/src/Extension/DebugExtension.php b/src/Extension/DebugExtension.php
@@ -12,9 +12,9 @@
 namespace Twig\Extension;
 
 use Twig\Environment;
-use Twig\TwigFunction;
 use Twig\Template;
 use Twig\TemplateWrapper;
+use Twig\TwigFunction;
 
 final class DebugExtension extends AbstractExtension
 {
@@ -43,22 +43,22 @@ public static function dump(Environment $env, $context, ...$vars)
         if (!$env->isDebug()) {
             return;
         }
-    
+
         ob_start();
-    
+
         if (!$vars) {
             $vars = [];
             foreach ($context as $key => $value) {
                 if (!$value instanceof Template && !$value instanceof TemplateWrapper) {
                     $vars[$key] = $value;
                 }
             }
-    
+
             var_dump($vars);
         } else {
             var_dump(...$vars);
         }
-    
+
         return ob_get_clean();
     }
 }
diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
@@ -21,7 +21,6 @@
 use Twig\TokenParser\AutoEscapeTokenParser;
 use Twig\TwigFilter;
 
-
 final class EscaperExtension extends AbstractExtension
 {
     private $defaultStrategy;
@@ -177,7 +176,7 @@ public static function escapeFilterIsSafe(Node $filterArgs)
      * @param bool   $autoescape Whether the function is called by the auto-escaping feature (true) or by the developer (false)
      *
      * @return string
-     * 
+     *
      * @internal
      */
     public static function escape(Environment $env, $string, $strategy = 'html', $charset = null, $autoescape = false)
@@ -190,7 +189,7 @@ public static function escape(Environment $env, $string, $strategy = 'html', $ch
             if (\is_object($string) && method_exists($string, '__toString')) {
                 if ($autoescape) {
                     $c = \get_class($string);
-                    $ext = $env->getExtension(EscaperExtension::class);
+                    $ext = $env->getExtension(self::class);
                     if (!isset($ext->safeClasses[$c])) {
                         $ext->safeClasses[$c] = [];
                         foreach (class_parents($string) + class_implements($string) as $class) {
@@ -256,7 +255,7 @@ public static function escape(Environment $env, $string, $strategy = 'html', $ch
                     return htmlspecialchars($string, \ENT_QUOTES | \ENT_SUBSTITUTE, $charset);
                 }
 
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
+                $string = CoreExtension::convertEncoding($string, 'UTF-8', $charset);
                 $string = htmlspecialchars($string, \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8');
 
                 return iconv('UTF-8', $charset, $string);
@@ -265,7 +264,7 @@ public static function escape(Environment $env, $string, $strategy = 'html', $ch
                 // escape all non-alphanumeric characters
                 // into their \x or \uHHHH representations
                 if ('UTF-8' !== $charset) {
-                    $string = twig_convert_encoding($string, 'UTF-8', $charset);
+                    $string = CoreExtension::convertEncoding($string, 'UTF-8', $charset);
                 }
 
                 if (!preg_match('//u', $string)) {
@@ -316,7 +315,7 @@ public static function escape(Environment $env, $string, $strategy = 'html', $ch
 
             case 'css':
                 if ('UTF-8' !== $charset) {
-                    $string = twig_convert_encoding($string, 'UTF-8', $charset);
+                    $string = CoreExtension::convertEncoding($string, 'UTF-8', $charset);
                 }
 
                 if (!preg_match('//u', $string)) {
@@ -337,7 +336,7 @@ public static function escape(Environment $env, $string, $strategy = 'html', $ch
 
             case 'html_attr':
                 if ('UTF-8' !== $charset) {
-                    $string = twig_convert_encoding($string, 'UTF-8', $charset);
+                    $string = CoreExtension::convertEncoding($string, 'UTF-8', $charset);
                 }
 
                 if (!preg_match('//u', $string)) {
@@ -404,14 +403,14 @@ public static function escape(Environment $env, $string, $strategy = 'html', $ch
                 return rawurlencode($string);
 
             default:
-                $escapers = $env->getExtension(EscaperExtension::class)->getEscapers();
+                $escapers = $env->getExtension(self::class)->getEscapers();
                 if (\array_key_exists($strategy, $escapers)) {
                     return $escapers[$strategy]($env, $string, $charset);
                 }
 
-                $validStrategies = implode(', ', array_merge(['html', 'js', 'url', 'css', 'html_attr'], array_keys($escapers)));
+                $validStrategies = implode('", "', array_merge(['html', 'js', 'url', 'css', 'html_attr'], array_keys($escapers)));
 
-                throw new RuntimeError(sprintf('Invalid escaping strategy "%s" (valid ones: %s).', $strategy, $validStrategies));
+                throw new RuntimeError(sprintf('Invalid escaping strategy "%s" (valid ones: "%s").', $strategy, $validStrategies));
         }
     }
 }
diff --git a/src/Extension/StringLoaderExtension.php b/src/Extension/StringLoaderExtension.php
@@ -31,7 +31,7 @@ public function getFunctions(): array
      *
      * @param string $template A template as a string or object implementing __toString()
      * @param string $name     An optional name of the template to be used in error messages
-     * 
+     *
      * @internal
      */
     public static function templateFromString(Environment $env, $template, string $name = null): TemplateWrapper
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
     /**
      * @internal
+     *
      * @deprecated since Twig 3.9.0
      */
     function twig_inline_css(string $body, string ...$css): string
@@ Expand Down @@