From ead0498f4a3e9061005b7012513e9b5c458fc26d Mon Sep 17 00:00:00 2001
From: dyszczo <krzysiek@inspirelabs.pl>
Date: Sun, 23 Sep 2018 22:47:18 +0200
Subject: [PATCH] remove php from resolvers. Only PHP renderer can add it
---
src/Renderer/SimplePhpRenderer.php | 4 ++--
src/Resolver/DirResolver.php | 2 +-
src/Resolver/WPThemeResolver.php | 2 +-
tests/unit/Resolver/TestChainResolver.php | 4 ++--
tests/unit/Resolver/TestDirResolver.php | 2 +-
tests/unit/Resolver/TestWpThemeResolver.php | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/Renderer/SimplePhpRenderer.php b/src/Renderer/SimplePhpRenderer.php
index 5337b57..9d05084 100644
--- a/src/Renderer/SimplePhpRenderer.php
+++ b/src/Renderer/SimplePhpRenderer.php
@@ -29,7 +29,7 @@ class SimplePhpRenderer implements Renderer
/**
* @param string $template
- * @param array $params
+ * @param array|null $params
*
* @return string
*/
@@ -40,7 +40,7 @@ class SimplePhpRenderer implements Renderer
}
ob_start();
- include($this->resolver->resolve($template));
+ include($this->resolver->resolve($template . '.php'));
return ob_get_clean();
}
diff --git a/src/Resolver/DirResolver.php b/src/Resolver/DirResolver.php
index 5122631..69f1b6c 100644
--- a/src/Resolver/DirResolver.php
+++ b/src/Resolver/DirResolver.php
@@ -39,7 +39,7 @@ class DirResolver implements Resolver
public function resolve($name, Renderer $renderer = null)
{
$dir = rtrim($this->dir, '/');
- $fullName = $dir . '/' . $name . '.php';
+ $fullName = $dir . '/' . $name;
if (file_exists($fullName)) {
return $fullName;
}
diff --git a/src/Resolver/WPThemeResolver.php b/src/Resolver/WPThemeResolver.php
index 68d9a57..d95028c 100644
--- a/src/Resolver/WPThemeResolver.php
+++ b/src/Resolver/WPThemeResolver.php
@@ -40,7 +40,7 @@ class WPThemeResolver implements Resolver
{
$templateFile = locate_template(
[
- trailingslashit($this->template_base_path) . $name . '.php',
+ trailingslashit($this->template_base_path) . $name,
]
);
if ( ! $templateFile) {
diff --git a/tests/unit/Resolver/TestChainResolver.php b/tests/unit/Resolver/TestChainResolver.php
index 22f56cb..3d5d510 100644
--- a/tests/unit/Resolver/TestChainResolver.php
+++ b/tests/unit/Resolver/TestChainResolver.php
@@ -28,7 +28,7 @@ class TestChainResolver extends \PHPUnit\Framework\TestCase
->andReturn(self::RESPONSE_OF_RESOLVER);
$resolver = new ChainResolver(new NullResolver(), new NullResolver(), $validResolver);
- $this->assertEquals(self::RESPONSE_OF_RESOLVER, $resolver->resolve('whatever'));
+ $this->assertEquals(self::RESPONSE_OF_RESOLVER, $resolver->resolve('whatever.php'));
}
public function testUseFirstResolverFirst()
@@ -39,7 +39,7 @@ class TestChainResolver extends \PHPUnit\Framework\TestCase
->andReturn(self::RESPONSE_OF_RESOLVER);
$resolver = new ChainResolver($validResolver, new NullResolver(), new NullResolver());
- $this->assertEquals(self::RESPONSE_OF_RESOLVER, $resolver->resolve('whatever'));
+ $this->assertEquals(self::RESPONSE_OF_RESOLVER, $resolver->resolve('whatever.php'));
}
public function testThrowExceptionWhenBothCannotFind()
diff --git a/tests/unit/Resolver/TestDirResolver.php b/tests/unit/Resolver/TestDirResolver.php
index 04c4483..7c98760 100644
--- a/tests/unit/Resolver/TestDirResolver.php
+++ b/tests/unit/Resolver/TestDirResolver.php
@@ -5,7 +5,7 @@ use WPDesk\View\Resolver\Exception\CanNotResolve;
class TestDirResolver extends \PHPUnit\Framework\TestCase
{
- const TEMPLATE_NAME = 'some_template';
+ const TEMPLATE_NAME = 'some_template.php';
const TEMPLATE_FILE = 'some_template.php';
const TEMPLATE_SUBDIR = 'templates';
diff --git a/tests/unit/Resolver/TestWpThemeResolver.php b/tests/unit/Resolver/TestWpThemeResolver.php
index af7a08b..ddcc43c 100644
--- a/tests/unit/Resolver/TestWpThemeResolver.php
+++ b/tests/unit/Resolver/TestWpThemeResolver.php
@@ -5,7 +5,7 @@ use WPDesk\View\Resolver\Exception\CanNotResolve;
class TestThemeResolver extends \PHPUnit\Framework\TestCase
{
- const TEMPLATE_NAME = 'some_template';
+ const TEMPLATE_NAME = 'some_template.php';
const TEMPLATE_FILE = 'some_template.php';
const TEMPLATE_SUBDIR = 'templates';
--
GitLab