Правки кода

Elnadrion · May 8, 2024 · 9a18a73 · 9a18a73
1 parent 007610a
commit 9a18a73
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/rector.php b/rector.php
@@ -13,10 +13,15 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_82,
+        SetList::CODE_QUALITY,
         SetList::DEAD_CODE,
         SetList::TYPE_DECLARATION,
     ]);
 
+    $rectorConfig->skip([
+        \Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector::class,
+    ]);
+
     $rectorConfig->parallel();
 };
diff --git a/src/Elnadrion/Tools/Twig/BitrixLoader.php b/src/Elnadrion/Tools/Twig/BitrixLoader.php
@@ -164,8 +164,8 @@ public function normalizeName(string $name): string
             $name = preg_replace('#/{2,}#', '/', str_replace('\\', '/', $name));
         }
 
-        $isComponentPath = str_contains((string) $name, ':');
-        $isGlobalPath = str_starts_with((string) $name, '/');
+        $isComponentPath = str_contains((string)$name, ':');
+        $isGlobalPath = str_starts_with((string)$name, '/');
 
         if (($isComponentPath || $isGlobalPath) && isset(static::$normalized[ $name ])) {
             return static::$normalized[ $name ];
@@ -174,11 +174,11 @@ public function normalizeName(string $name): string
         if ($isComponentPath) {
             [$siteTemplate, $namespace, $component, $template, $file] = explode(':', (string) $name);
 
-            if (strlen($template) === 0) {
+            if (empty($template)) {
                 $template = '.default';
             }
 
-            if (strlen($file) === 0) {
+            if (empty($file)) {
                 $file = 'template';
             }
 
@@ -187,13 +187,9 @@ public function normalizeName(string $name): string
             $normalizedName = $name;
         } else {
             $lastRendered = $this->getLastRenderedTemplate();
-            if ($lastRendered) {
-                $normalizedName = dirname($lastRendered) . '/' . $name;
-            } else {
-                $normalizedName = $name;
-            }
+            $normalizedName = $lastRendered ? dirname($lastRendered) . '/' . $name : $name;
         }
 
-        return static::$normalized[ $name ] = $normalizedName;
+        return static::$normalized[$name] = $normalizedName;
     }
 }
diff --git a/src/Elnadrion/Tools/Twig/TemplateEngine.php b/src/Elnadrion/Tools/Twig/TemplateEngine.php
@@ -159,7 +159,7 @@ public static function render(
             'component' => $component,
             'templateFolder' => $templateFolder,
             'parentTemplateFolder' => $parentTemplateFolder,
-            'render' => compact('templateName', 'engine'),
+            'render' => ['templateName' => $templateName, 'engine' => $engine],
         ] + $context;
 
         echo self::getInstance()->getEngine()->render($templateName, $context);

diff --git a/src/Elnadrion/Tools/Twig/TwigCacheCleaner.php b/src/Elnadrion/Tools/Twig/TwigCacheCleaner.php
@@ -40,14 +40,14 @@ private function checkCacheEngine(): void
      */
     public function clearByName(string $name): int
     {
-        if (strlen($name) === 0) {
+        if (empty($name)) {
             throw new ArgumentException('Имя шаблона не задано');
         }
 
         $counter = 0;
 
         $templateClass = $this->engine->getTemplateClass($name);
-        if (strlen($name) === 0) {
+        if (empty($name)) {
             throw new ArgumentException("Шаблон с именем '{$name}' не найден");
         }
 

diff --git a/src/Elnadrion/Tools/Twig/TwigOptionsStorage.php b/src/Elnadrion/Tools/Twig/TwigOptionsStorage.php
@@ -23,7 +23,7 @@ public function getDefaultOptions(): array
             'debug' => false,
             'charset' => 'UTF-8',
             'cache' => $_SERVER['DOCUMENT_ROOT'] . '/bitrix/cache/elnadrion/tools.twig',
-            'auto_reload' => isset($_GET['clear_cache']) && strtoupper((string)$_GET['clear_cache']) == 'Y',
+            'auto_reload' => isset($_GET['clear_cache']) && strtoupper((string)$_GET['clear_cache']) === 'Y',
             'autoescape' => false,
             'extract_result' => false,
             'use_by_default' => false,
@@ -85,7 +85,7 @@ public function getUsedByDefault(): bool
 
     public function setExtractResult($value): TwigOptionsStorage
     {
-        $this->options['extract_result'] = !!$value;
+        $this->options['extract_result'] = (bool)$value;
         return $this;
     }
 

diff --git a/tests/RenderTest.php b/tests/RenderTest.php
@@ -52,7 +52,7 @@ public function testRenderComponent($component, $template, $additionalContext =
     {
         global $APPLICATION;
         ob_start();
-        $APPLICATION->IncludeComponent($component, $template, compact('additionalContext'));
+        $APPLICATION->IncludeComponent($component, $template, ['additionalContext' => $additionalContext]);
         $output = ob_get_clean();
 
         $this->assertSame(self::EXPECTED, $output);