refactor: by Rector

Author: kenjis

src/CI4Twig/Twig.php

@@ -9,6 +9,15 @@
 
 namespace Kenjis\CI4Twig;
 
+use Config\Services;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+use Twig\Extension\DebugExtension;
+use Twig\Loader\FilesystemLoader;
+use Twig\TwigFunction;
+
 class Twig
 {
     /**
@@ -26,7 +35,7 @@ class Twig
     /**
      * @var array Functions to add to Twig
      */
-    private $functions_asis = [
+    private array $functions_asis = [
         'base_url',
         'site_url',
     ];
@@ -36,7 +45,7 @@ class Twig
      *
      * @see https://twig.symfony.com/doc/3.x/advanced.html#automatic-escaping
      */
-    private $functions_safe = [
+    private array $functions_safe = [
         'form_open',
         'form_close',
         'form_error',
@@ -50,15 +59,12 @@ class Twig
     /**
      * @var bool Whether functions are added or not
      */
-    private $functions_added = false;
+    private bool $functions_added = false;
 
-    /**
-     * @var \Twig\Environment|null
-     */
-    private $twig;
+    private ?Environment $twig = null;
 
     /**
-     * @var \Twig\Loader\FilesystemLoader
+     * @var FilesystemLoader
      */
     private $loader;
 
@@ -112,13 +118,13 @@ protected function createTwig()
         }
 
         if ($this->loader === null) {
-            $this->loader = new \Twig\Loader\FilesystemLoader($this->paths);
+            $this->loader = new FilesystemLoader($this->paths);
         }
 
-        $twig = new \Twig\Environment($this->loader, $this->config);
+        $twig = new Environment($this->loader, $this->config);
 
         if ($this->config['debug']) {
-            $twig->addExtension(new \Twig\Extension\DebugExtension());
+            $twig->addExtension(new DebugExtension());
         }
 
         $this->twig = $twig;
@@ -147,9 +153,9 @@ public function addGlobal($name, $value)
      * @param string $view   Template filename without `.twig`
      * @param array  $params Array of parameters to pass to the template
      *
-     * @throws \Twig\Error\LoaderError
-     * @throws \Twig\Error\RuntimeError
-     * @throws \Twig\Error\SyntaxError
+     * @throws LoaderError
+     * @throws RuntimeError
+     * @throws SyntaxError
      */
     public function display($view, $params = [])
     {
@@ -162,9 +168,9 @@ public function display($view, $params = [])
      * @param string $view   Template filename without `.twig`
      * @param array  $params Array of parameters to pass to the template
      *
-     * @throws \Twig\Error\LoaderError
-     * @throws \Twig\Error\RuntimeError
-     * @throws \Twig\Error\SyntaxError
+     * @throws LoaderError
+     * @throws RuntimeError
+     * @throws SyntaxError
      */
     public function render($view, $params = []): string
     {
@@ -189,7 +195,7 @@ protected function addFunctions()
         foreach ($this->functions_asis as $function) {
             if (function_exists($function)) {
                 $this->twig->addFunction(
-                    new \Twig\TwigFunction(
+                    new TwigFunction(
                         $function,
                         $function
                     )
@@ -201,7 +207,7 @@ protected function addFunctions()
         foreach ($this->functions_safe as $function) {
             if (function_exists($function)) {
                 $this->twig->addFunction(
-                    new \Twig\TwigFunction(
+                    new TwigFunction(
                         $function,
                         $function,
                         ['is_safe' => ['html']]
@@ -213,7 +219,7 @@ protected function addFunctions()
         // customized functions
         if (function_exists('anchor')) {
             $this->twig->addFunction(
-                new \Twig\TwigFunction(
+                new TwigFunction(
                     'anchor',
                     [$this, 'safe_anchor'],
                     ['is_safe' => ['html']]
@@ -222,7 +228,7 @@ protected function addFunctions()
         }
 
         $this->twig->addFunction(
-            new \Twig\TwigFunction(
+            new TwigFunction(
                 'validation_list_errors',
                 [$this, 'validation_list_errors'],
                 ['is_safe' => ['html']]
@@ -256,10 +262,10 @@ public function safe_anchor(
 
     public function validation_list_errors(): string
     {
-        return \Config\Services::validation()->listErrors();
+        return Services::validation()->listErrors();
     }
 
-    public function getTwig(): \Twig\Environment
+    public function getTwig(): Environment
     {
         $this->createTwig();
 

tests/CI4Twig/ReflectionHelper.php

@@ -21,20 +21,12 @@ public static function getPrivateMethodInvoker($obj, $method)
         $ref_method->setAccessible(true);
         $obj = (gettype($obj) === 'object') ? $obj : null;
 
-        return static function () use ($obj, $ref_method) {
-            $args = func_get_args();
-
-            return $ref_method->invokeArgs($obj, $args);
-        };
+        return static fn (...$args) => $ref_method->invokeArgs($obj, $args);
     }
 
     protected static function getAccessibleRefProperty($obj, $property)
     {
-        if (is_object($obj)) {
-            $ref_class = new ReflectionObject($obj);
-        } else {
-            $ref_class = new ReflectionClass($obj);
-        }
+        $ref_class = is_object($obj) ? new ReflectionObject($obj) : new ReflectionClass($obj);
 
         $ref_property = $ref_class->getProperty($property);
         $ref_property->setAccessible(true);

tests/CI4Twig/TwigHelperTest.php

@@ -2,12 +2,15 @@
 
 namespace Kenjis\CI4Twig;
 
+use Twig\Environment;
+use Twig\Loader\ArrayLoader;
+
 /**
  * @internal
  */
 final class TwigHelperTest extends TestCase
 {
-    private $twig;
+    private Environment $twig;
 
     public static function setUpBeforeClass(): void
     {
@@ -20,7 +23,7 @@ protected function setUp(): void
     {
         $twig = new Twig();
 
-        $loader = new \Twig\Loader\ArrayLoader(
+        $loader = new ArrayLoader(
             [
                 'base_url' => '{{ base_url(\'"><s>abc</s><a name="test\') }}',
                 'site_url' => '{{ site_url(\'"><s>abc</s><a name="test\') }}',