diff --git a/src/Bundle/Twig/Token/WebpackTokenParser.php b/src/Bundle/Twig/Token/WebpackTokenParser.php index 9fa3145..d0205cd 100644 --- a/src/Bundle/Twig/Token/WebpackTokenParser.php +++ b/src/Bundle/Twig/Token/WebpackTokenParser.php @@ -10,6 +10,7 @@ use Hostnet\Bundle\WebpackBundle\Twig\Node\WebpackNode; use Hostnet\Bundle\WebpackBundle\Twig\TwigExtension; use Hostnet\Component\Webpack\Asset\TwigParser; +use Twig\Error\SyntaxError; use Twig\Extension\ExtensionInterface; use Twig\Loader\LoaderInterface; use Twig\Parser; @@ -78,7 +79,7 @@ public function parse(Token $token) $export_type = $stream->expect(Token::NAME_TYPE)->getValue(); if (false === \in_array($export_type, ['js', 'css', 'inline'])) { // This exception will include the template filename by itself. - throw new \Twig_Error_Syntax(sprintf( + throw new SyntaxError(sprintf( 'Expected export type "inline", "js" or "css", got "%s" at line %d.', $export_type, $lineno diff --git a/test/Bundle/Twig/Token/WebpackTokenParserTest.php b/test/Bundle/Twig/Token/WebpackTokenParserTest.php index afcf388..de23619 100644 --- a/test/Bundle/Twig/Token/WebpackTokenParserTest.php +++ b/test/Bundle/Twig/Token/WebpackTokenParserTest.php @@ -8,6 +8,7 @@ use Hostnet\Bundle\WebpackBundle\Twig\TwigExtension; use PHPUnit\Framework\TestCase; +use Twig\Loader\LoaderInterface; /** * @covers \Hostnet\Bundle\WebpackBundle\Twig\Token\WebpackTokenParser @@ -16,7 +17,7 @@ class WebpackTokenParserTest extends TestCase { public function testParser() { - $loader = $this->prophesize(\Twig_LoaderInterface::class)->reveal(); + $loader = $this->prophesize(LoaderInterface::class)->reveal(); $extension = new TwigExtension( $loader, __DIR__, diff --git a/test/Bundle/Twig/TwigExtensionTest.php b/test/Bundle/Twig/TwigExtensionTest.php index cc4d576..d7c202c 100644 --- a/test/Bundle/Twig/TwigExtensionTest.php +++ b/test/Bundle/Twig/TwigExtensionTest.php @@ -7,6 +7,7 @@ namespace Hostnet\Bundle\WebpackBundle\Twig; use PHPUnit\Framework\TestCase; +use Twig\Loader\LoaderInterface; /** * @covers \Hostnet\Bundle\WebpackBundle\Twig\TwigExtension @@ -15,7 +16,7 @@ class TwigExtensionTest extends TestCase { public function testExtension() { - $loader = $this->prophesize(\Twig_LoaderInterface::class)->reveal(); + $loader = $this->prophesize(LoaderInterface::class)->reveal(); $extension = new TwigExtension($loader, __DIR__, '/', '/bundles', '/shared.js', '/shared.css'); self::assertEquals('webpack', $extension->getName()); @@ -29,7 +30,7 @@ public function testExtension() */ public function testAssets($expected, $asset, $web_dir, $dump_path, $public_path) { - $loader = $this->prophesize(\Twig_LoaderInterface::class)->reveal(); + $loader = $this->prophesize(LoaderInterface::class)->reveal(); $extension = new TwigExtension($loader, $web_dir, $public_path, $dump_path, '', ''); self::assertEquals($expected, $extension->webpackPublic($asset)); } diff --git a/test/Component/Asset/TwigParserTest.php b/test/Component/Asset/TwigParserTest.php index 818c3a1..0c2e9a0 100644 --- a/test/Component/Asset/TwigParserTest.php +++ b/test/Component/Asset/TwigParserTest.php @@ -21,7 +21,7 @@ class TwigParserTest extends TestCase private $tracker; /** - * @var \Twig_Environment + * @var Environment */ private $twig;