基于Tp模板规则重新实现路径解析

NHZEX · Nov 22, 2019 · 06aa230 · 06aa230
1 parent 4444f72
commit 06aa230
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 35 deletions.
diff --git a/driver/Blade.php b/driver/Blade.php
@@ -152,10 +152,6 @@ public function parseTemplate(string $template)
                         $appName ? $appName . DIRECTORY_SEPARATOR : ''
                     );
             }
-
-            // 追加模板优先索引路径
-            $this->blade->prependLocation($path);
-            $this->blade->locationUnique();
         }
 
         $depr = $this->config['view_depr'];

diff --git a/src/BladeInstance.php b/src/BladeInstance.php
@@ -89,7 +89,8 @@ private function getResolver(): EngineResolver
     private function getViewFinder(): ViewFinderInterface
     {
         if (!$this->finder) {
-            $this->finder = new FileViewFinder(new Filesystem(), [$this->path]);
+            // $this->finder = new FileViewFinder(new Filesystem(), [$this->path]);
+            $this->finder = new TpViewFinder();
         }
 
         return $this->finder;
@@ -219,32 +220,6 @@ public function addLocation(string $location): BladeInterface
         return $this;
     }
 
-    /**
-     * 追加一个视图索引路径并设置为首选
-     *
-     * @param  string  $location
-     * @return $this
-     */
-    public function prependLocation(string $location): BladeInterface
-    {
-        $this->getViewFinder()->prependLocation($location);
-
-        return $this;
-    }
-
-    /**
-     * 移除重复的视图索引路径
-     *
-     * @return $this
-     */
-    public function locationUnique(): BladeInterface
-    {
-        $finder = $this->getViewFinder();
-        $finder->setPaths(array_unique($finder->getPaths()));
-
-        return $this;
-    }
-
     /**
      * Check if a view exists.
      *

diff --git a/src/TpViewFinder.php b/src/TpViewFinder.php
@@ -0,0 +1,95 @@
+<?php
+declare(strict_types=1);
+
+namespace HZEX\Blade;
+
+use Illuminate\View\ViewFinderInterface;
+use think\App;
+use think\View;
+use think\view\driver\Blade;
+
+class TpViewFinder implements ViewFinderInterface
+{
+
+    /**
+     * Get the fully qualified location of the view.
+     *
+     * @param string $view
+     * @return string
+     */
+    public function find($view)
+    {
+        /** @var View|Blade $view */
+        $driver = App::getInstance()->make(View::class);
+        $view = str_replace('.', DIRECTORY_SEPARATOR, $view);
+        return $driver->parseTemplate($view);
+    }
+
+    /**
+     * Add a location to the finder.
+     *
+     * @param string $location
+     * @return void
+     */
+    public function addLocation($location)
+    {
+        // TODO: Implement addLocation() method.
+    }
+
+    /**
+     * Add a namespace hint to the finder.
+     *
+     * @param string       $namespace
+     * @param string|array $hints
+     * @return void
+     */
+    public function addNamespace($namespace, $hints)
+    {
+        // TODO: Implement addNamespace() method.
+    }
+
+    /**
+     * Prepend a namespace hint to the finder.
+     *
+     * @param string       $namespace
+     * @param string|array $hints
+     * @return void
+     */
+    public function prependNamespace($namespace, $hints)
+    {
+        // TODO: Implement prependNamespace() method.
+    }
+
+    /**
+     * Replace the namespace hints for the given namespace.
+     *
+     * @param string       $namespace
+     * @param string|array $hints
+     * @return void
+     */
+    public function replaceNamespace($namespace, $hints)
+    {
+        // TODO: Implement replaceNamespace() method.
+    }
+
+    /**
+     * Add a valid view extension to the finder.
+     *
+     * @param string $extension
+     * @return void
+     */
+    public function addExtension($extension)
+    {
+        // TODO: Implement addExtension() method.
+    }
+
+    /**
+     * Flush the cache of located views.
+     *
+     * @return void
+     */
+    public function flush()
+    {
+        // TODO: Implement flush() method.
+    }
+}
diff --git a/tests/ViewBladeTest.php b/tests/ViewBladeTest.php
@@ -75,8 +75,7 @@ public function testParametersFetch()
 
     public function testAltPath()
     {
-        $this->engine->addLocation(__DIR__ . "/views/alt");
-        $result = $this->engine->render("view3");
+        $result = $this->engine->render("alt/view3");
         $this->assertSame(file_get_contents(__DIR__ . "/views/alt/view3.blade.php"), $result);
     }
 
@@ -167,7 +166,7 @@ public function testInheritance()
      */
     public function testInheritanceAltPath()
     {
-        $this->engine->addLocation(__DIR__ . "/views/alt");
+        // $this->engine->setViewDirName("views/alt");
         $result = $this->blade->fetch("view11");
         $this->assertSame(file_get_contents(__DIR__ . "/views/view11.html"), $result);
     }

diff --git a/tests/views/view11.blade.php b/tests/views/view11.blade.php
@@ -1,3 +1,3 @@
-@extends("base-alt")
+@extends("alt.base-alt")
 
 @section("title", "Inheritance!")