diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Unit/Middleware/ErrorHandlerTest.php | 2 | ||||
| -rw-r--r-- | tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php | 4 | ||||
| -rw-r--r-- | tests/Unit/Renderer/Twig/Extensions/TranslationTest.php | 25 | ||||
| -rw-r--r-- | tests/Unit/Renderer/TwigEngineTest.php | 4 | ||||
| -rw-r--r-- | tests/Unit/Renderer/TwigServiceProviderTest.php | 21 |
5 files changed, 21 insertions, 35 deletions
diff --git a/tests/Unit/Middleware/ErrorHandlerTest.php b/tests/Unit/Middleware/ErrorHandlerTest.php index 6ae604e0..ef2f7be0 100644 --- a/tests/Unit/Middleware/ErrorHandlerTest.php +++ b/tests/Unit/Middleware/ErrorHandlerTest.php @@ -19,7 +19,7 @@ use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage; -use Twig_LoaderInterface as TwigLoader; +use Twig\Loader\LoaderInterface as TwigLoader; class ErrorHandlerTest extends TestCase { diff --git a/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php b/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php index 921a06a3..3d7cea12 100644 --- a/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php +++ b/tests/Unit/Renderer/Twig/Extensions/ExtensionTest.php @@ -6,8 +6,8 @@ use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use Exception; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use Twig_Function as TwigFunction; -use Twig_Node as TwigNode; +use Twig\TwigFunction; +use Twig\Node\Node as TwigNode; abstract class ExtensionTest extends TestCase { diff --git a/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php b/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php index 0b055c44..3b4b05c6 100644 --- a/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php +++ b/tests/Unit/Renderer/Twig/Extensions/TranslationTest.php @@ -5,7 +5,6 @@ namespace Engelsystem\Test\Unit\Renderer\Twig\Extensions; use Engelsystem\Helpers\Translation\Translator; use Engelsystem\Renderer\Twig\Extensions\Translation; use PHPUnit\Framework\MockObject\MockObject; -use Twig_Extensions_TokenParser_Trans as TranslationTokenParser; class TranslationTest extends ExtensionTest { @@ -17,10 +16,8 @@ class TranslationTest extends ExtensionTest { /** @var Translator|MockObject $translator */ $translator = $this->createMock(Translator::class); - /** @var TranslationTokenParser|MockObject $parser */ - $parser = $this->createMock(TranslationTokenParser::class); - $extension = new Translation($translator, $parser); + $extension = new Translation($translator); $filters = $extension->getFilters(); $this->assertExtensionExists('trans', [$translator, 'translate'], $filters); @@ -33,29 +30,11 @@ class TranslationTest extends ExtensionTest { /** @var Translator|MockObject $translator */ $translator = $this->createMock(Translator::class); - /** @var TranslationTokenParser|MockObject $parser */ - $parser = $this->createMock(TranslationTokenParser::class); - $extension = new Translation($translator, $parser); + $extension = new Translation($translator); $functions = $extension->getFunctions(); $this->assertExtensionExists('__', [$translator, 'translate'], $functions); $this->assertExtensionExists('_e', [$translator, 'translatePlural'], $functions); } - - /** - * @covers \Engelsystem\Renderer\Twig\Extensions\Translation::getTokenParsers - */ - public function testGetTokenParsers() - { - /** @var Translator|MockObject $translator */ - $translator = $this->createMock(Translator::class); - /** @var TranslationTokenParser|MockObject $parser */ - $parser = $this->createMock(TranslationTokenParser::class); - - $extension = new Translation($translator, $parser); - $tokenParsers = $extension->getTokenParsers(); - - $this->assertTokenParserExists($parser, $tokenParsers); - } } diff --git a/tests/Unit/Renderer/TwigEngineTest.php b/tests/Unit/Renderer/TwigEngineTest.php index 5e5e59d9..8798d0ff 100644 --- a/tests/Unit/Renderer/TwigEngineTest.php +++ b/tests/Unit/Renderer/TwigEngineTest.php @@ -5,8 +5,8 @@ namespace Engelsystem\Test\Unit\Renderer; use Engelsystem\Renderer\TwigEngine; use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; -use Twig_Environment as Twig; -use Twig_LoaderInterface as LoaderInterface; +use Twig\Environment as Twig; +use Twig\Loader\LoaderInterface as LoaderInterface; class TwigEngineTest extends TestCase { diff --git a/tests/Unit/Renderer/TwigServiceProviderTest.php b/tests/Unit/Renderer/TwigServiceProviderTest.php index cd071349..3336e015 100644 --- a/tests/Unit/Renderer/TwigServiceProviderTest.php +++ b/tests/Unit/Renderer/TwigServiceProviderTest.php @@ -11,10 +11,11 @@ use PHPUnit\Framework\MockObject\MockObject; use ReflectionClass as Reflection; use ReflectionException; use stdClass; -use Twig_Environment as Twig; -use Twig_Extension_Core as TwigCore; -use Twig_ExtensionInterface as ExtensionInterface; -use Twig_LoaderInterface as TwigLoaderInterface; +use Twig\Environment as Twig; +use Twig\Extension\AbstractExtension; +use Twig\Extension\CoreExtension as TwigCore; +use Twig\Extension\ExtensionInterface as ExtensionInterface; +use Twig\Loader\LoaderInterface as TwigLoaderInterface; class TwigServiceProviderTest extends ServiceProviderTest { @@ -103,9 +104,15 @@ class TwigServiceProviderTest extends ServiceProviderTest /** @var Config|MockObject $config */ $config = $this->createMock(Config::class); /** @var TwigCore|MockObject $twigCore */ - $twigCore = $this->getMockBuilder(stdClass::class) - ->addMethods(['setTimezone']) - ->getMock(); + $twigCore = $this->getMockForAbstractClass( + AbstractExtension::class, + [], + '', + true, + true, + true, + ['setTimezone'] + ); $app = $this->getApp(['make', 'instance', 'tag', 'get']); |