Merge pull request #34 from webimpress/improvement/import-internals

Import internal functions and constants + optimize imports

src/Extension/EscaperExtension.php

@@ -12,7 +12,6 @@
 use League\Plates\Engine;
 use League\Plates\Extension\ExtensionInterface;
 use Zend\Escaper\Escaper;
-use Zend\Escaper\Exception\InvalidArgumentException;
 
 class EscaperExtension implements ExtensionInterface
 {

src/Extension/UrlExtensionFactory.php

@@ -10,10 +10,12 @@
 namespace Zend\Expressive\Plates\Extension;
 
 use Psr\Container\ContainerInterface;
-use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Helper\ServerUrlHelper;
+use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Plates\Exception\MissingHelperException;
 
+use function sprintf;
+
 /**
  * Factory for creating a UrlExtension instance.
  */

src/PlatesEngineFactory.php

@@ -9,11 +9,19 @@
 
 namespace Zend\Expressive\Plates;
 
-use Psr\Container\ContainerInterface;
 use League\Plates\Engine as PlatesEngine;
 use League\Plates\Extension\ExtensionInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper;
 
+use function class_exists;
+use function get_class;
+use function gettype;
+use function is_array;
+use function is_object;
+use function is_string;
+use function sprintf;
+
 /**
  * Create and return a Plates engine instance.
  *

src/PlatesRenderer.php

@@ -16,6 +16,15 @@
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\Template\TemplateRendererInterface;
 
+use function get_class;
+use function gettype;
+use function is_object;
+use function is_string;
+use function sprintf;
+use function trigger_error;
+
+use const E_USER_WARNING;
+
 /**
  * Template implementation bridging league/plates
  */

src/PlatesRendererFactory.php

@@ -9,8 +9,11 @@
 
 namespace Zend\Expressive\Plates;
 
-use Psr\Container\ContainerInterface;
 use League\Plates\Engine as PlatesEngine;
+use Psr\Container\ContainerInterface;
+
+use function is_array;
+use function is_numeric;
 
 /**
  * Create and return a Plates template instance.

test/ExceptionTest.php

@@ -14,6 +14,12 @@
 use Zend\Expressive\Plates\Exception\ExceptionInterface;
 use Zend\Expressive\Template\Exception\ExceptionInterface as TemplateExceptionInterface;
 
+use function basename;
+use function glob;
+use function is_a;
+use function strrpos;
+use function substr;
+
 class ExceptionTest extends TestCase
 {
     public function testExceptionInterfaceExtendsTemplateExceptionInterface() : void

test/Extension/EscaperExtensionFactoryTest.php

@@ -14,13 +14,8 @@
 use Psr\Container\ContainerInterface;
 use Zend\Escaper\Escaper;
 use Zend\Escaper\Exception\InvalidArgumentException;
-use Zend\Expressive\Helper\ServerUrlHelper;
-use Zend\Expressive\Helper\UrlHelper;
-use Zend\Expressive\Plates\Exception\MissingHelperException;
 use Zend\Expressive\Plates\Extension\EscaperExtension;
 use Zend\Expressive\Plates\Extension\EscaperExtensionFactory;
-use Zend\Expressive\Plates\Extension\UrlExtension;
-use Zend\Expressive\Plates\Extension\UrlExtensionFactory;
 
 class EscaperExtensionFactoryTest extends TestCase
 {

test/Extension/EscaperExtensionTest.php

@@ -15,6 +15,8 @@
 use Zend\Escaper\Escaper;
 use Zend\Expressive\Plates\Extension\EscaperExtension;
 
+use function is_array;
+
 class EscaperExtensionTest extends TestCase
 {
     public function testRegistersEscaperFunctionsWithEngine()

test/Extension/UrlExtensionFactoryTest.php

@@ -9,9 +9,9 @@
 
 namespace ZendTest\Expressive\Plates\Extension;
 
-use Psr\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ProphecyInterface;
+use Psr\Container\ContainerInterface;
 use Zend\Expressive\Helper\ServerUrlHelper;
 use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Plates\Exception\MissingHelperException;

test/PlatesEngineFactoryTest.php

@@ -9,12 +9,12 @@
 
 namespace ZendTest\Expressive\Plates;
 
-use Psr\Container\ContainerInterface;
 use League\Plates\Engine as PlatesEngine;
 use League\Plates\Extension\ExtensionInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ProphecyInterface;
+use Psr\Container\ContainerInterface;
 use stdClass;
 use Zend\Expressive\Helper\ServerUrlHelper;
 use Zend\Expressive\Helper\UrlHelper;
@@ -23,6 +23,8 @@
 use Zend\Expressive\Plates\Extension\UrlExtension;
 use Zend\Expressive\Plates\PlatesEngineFactory;
 
+use function is_string;
+
 class PlatesEngineFactoryTest extends TestCase
 {
     /** @var ContainerInterface|ProphecyInterface */

test/PlatesRendererFactoryTest.php

@@ -9,20 +9,26 @@
 
 namespace ZendTest\Expressive\Plates;
 
-use Psr\Container\ContainerInterface;
 use League\Plates\Engine as PlatesEngine;
 use LogicException;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ProphecyInterface;
+use Psr\Container\ContainerInterface;
 use ReflectionProperty;
 use Zend\Expressive\Helper\ServerUrlHelper;
 use Zend\Expressive\Helper\UrlHelper;
 use Zend\Expressive\Plates\Extension\EscaperExtension;
 use Zend\Expressive\Plates\Extension\UrlExtension;
-use Zend\Expressive\Plates\PlatesRendererFactory;
 use Zend\Expressive\Plates\PlatesRenderer;
+use Zend\Expressive\Plates\PlatesRendererFactory;
 use Zend\Expressive\Template\TemplatePath;
 
+use function restore_error_handler;
+use function set_error_handler;
+use function sprintf;
+
+use const E_USER_WARNING;
+
 class PlatesRendererFactoryTest extends TestCase
 {
     /**

test/PlatesRendererTest.php

@@ -12,10 +12,22 @@
 use ArrayObject;
 use League\Plates\Engine;
 use PHPUnit\Framework\TestCase;
-use Zend\Expressive\Template\Exception;
 use Zend\Expressive\Plates\PlatesRenderer;
+use Zend\Expressive\Template\Exception;
 use Zend\Expressive\Template\TemplatePath;
 
+use function array_shift;
+use function file_get_contents;
+use function restore_error_handler;
+use function set_error_handler;
+use function sprintf;
+use function str_replace;
+use function uniqid;
+use function var_export;
+
+use const E_NOTICE;
+use const E_USER_WARNING;
+
 class PlatesRendererTest extends TestCase
 {
     /**