diff --git a/tests/Ion_TestCase.php b/tests/Ion_TestCase.php index 0f26837..0e77495 100644 --- a/tests/Ion_TestCase.php +++ b/tests/Ion_TestCase.php @@ -16,12 +16,10 @@ namespace Aviat\Ion\Tests; +use function Aviat\Ion\_dir; + use Aura\Web\WebFactory; use Aviat\Ion\Json; -use GuzzleHttp\Client; -use GuzzleHttp\Handler\MockHandler; -use GuzzleHttp\HandlerStack; -use GuzzleHttp\Psr7\Response; use PHPUnit\Framework\TestCase; use Zend\Diactoros\ServerRequestFactory; use Zend\Diactoros\Response as HttpResponse; diff --git a/tests/JsonTest.php b/tests/JsonTest.php index f16fad6..91c4592 100644 --- a/tests/JsonTest.php +++ b/tests/JsonTest.php @@ -16,6 +16,8 @@ namespace Aviat\Ion\Tests; +use function Aviat\Ion\_dir; + use Aviat\Ion\{Json, JsonException}; class JsonTest extends Ion_TestCase { diff --git a/tests/View/HtmlViewTest.php b/tests/View/HtmlViewTest.php index 4d074fa..fe45c2f 100644 --- a/tests/View/HtmlViewTest.php +++ b/tests/View/HtmlViewTest.php @@ -16,9 +16,9 @@ namespace Aviat\Ion\Tests\View; -use Aviat\Ion\Tests\TestHtmlView; +use function Aviat\Ion\_dir; -use function _dir; +use Aviat\Ion\Tests\TestHtmlView; class HtmlViewTest extends HttpViewTest { diff --git a/tests/bootstrap.php b/tests/bootstrap.php index a1f1e4b..799b11e 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -10,30 +10,12 @@ if ($timezone === '' || $timezone === FALSE) ini_set('date.timezone', 'GMT'); } - -// ----------------------------------------------------------------------------- -// Global functions -// ----------------------------------------------------------------------------- - -/** - * Joins paths together. Variadic to take an - * arbitrary number of arguments - * - * @return string - */ -function _dir() -{ - return implode(DIRECTORY_SEPARATOR, func_get_args()); -} - // ----------------------------------------------------------------------------- // Autoloading // ----------------------------------------------------------------------------- - -require 'Ion_TestCase.php'; - // Composer autoload -require __DIR__ . '/../vendor/autoload.php'; +require realpath(__DIR__ . '/../vendor/autoload.php'); +require 'Ion_TestCase.php'; // ----------------------------------------------------------------------------- // Ini Settings