Modernize code

Author: fabpot

SensioLabs/AnsiConverter/AnsiToHtmlConverter.php

@@ -18,17 +18,14 @@
  */
 class AnsiToHtmlConverter
 {
-    protected $theme;
-    protected $charset;
-    protected $inlineStyles;
     protected $inlineColors;
     protected $colorNames;
 
-    public function __construct(?Theme $theme = null, $inlineStyles = true, $charset = 'UTF-8')
-    {
-        $this->theme = null === $theme ? new Theme() : $theme;
-        $this->inlineStyles = $inlineStyles;
-        $this->charset = $charset;
+    public function __construct(
+        protected Theme $theme = new Theme(),
+        protected bool $inlineStyles = true,
+        protected string $charset = 'UTF-8',
+    ) {
         $this->inlineColors = $this->theme->asArray();
         $this->colorNames = [
             'black', 'red', 'green', 'yellow', 'blue', 'magenta', 'cyan', 'white',
@@ -37,7 +34,7 @@ public function __construct(?Theme $theme = null, $inlineStyles = true, $charset
         ];
     }
 
-    public function convert($text)
+    public function convert(string $text): string
     {
         // remove cursor movement sequences
         $text = preg_replace('#\e\[(K|s|u|2J|2K|\d+(A|B|C|D|E|F|G|J|K|S|T)|\d+;\d+(H|f))#', '', $text);
@@ -86,12 +83,12 @@ public function convert($text)
         return $html;
     }
 
-    public function getTheme()
+    public function getTheme(): Theme
     {
         return $this->theme;
     }
 
-    protected function convertAnsiToColor($ansi)
+    protected function convertAnsiToColor(string $ansi): string
     {
         $bg = 0;
         $fg = 7;
@@ -173,7 +170,7 @@ protected function convertAnsiToColor($ansi)
         }
     }
 
-    protected function tokenize($text)
+    protected function tokenize(string $text): array
     {
         $tokens = [];
         preg_match_all("/(?:\e\[(.*?)m|(\x08))/", $text, $matches, \PREG_OFFSET_CAPTURE);

SensioLabs/AnsiConverter/Bridge/Twig/AnsiExtension.php

@@ -18,12 +18,9 @@
 
 class AnsiExtension extends AbstractExtension
 {
-    /** @var AnsiToHtmlConverter */
-    private $converter;
-
-    public function __construct(?AnsiToHtmlConverter $converter = null)
-    {
-        $this->converter = $converter ?: new AnsiToHtmlConverter();
+    public function __construct(
+        private AnsiToHtmlConverter $converter = new AnsiToHtmlConverter(),
+    ) {
     }
 
     public function getFilters(): array
@@ -49,9 +46,4 @@ public function css(): string
     {
         return $this->converter->getTheme()->asCss();
     }
-
-    public function getName(): string
-    {
-        return 'sensiolabs_ansi';
-    }
 }

SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php

@@ -11,21 +11,20 @@
 
 namespace SensioLabs\AnsiConverter\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use SensioLabs\AnsiConverter\AnsiToHtmlConverter;
 
 class AnsiToHtmlConverterTest extends TestCase
 {
-    /**
-     * @dataProvider getConvertData
-     */
-    public function testConvert($expected, $input)
+    #[DataProvider('getConvertData')]
+    public function testConvert(string $expected, string $input): void
     {
         $converter = new AnsiToHtmlConverter();
         $this->assertEquals($expected, $converter->convert($input));
     }
 
-    public static function getConvertData()
+    public static function getConvertData(): array
     {
         return [
             // text is escaped

SensioLabs/AnsiConverter/Theme/AnsiTheme.php

@@ -16,7 +16,7 @@
  */
 class AnsiTheme extends Theme
 {
-    public function asArray()
+    public function asArray(): array
     {
         return [
             // normal

SensioLabs/AnsiConverter/Theme/SolarizedTheme.php

@@ -18,7 +18,7 @@
  */
 class SolarizedTheme extends Theme
 {
-    public function asArray()
+    public function asArray(): array
     {
         return [
             // normal

SensioLabs/AnsiConverter/Theme/SolarizedXTermTheme.php

@@ -18,7 +18,7 @@
  */
 class SolarizedXTermTheme extends Theme
 {
-    public function asArray()
+    public function asArray(): array
     {
         return [
             // normal

SensioLabs/AnsiConverter/Theme/Theme.php

@@ -16,7 +16,7 @@
  */
 class Theme
 {
-    public function asCss($prefix = 'ansi_color')
+    public function asCss(string $prefix = 'ansi_color'): string
     {
         $css = [];
         foreach ($this->asArray() as $name => $color) {
@@ -31,7 +31,7 @@ public function asCss($prefix = 'ansi_color')
         return implode("\n", $css);
     }
 
-    public function asArray()
+    public function asArray(): array
     {
         return [
             'black' => 'black',