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

Import internal PHP functions + optimize imports

src/AuthenticationInterface.php

@@ -9,8 +9,8 @@
 
 namespace Zend\Expressive\Authentication;
 
-use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 interface AuthenticationInterface
 {

src/UserRepository/Htpasswd.php

@@ -13,6 +13,16 @@
 use Zend\Expressive\Authentication\UserInterface;
 use Zend\Expressive\Authentication\UserRepositoryInterface;
 
+use function explode;
+use function fclose;
+use function fgets;
+use function file_exists;
+use function fopen;
+use function password_verify;
+use function sprintf;
+use function strpos;
+use function trim;
+
 /**
  * Adapter for Apache htpasswd file
  * It supports only bcrypt hash password for security reason

src/UserRepository/HtpasswdFactory.php

@@ -12,6 +12,8 @@
 use Psr\Container\ContainerInterface;
 use Zend\Expressive\Authentication\Exception;
 
+use function sprintf;
+
 class HtpasswdFactory
 {
     /**

src/UserRepository/PdoDatabase.php

@@ -15,6 +15,10 @@
 use Zend\Expressive\Authentication\UserInterface;
 use Zend\Expressive\Authentication\UserRepositoryInterface;
 
+use function password_verify;
+use function sprintf;
+use function strpos;
+
 /**
  * Adapter for PDO database
  * It supports only bcrypt hash password for security reason

test/ExceptionTest.php

@@ -11,9 +11,14 @@
 
 use Generator;
 use PHPUnit\Framework\TestCase;
-use Psr\Container\ContainerExceptionInterface;
 use Zend\Expressive\Authentication\Exception\ExceptionInterface;
 
+use function basename;
+use function glob;
+use function is_a;
+use function strrpos;
+use function substr;
+
 class ExceptionTest extends TestCase
 {
     public function exception() : Generator

test/UserRepository/HtpasswdTest.php

@@ -11,8 +11,8 @@
 
 use PHPUnit\Framework\TestCase;
 use Zend\Expressive\Authentication\UserInterface;
-use Zend\Expressive\Authentication\UserRepositoryInterface;
 use Zend\Expressive\Authentication\UserRepository\Htpasswd;
+use Zend\Expressive\Authentication\UserRepositoryInterface;
 
 class HtpasswdTest extends TestCase
 {

test/UserRepository/PdoDatabaseTest.php

@@ -14,8 +14,8 @@
 use Zend\Expressive\Authentication\Exception\InvalidConfigException;
 use Zend\Expressive\Authentication\Exception\RuntimeException;
 use Zend\Expressive\Authentication\UserInterface;
-use Zend\Expressive\Authentication\UserRepositoryInterface;
 use Zend\Expressive\Authentication\UserRepository\PdoDatabase;
+use Zend\Expressive\Authentication\UserRepositoryInterface;
 
 class PdoDatabaseTest extends TestCase
 {