Refactored project structure (Improvements).
This commit is contained in:
parent
c015d8c58b
commit
3b700f8d3c
|
@ -26,12 +26,7 @@ if (!defined('RUNTIME_DIR')) {
|
||||||
|
|
||||||
require_once(ROOT_DIR . 'vendor/autoload.php');
|
require_once(ROOT_DIR . 'vendor/autoload.php');
|
||||||
|
|
||||||
// Load configuration if present:
|
$config = new PHPCensor\Config();
|
||||||
$conf = [];
|
|
||||||
$conf['b8']['app']['namespace'] = 'PHPCensor';
|
|
||||||
$conf['b8']['app']['default_controller'] = 'Home';
|
|
||||||
|
|
||||||
$config = new PHPCensor\Config($conf);
|
|
||||||
|
|
||||||
$configFile = APP_DIR . 'config.yml';
|
$configFile = APP_DIR . 'config.yml';
|
||||||
if (file_exists($configFile)) {
|
if (file_exists($configFile)) {
|
||||||
|
|
|
@ -281,7 +281,7 @@ class Application
|
||||||
$namespace = $this->toPhpName($route['namespace']);
|
$namespace = $this->toPhpName($route['namespace']);
|
||||||
$controller = $this->toPhpName($route['controller']);
|
$controller = $this->toPhpName($route['controller']);
|
||||||
|
|
||||||
return $this->config->get('b8.app.namespace') . '\\' . $namespace . '\\' . $controller . 'Controller';
|
return 'PHPCensor\\' . $namespace . '\\' . $controller . 'Controller';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -26,11 +26,8 @@ if (!defined('RUNTIME_DIR')) {
|
||||||
|
|
||||||
require_once(ROOT_DIR . 'vendor/autoload.php');
|
require_once(ROOT_DIR . 'vendor/autoload.php');
|
||||||
|
|
||||||
$conf = [];
|
$conf = [];
|
||||||
|
$conf['php-censor']['url'] = 'http://php-censor.local';
|
||||||
$conf['b8']['app']['namespace'] = 'PHPCensor';
|
|
||||||
$conf['b8']['app']['default_controller'] = 'Home';
|
|
||||||
$conf['php-censor']['url'] = 'http://php-censor.local';
|
|
||||||
|
|
||||||
$config = new PHPCensor\Config($conf);
|
$config = new PHPCensor\Config($conf);
|
||||||
|
|
||||||
|
|
|
@ -56,13 +56,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
|
||||||
$this->mailDelivered = true;
|
$this->mailDelivered = true;
|
||||||
$self = $this;
|
$self = $this;
|
||||||
|
|
||||||
$config = new Config([
|
new Config();
|
||||||
'b8' => [
|
|
||||||
'view' => [
|
|
||||||
'path' => SRC_DIR . 'View/'
|
|
||||||
]
|
|
||||||
]
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->mockProject = $this
|
$this->mockProject = $this
|
||||||
->getMockBuilder('\PHPCensor\Model\Project')
|
->getMockBuilder('\PHPCensor\Model\Project')
|
||||||
|
|
|
@ -48,8 +48,6 @@ class PhpUnitResultTest extends \PHPUnit\Framework\TestCase
|
||||||
self::assertContains('Incomplete Test:', $output[5]['message']);
|
self::assertContains('Incomplete Test:', $output[5]['message']);
|
||||||
} catch (\PHPUnit_Framework_ExpectationFailedException $e) {
|
} catch (\PHPUnit_Framework_ExpectationFailedException $e) {
|
||||||
self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
|
self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
|
||||||
} catch (\PHPUnit\Framework\ExpectationFailedException $e) {
|
|
||||||
self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self::assertEquals(PhpUnitResult::SEVERITY_SKIPPED, $output[11]['severity']);
|
self::assertEquals(PhpUnitResult::SEVERITY_SKIPPED, $output[11]['severity']);
|
||||||
|
@ -57,8 +55,6 @@ class PhpUnitResultTest extends \PHPUnit\Framework\TestCase
|
||||||
self::assertContains('Skipped Test:', $output[11]['message']);
|
self::assertContains('Skipped Test:', $output[11]['message']);
|
||||||
} catch (\PHPUnit_Framework_ExpectationFailedException $e) {
|
} catch (\PHPUnit_Framework_ExpectationFailedException $e) {
|
||||||
self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
|
self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
|
||||||
} catch (\PHPUnit\Framework\ExpectationFailedException $e) {
|
|
||||||
self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue