Merge pull request #7534 from kenjis/refactor-View

refactor: View

Author: kenjis

system/View/View.php

@@ -171,20 +171,27 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         // multiple views are called in a view, it won't
         // clean it unless we mean it to.
         $saveData ??= $this->saveData;
-        $fileExt                     = pathinfo($view, PATHINFO_EXTENSION);
-        $realPath                    = empty($fileExt) ? $view . '.php' : $view; // allow Views as .html, .tpl, etc (from CI3)
-        $this->renderVars['view']    = $realPath;
+
+        $fileExt = pathinfo($view, PATHINFO_EXTENSION);
+        // allow Views as .html, .tpl, etc (from CI3)
+        $this->renderVars['view'] = empty($fileExt) ? $view . '.php' : $view;
+
         $this->renderVars['options'] = $options ?? [];
 
         // Was it cached?
         if (isset($this->renderVars['options']['cache'])) {
-            $cacheName = $this->renderVars['options']['cache_name'] ?? str_replace('.php', '', $this->renderVars['view']);
+            $cacheName = $this->renderVars['options']['cache_name']
+                ?? str_replace('.php', '', $this->renderVars['view']);
             $cacheName = str_replace(['\\', '/'], '', $cacheName);
 
             $this->renderVars['cacheName'] = $cacheName;
 
             if ($output = cache($this->renderVars['cacheName'])) {
-                $this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
+                $this->logPerformance(
+                    $this->renderVars['start'],
+                    microtime(true),
+                    $this->renderVars['view']
+                );
 
                 return $output;
             }
@@ -193,7 +200,11 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
         $this->renderVars['file'] = $this->viewPath . $this->renderVars['view'];
 
         if (! is_file($this->renderVars['file'])) {
-            $this->renderVars['file'] = $this->loader->locateFile($this->renderVars['view'], 'Views', empty($fileExt) ? 'php' : $fileExt);
+            $this->renderVars['file'] = $this->loader->locateFile(
+                $this->renderVars['view'],
+                'Views',
+                empty($fileExt) ? 'php' : $fileExt
+            );
         }
 
         // locateFile will return an empty string if the file cannot be found.
@@ -233,10 +244,16 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
 
         $output = $this->decorateOutput($output);
 
-        $this->logPerformance($this->renderVars['start'], microtime(true), $this->renderVars['view']);
+        $this->logPerformance(
+            $this->renderVars['start'],
+            microtime(true),
+            $this->renderVars['view']
+        );
 
-        if (($this->debug && (! isset($options['debug']) || $options['debug'] === true))
-            && in_array(DebugToolbar::class, service('filters')->getFiltersClass()['after'], true)
+        $afterFilters = service('filters')->getFiltersClass()['after'];
+        if (
+            ($this->debug && (! isset($options['debug']) || $options['debug'] === true))
+            && in_array(DebugToolbar::class, $afterFilters, true)
         ) {
             $toolbarCollectors = config(Toolbar::class)->collectors;
 
@@ -253,7 +270,11 @@ public function render(string $view, ?array $options = null, ?bool $saveData = n
 
         // Should we cache?
         if (isset($this->renderVars['options']['cache'])) {
-            cache()->save($this->renderVars['cacheName'], $output, (int) $this->renderVars['options']['cache']);
+            cache()->save(
+                $this->renderVars['cacheName'],
+                $output,
+                (int) $this->renderVars['options']['cache']
+            );
         }
 
         $this->tempData = null;