Benzine/Core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improving test run-ability. Still need to refactor RoutesTestCase.php because it depends on Slim3 era code that no longer works.

Browse source
This commit is contained in:
Greyscale 2020-07-21 03:32:47 +02:00
parent c2ee9a2f92
commit 0d16cdffdd
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.php
View file

@ -353,7 +353,7 @@ class App
return self::Instance()->get($key); return self::Instance()->get($key);
} }
public function getApp() public function getApp() : \Slim\App
{ {
return $this->app; return $this->app;
} }

9
tests/RoutesTestCase.php
View file

@ -2,6 +2,7 @@
namespace Benzine\Tests; namespace Benzine\Tests;
use Benzine\App;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Slim\Http\Environment; use Slim\Http\Environment;
use Slim\Http\Headers; use Slim\Http\Headers;
@ -9,7 +10,7 @@ use Slim\Http\Request;
use Slim\Http\RequestBody; use Slim\Http\RequestBody;
use Slim\Http\Response; use Slim\Http\Response;
use Slim\Http\Uri; use Slim\Http\Uri;
use ⌬\Router\Router; use Benzine\Router\Router;
abstract class RoutesTestCase extends BaseTestCase abstract class RoutesTestCase extends BaseTestCase
{ {
@ -44,10 +45,10 @@ abstract class RoutesTestCase extends BaseTestCase
* @var \Slim\App $app * @var \Slim\App $app
* @var \Gone\AppCore\App $applicationInstance * @var \Gone\AppCore\App $applicationInstance
*/ */
$applicationInstance = $this->getApp(); $applicationInstance = App::Instance();
$calledClass = get_called_class(); $calledClass = get_called_class();
$app = $applicationInstance->getApp(); $slimApp = $applicationInstance->getApp();
if (defined("{$calledClass}")) { if (defined("{$calledClass}")) {
$modelName = $calledClass::MODEL_NAME; $modelName = $calledClass::MODEL_NAME;
@ -62,7 +63,7 @@ abstract class RoutesTestCase extends BaseTestCase
if (file_exists(APP_ROOT.'/src/RoutesExtra.php')) { if (file_exists(APP_ROOT.'/src/RoutesExtra.php')) {
require APP_ROOT.'/src/RoutesExtra.php'; require APP_ROOT.'/src/RoutesExtra.php';
} }
Router::Instance()->populateRoutes($app); Router::Instance()->populateRoutes($slimApp);
$headers = array_merge($this->defaultHeaders, $extraHeaders); $headers = array_merge($this->defaultHeaders, $extraHeaders);
$envArray = array_merge($this->defaultEnvironment, $headers); $envArray = array_merge($this->defaultEnvironment, $headers);