File: ' . Helpers::editorLink($e->sourceName, $e->sourceLine) . '
' - : '') - . ''
+ 'panel' => (preg_match('#\n|\?#', $e->sourceName)
+ ? ''
+ : ''
+ . (@is_file($e->sourceName) // @ - may trigger error
+ ? 'File: ' . Helpers::editorLink($e->sourceName, $e->sourceLine)
+ : '' . htmlspecialchars($e->sourceName . ($e->sourceLine ? ':' . $e->sourceLine : '')) . '')
+ . '
')
+ . ''
. BlueScreen::highlightLine(htmlspecialchars($e->sourceCode, ENT_IGNORE, 'UTF-8'), $e->sourceLine)
- . ''
- );
+ . '
',
+ ];
}
});
- $blueScreen->addPanel(function($e) {
+ $blueScreen->addPanel(function ($e) {
if ($e instanceof Nette\Neon\Exception && preg_match('#line (\d+)#', $e->getMessage(), $m)
&& ($trace = Helpers::findTrace($e->getTrace(), 'Nette\Neon\Decoder::decode'))
) {
- return array(
+ return [
'tab' => 'NEON',
'panel' => ($trace2 = Helpers::findTrace($e->getTrace(), 'Nette\DI\Config\Adapters\NeonAdapter::load'))
? 'File: ' . Helpers::editorLink($trace2['args'][0], $m[1]) . '
'
. BlueScreen::highlightFile($trace2['args'][0], $m[1])
- : BlueScreen::highlightPhp($trace['args'][0], $m[1])
- );
+ : BlueScreen::highlightPhp($trace['args'][0], $m[1]),
+ ];
}
});
}
diff --git a/tests/.coveralls.yml b/tests/.coveralls.yml
new file mode 100644
index 0000000..82764a3
--- /dev/null
+++ b/tests/.coveralls.yml
@@ -0,0 +1,4 @@
+# for php-coveralls
+service_name: travis-ci
+coverage_clover: coverage.xml
+json_path: coverage.json
diff --git a/tests/Bootstrap/Configurator.addServices.phpt b/tests/Bootstrap/Configurator.addServices.phpt
index 672daa8..312d703 100644
--- a/tests/Bootstrap/Configurator.addServices.phpt
+++ b/tests/Bootstrap/Configurator.addServices.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator::addServices()
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -16,7 +16,7 @@ class TestExistingService
private $scream;
- public function __construct($scream = true)
+ public function __construct($scream = TRUE)
{
$this->scream = $scream;
}
@@ -36,27 +36,27 @@ $configurator->addConfig(Tester\FileMock::create('
services:
existingService:
class: TestExistingService
- run: yes
+ tags: [run]
setup:
- run
', 'neon'));
-$existingService = new TestExistingService(false);
+$existingService = new TestExistingService(FALSE);
$newService = new stdClass();
$addServiceTwice = new stdClass();
-$configurator->addServices(array(
+$configurator->addServices([
'existingService' => $existingService,
'newService' => $newService,
'addServiceTwice' => $addServiceTwice,
-));
+]);
$addServiceTwice = new stdClass();
-$configurator->addServices(array(
+$configurator->addServices([
'addServiceTwice' => $addServiceTwice,
-));
+]);
$container = $configurator->createContainer();
diff --git a/tests/Bootstrap/Configurator.aliasNetteConfig.phpt b/tests/Bootstrap/Configurator.aliasNetteConfig.phpt
index 14479f7..6879109 100644
--- a/tests/Bootstrap/Configurator.aliasNetteConfig.phpt
+++ b/tests/Bootstrap/Configurator.aliasNetteConfig.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator aliases for nette config
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -22,7 +22,7 @@ class TestExtension extends Nette\DI\CompilerExtension
}
-test(function() {
+test(function () {
$configurator = new Configurator;
$configurator->defaultExtensions['mail'] = 'TestExtension';
$configurator->setTempDirectory(TEMP_DIR);
@@ -31,13 +31,13 @@ test(function() {
mailer:
item: 10
', 'neon'));
- $container = $configurator->createContainer();
+ $container = @$configurator->createContainer();
- Assert::same(array('item' => 10), TestExtension::$cfg);
+ Assert::same(['item' => 10], TestExtension::$cfg);
});
-Assert::exception(function() {
+Assert::exception(function () {
$configurator = new Configurator;
$configurator->defaultExtensions['database'] = 'TestExtension';
$configurator->setTempDirectory(TEMP_DIR);
@@ -50,4 +50,4 @@ Assert::exception(function() {
item: 20
', 'neon'));
$container = $configurator->createContainer();
-}, 'Nette\DeprecatedException', "You can use (deprecated) section 'nette.database' or new section 'database', but not both of them.");
+}, Nette\DeprecatedException::class, "You can use (deprecated) section 'nette.database' or new section 'database', but not both of them.");
diff --git a/tests/Bootstrap/Configurator.autowireExcluded.phpt b/tests/Bootstrap/Configurator.autowireExcluded.phpt
index a988b78..ceb56c0 100644
--- a/tests/Bootstrap/Configurator.autowireExcluded.phpt
+++ b/tests/Bootstrap/Configurator.autowireExcluded.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and autowiring blacklist
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -26,8 +26,8 @@ services:
$container = $configurator->createContainer();
-Assert::type('Foo', $container->getByType('Foo'));
+Assert::type(Foo::class, $container->getByType('Foo'));
Assert::exception(function () use ($container) {
$container->getByType('stdClass');
-}, '\Nette\DI\MissingServiceException');
+}, Nette\DI\MissingServiceException::class);
diff --git a/tests/Bootstrap/Configurator.basic.phpt b/tests/Bootstrap/Configurator.basic.phpt
index 2079b2d..49d80ab 100644
--- a/tests/Bootstrap/Configurator.basic.phpt
+++ b/tests/Bootstrap/Configurator.basic.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and createContainer.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -15,24 +15,24 @@ date_default_timezone_set('America/Los_Angeles');
$configurator = new Configurator;
$configurator->setTempDirectory(TEMP_DIR);
-$configurator->addParameters(array(
+$configurator->addParameters([
'wwwDir' => 'overwritten', // overwrites default value
'foo2' => '%foo%', // uses parameter from config file
'foo3' => '%foo%', // will be overwritten by config file
-));
-$container = $configurator->addConfig('files/configurator.basic.neon', 'production')
+]);
+$container = @$configurator->addConfig('files/configurator.basic.neon', 'production')
->createContainer();
-Assert::same( 'overwritten', $container->parameters['wwwDir'] );
-Assert::same( 'hello world', $container->parameters['foo'] );
-Assert::same( 'hello world', $container->parameters['foo2'] );
-Assert::same( 'overwritten', $container->parameters['foo3'] );
-Assert::same( 'hello', $container->parameters['bar'] );
-Assert::same( 'hello world', constant('BAR') );
-Assert::same( 'Europe/Prague', date_default_timezone_get() );
+Assert::same('overwritten', $container->parameters['wwwDir']);
+Assert::same('hello world', $container->parameters['foo']);
+Assert::same('hello world', $container->parameters['foo2']);
+Assert::same('overwritten', $container->parameters['foo3']);
+Assert::same('hello', $container->parameters['bar']);
+Assert::same('hello world', constant('BAR'));
+Assert::same('Europe/Prague', date_default_timezone_get());
-Assert::same( array(
+Assert::same([
'dsn' => 'sqlite2::memory:',
'user' => 'dbuser',
'password' => 'secret',
-), $container->parameters['database'] );
+], $container->parameters['database']);
diff --git a/tests/Bootstrap/Configurator.debugMode.phpt b/tests/Bootstrap/Configurator.debugMode.phpt
index ace2df3..2e00572 100644
--- a/tests/Bootstrap/Configurator.debugMode.phpt
+++ b/tests/Bootstrap/Configurator.debugMode.phpt
@@ -4,96 +4,96 @@
* Test: Nette\Configurator and production mode.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
-test(function(){
+test(function () {
unset($_SERVER['HTTP_X_FORWARDED_FOR']);
$_SERVER['REMOTE_ADDR'] = 'xx';
$configurator = new Configurator;
- Assert::false( $configurator->isDebugMode() );
+ Assert::false($configurator->isDebugMode());
$configurator->setDebugMode(TRUE);
- Assert::true( $configurator->isDebugMode() );
+ Assert::true($configurator->isDebugMode());
$configurator->setDebugMode(FALSE);
- Assert::false( $configurator->isDebugMode() );
+ Assert::false($configurator->isDebugMode());
$configurator->setDebugMode($_SERVER['REMOTE_ADDR']);
- Assert::true( $configurator->isDebugMode() );
+ Assert::true($configurator->isDebugMode());
});
-Assert::exception(function(){
+Assert::exception(function () {
$configurator = new Configurator;
$configurator->setDebugMode(1);
-}, 'Nette\InvalidArgumentException');
+}, Nette\InvalidArgumentException::class);
-test(function(){ // localhost
+test(function () { // localhost
unset($_SERVER['HTTP_X_FORWARDED_FOR']);
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
- Assert::true( Configurator::detectDebugMode() );
- Assert::true( Configurator::detectDebugMode('192.168.1.1') );
+ Assert::true(Configurator::detectDebugMode());
+ Assert::true(Configurator::detectDebugMode('192.168.1.1'));
$_SERVER['REMOTE_ADDR'] = '::1';
- Assert::true( Configurator::detectDebugMode() );
+ Assert::true(Configurator::detectDebugMode());
$_SERVER['REMOTE_ADDR'] = '192.168.1.1';
- Assert::false( Configurator::detectDebugMode() );
- Assert::false( Configurator::detectDebugMode('192.168.1.1.0') );
- Assert::true( Configurator::detectDebugMode('192.168.1.1') );
- Assert::true( Configurator::detectDebugMode('a,192.168.1.1,b') );
- Assert::true( Configurator::detectDebugMode('a 192.168.1.1 b') );
-
- Assert::false( Configurator::detectDebugMode(array()) );
- Assert::true( Configurator::detectDebugMode(array('192.168.1.1')) );
+ Assert::false(Configurator::detectDebugMode());
+ Assert::false(Configurator::detectDebugMode('192.168.1.1.0'));
+ Assert::true(Configurator::detectDebugMode('192.168.1.1'));
+ Assert::true(Configurator::detectDebugMode('a,192.168.1.1,b'));
+ Assert::true(Configurator::detectDebugMode('a 192.168.1.1 b'));
+
+ Assert::false(Configurator::detectDebugMode([]));
+ Assert::true(Configurator::detectDebugMode(['192.168.1.1']));
});
-test(function(){ // localhost + proxy
+test(function () { // localhost + proxy
$_SERVER['HTTP_X_FORWARDED_FOR'] = 'xx';
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
- Assert::false( Configurator::detectDebugMode() );
+ Assert::false(Configurator::detectDebugMode());
$_SERVER['REMOTE_ADDR'] = '::1';
- Assert::false( Configurator::detectDebugMode() );
+ Assert::false(Configurator::detectDebugMode());
$_SERVER['REMOTE_ADDR'] = '192.168.1.1';
- Assert::false( Configurator::detectDebugMode() );
- Assert::true( Configurator::detectDebugMode($_SERVER['REMOTE_ADDR']) );
+ Assert::false(Configurator::detectDebugMode());
+ Assert::true(Configurator::detectDebugMode($_SERVER['REMOTE_ADDR']));
});
-test(function(){ // missing $_SERVER['REMOTE_ADDR']
+test(function () { // missing $_SERVER['REMOTE_ADDR']
unset($_SERVER['HTTP_X_FORWARDED_FOR'], $_SERVER['REMOTE_ADDR']);
- Assert::false( Configurator::detectDebugMode() );
- Assert::false( Configurator::detectDebugMode('127.0.0.1') );
+ Assert::false(Configurator::detectDebugMode());
+ Assert::false(Configurator::detectDebugMode('127.0.0.1'));
- Assert::true( Configurator::detectDebugMode(php_uname('n')) );
- Assert::true( Configurator::detectDebugMode(array(php_uname('n'))) );
+ Assert::true(Configurator::detectDebugMode(php_uname('n')));
+ Assert::true(Configurator::detectDebugMode([php_uname('n')]));
});
-test(function(){ // secret
+test(function () { // secret
unset($_SERVER['HTTP_X_FORWARDED_FOR']);
$_SERVER['REMOTE_ADDR'] = '192.168.1.1';
$_COOKIE[Configurator::COOKIE_SECRET] = '*secret*';
- Assert::false( Configurator::detectDebugMode() );
- Assert::true( Configurator::detectDebugMode('192.168.1.1') );
- Assert::false( Configurator::detectDebugMode('abc@192.168.1.1') );
- Assert::true( Configurator::detectDebugMode('*secret*@192.168.1.1') );
+ Assert::false(Configurator::detectDebugMode());
+ Assert::true(Configurator::detectDebugMode('192.168.1.1'));
+ Assert::false(Configurator::detectDebugMode('abc@192.168.1.1'));
+ Assert::true(Configurator::detectDebugMode('*secret*@192.168.1.1'));
- $_COOKIE[Configurator::COOKIE_SECRET] = array('*secret*');
- Assert::false( Configurator::detectDebugMode('*secret*@192.168.1.1') );
+ $_COOKIE[Configurator::COOKIE_SECRET] = ['*secret*'];
+ Assert::false(Configurator::detectDebugMode('*secret*@192.168.1.1'));
});
diff --git a/tests/Bootstrap/Configurator.developmentContainer.phpt b/tests/Bootstrap/Configurator.developmentContainer.phpt
index 5badbd2..6183205 100644
--- a/tests/Bootstrap/Configurator.developmentContainer.phpt
+++ b/tests/Bootstrap/Configurator.developmentContainer.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and development container.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -28,46 +28,41 @@ nette:
- Nette\Bridges\HttpTracy\SessionPanel
', 'neon'));
-$container = $configurator->createContainer();
+$container = @$configurator->createContainer();
-Assert::type( 'Nette\DI\Container', $container );
+Assert::type(Nette\DI\Container::class, $container);
-Assert::same( array(
+Assert::same([
'appDir' => __DIR__,
'wwwDir' => __DIR__,
'debugMode' => TRUE,
'productionMode' => FALSE,
- 'environment' => 'development',
'consoleMode' => PHP_SAPI === 'cli',
- 'container' => array(
- 'class' => NULL,
- 'parent' => NULL,
- ),
'tempDir' => TEMP_DIR,
-), $container->parameters );
+], $container->parameters);
-Assert::true( $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\FileJournal || $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\SQLiteJournal );
-Assert::type( 'Nette\Caching\Storages\FileStorage', $container->getService('cacheStorage') );
-Assert::type( 'Nette\Http\Request', $container->getService('httpRequest') );
-Assert::type( 'Nette\Http\Response', $container->getService('httpResponse') );
-Assert::type( 'Nette\Http\Context', $container->getService('nette.httpContext') );
-Assert::type( 'Nette\Http\Session', $container->getService('session') );
-Assert::type( 'Nette\Security\User', $container->getService('user') );
-Assert::type( 'Nette\Http\UserStorage', $container->getService('nette.userStorage') );
-Assert::type( 'Nette\Application\Application', $container->getService('application') );
-Assert::type( 'Nette\Application\Routers\RouteList', $container->getService('router') );
-Assert::type( 'Nette\Application\PresenterFactory', $container->getService('nette.presenterFactory') );
-Assert::type( 'Nette\Mail\SendmailMailer', $container->getService('nette.mailer') );
-Assert::type( 'Tracy\Logger', $container->getService('tracy.logger') );
-Assert::type( 'Tracy\BlueScreen', $container->getService('tracy.blueScreen') );
-Assert::type( 'Tracy\Bar', $container->getService('tracy.bar') );
+Assert::true($container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\FileJournal || $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\SQLiteJournal);
+Assert::type(Nette\Caching\Storages\FileStorage::class, $container->getService('cacheStorage'));
+Assert::type(Nette\Http\Request::class, $container->getService('httpRequest'));
+Assert::type(Nette\Http\Response::class, $container->getService('httpResponse'));
+Assert::type(Nette\Http\Context::class, @$container->getService('nette.httpContext')); // @ service is deprecated
+Assert::type(Nette\Http\Session::class, $container->getService('session'));
+Assert::type(Nette\Security\User::class, $container->getService('user'));
+Assert::type(Nette\Http\UserStorage::class, $container->getService('nette.userStorage'));
+Assert::type(Nette\Application\Application::class, $container->getService('application'));
+Assert::type(Nette\Application\Routers\RouteList::class, $container->getService('router'));
+Assert::type(Nette\Application\PresenterFactory::class, $container->getService('nette.presenterFactory'));
+Assert::type(Nette\Mail\SendmailMailer::class, $container->getService('nette.mailer'));
+Assert::type(Tracy\Logger::class, $container->getService('tracy.logger'));
+Assert::type(Tracy\BlueScreen::class, $container->getService('tracy.blueScreen'));
+Assert::type(Tracy\Bar::class, $container->getService('tracy.bar'));
-Assert::type( 'Nette\Bridges\ApplicationLatte\ILatteFactory', $container->createService('nette.latteFactory') );
-Assert::type( 'Nette\Bridges\ApplicationLatte\TemplateFactory', $container->createService('nette.templateFactory') );
+Assert::type(Nette\Bridges\ApplicationLatte\ILatteFactory::class, $container->createService('nette.latteFactory'));
+Assert::type(Nette\Bridges\ApplicationLatte\TemplateFactory::class, $container->createService('nette.templateFactory'));
if (PHP_SAPI !== 'cli') {
$headers = headers_list();
- Assert::contains( 'X-Frame-Options: SAMEORIGIN', $headers );
- Assert::contains( 'Content-Type: text/html; charset=utf-8', $headers );
- Assert::contains( 'X-Powered-By: Nette Framework', $headers );
+ Assert::contains('X-Frame-Options: SAMEORIGIN', $headers);
+ Assert::contains('Content-Type: text/html; charset=utf-8', $headers);
+ Assert::contains('X-Powered-By: Nette Framework', $headers);
}
diff --git a/tests/Bootstrap/Configurator.inheritance1.phpt b/tests/Bootstrap/Configurator.inheritance1.phpt
index 2fe0e10..ab4e8c1 100644
--- a/tests/Bootstrap/Configurator.inheritance1.phpt
+++ b/tests/Bootstrap/Configurator.inheritance1.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and services inheritance and overwriting.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -29,13 +29,13 @@ services:
setup: # extends original setup
- $errorPresenter(Error)
', 'neon'));
-$container = $configurator->createContainer();
+$container = @$configurator->createContainer(); // @ inheritance is deprecated
-Assert::type( 'MyApp', $container->getService('application') );
-Assert::true( $container->getService('application')->catchExceptions );
-Assert::same( 'Error', $container->getService('application')->errorPresenter );
+Assert::type(MyApp::class, $container->getService('application'));
+Assert::true($container->getService('application')->catchExceptions);
+Assert::same('Error', $container->getService('application')->errorPresenter);
-Assert::type( 'MyApp', $container->getService('app2') );
-Assert::true( $container->getService('app2')->catchExceptions );
-Assert::same( 'Error', $container->getService('app2')->errorPresenter );
+Assert::type(MyApp::class, $container->getService('app2'));
+Assert::true($container->getService('app2')->catchExceptions);
+Assert::same('Error', $container->getService('app2')->errorPresenter);
diff --git a/tests/Bootstrap/Configurator.inheritance2.phpt b/tests/Bootstrap/Configurator.inheritance2.phpt
index 399449d..d779872 100644
--- a/tests/Bootstrap/Configurator.inheritance2.phpt
+++ b/tests/Bootstrap/Configurator.inheritance2.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and services inheritance and overwriting.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -30,13 +30,13 @@ services:
setup:
- $errorPresenter(Error)
', 'neon'));
-$container = $configurator->createContainer();
+$container = @$configurator->createContainer(); // @ inheritance is deprecated
-Assert::type( 'MyApp', $container->getService('application') );
-Assert::null( $container->getService('application')->catchExceptions );
-Assert::same( 'Error', $container->getService('application')->errorPresenter );
+Assert::type(MyApp::class, $container->getService('application'));
+Assert::null($container->getService('application')->catchExceptions);
+Assert::same('Error', $container->getService('application')->errorPresenter);
-Assert::type( 'MyApp', $container->getService('app2') );
-Assert::null( $container->getService('app2')->catchExceptions );
-Assert::null( $container->getService('app2')->errorPresenter );
+Assert::type(MyApp::class, $container->getService('app2'));
+Assert::null($container->getService('app2')->catchExceptions);
+Assert::null($container->getService('app2')->errorPresenter);
diff --git a/tests/Bootstrap/Configurator.inheritance3.phpt b/tests/Bootstrap/Configurator.inheritance3.phpt
index 820802d..7124457 100644
--- a/tests/Bootstrap/Configurator.inheritance3.phpt
+++ b/tests/Bootstrap/Configurator.inheritance3.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and services inheritance and overwriting.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -20,6 +20,6 @@ services:
', 'neon'));
-Assert::exception(function() use ($configurator) {
+Assert::exception(function () use ($configurator) {
$configurator->createContainer();
-}, 'Nette\DI\ServiceCreationException', "Circular reference detected for service 'application'.");
+}, Nette\DI\ServiceCreationException::class, "Circular reference detected for service 'application'.");
diff --git a/tests/Bootstrap/Configurator.inheritance4.phpt b/tests/Bootstrap/Configurator.inheritance4.phpt
index 2893321..1c2257a 100644
--- a/tests/Bootstrap/Configurator.inheritance4.phpt
+++ b/tests/Bootstrap/Configurator.inheritance4.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and services inheritance and overwriting.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -21,4 +21,4 @@ services:
$container = $configurator->createContainer();
-Assert::type( 'Nette\Application\Application', $container->getService('application') );
+Assert::type(Nette\Application\Application::class, $container->getService('application'));
diff --git a/tests/Bootstrap/Configurator.loadConfig.errors.phpt b/tests/Bootstrap/Configurator.loadConfig.errors.phpt
index ed2987b..a69e866 100644
--- a/tests/Bootstrap/Configurator.loadConfig.errors.phpt
+++ b/tests/Bootstrap/Configurator.loadConfig.errors.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and createContainer errors.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
$configurator = new Configurator;
-Assert::exception(function() use ($configurator) {
+Assert::exception(function () use ($configurator) {
$configurator->addConfig('files/missing.neon')
->createContainer();
-}, 'Nette\InvalidStateException', "Set path to temporary directory using setTempDirectory().");
+}, Nette\InvalidStateException::class, "Set path to temporary directory using setTempDirectory().");
diff --git a/tests/Bootstrap/Configurator.minimalContainer.phpt b/tests/Bootstrap/Configurator.minimalContainer.phpt
index edd98c2..1ccd461 100644
--- a/tests/Bootstrap/Configurator.minimalContainer.phpt
+++ b/tests/Bootstrap/Configurator.minimalContainer.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and minimal container.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -13,50 +13,45 @@ require __DIR__ . '/../bootstrap.php';
$configurator = new Configurator;
$configurator->setTempDirectory(TEMP_DIR);
-$configurator->addParameters(array(
+$configurator->addParameters([
'hello' => 'world',
-));
+]);
$container = $configurator->createContainer();
-Assert::type( 'Nette\DI\Container', $container );
+Assert::type(Nette\DI\Container::class, $container);
-Assert::same( array(
+Assert::same([
'appDir' => __DIR__,
'wwwDir' => __DIR__,
'debugMode' => FALSE,
'productionMode' => TRUE,
- 'environment' => 'production',
'consoleMode' => PHP_SAPI === 'cli',
- 'container' => array(
- 'class' => NULL,
- 'parent' => NULL,
- ),
'tempDir' => TEMP_DIR,
'hello' => 'world',
-), $container->parameters );
-
-Assert::true( $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\FileJournal || $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\SQLiteJournal );
-Assert::type( 'Nette\Caching\Storages\FileStorage', $container->getService('cacheStorage') );
-Assert::type( 'Nette\Http\Request', $container->getService('httpRequest') );
-Assert::type( 'Nette\Http\Response', $container->getService('httpResponse') );
-Assert::type( 'Nette\Http\Context', $container->getService('nette.httpContext') );
-Assert::type( 'Nette\Http\Session', $container->getService('session') );
-Assert::type( 'Nette\Security\User', $container->getService('user') );
-Assert::type( 'Nette\Http\UserStorage', $container->getService('nette.userStorage') );
-Assert::type( 'Nette\Application\Application', $container->getService('application') );
-Assert::type( 'Nette\Application\Routers\RouteList', $container->getService('router') );
-Assert::type( 'Nette\Application\PresenterFactory', $container->getService('nette.presenterFactory') );
-Assert::type( 'Nette\Mail\SendmailMailer', $container->getService('nette.mailer') );
-Assert::type( 'Tracy\Logger', $container->getService('tracy.logger') );
-Assert::type( 'Tracy\BlueScreen', $container->getService('tracy.blueScreen') );
-Assert::type( 'Tracy\Bar', $container->getService('tracy.bar') );
-
-Assert::type( 'Nette\Bridges\ApplicationLatte\ILatteFactory', $container->createService('nette.latteFactory') );
-Assert::type( 'Nette\Bridges\ApplicationLatte\TemplateFactory', $container->createService('nette.templateFactory') );
+], $container->parameters);
+
+Assert::true($container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\FileJournal || $container->getService('nette.cacheJournal') instanceof Nette\Caching\Storages\SQLiteJournal);
+Assert::type(Nette\Caching\Storages\FileStorage::class, $container->getService('cacheStorage'));
+Assert::type(Nette\Http\Request::class, $container->getService('httpRequest'));
+Assert::type(Nette\Http\Response::class, $container->getService('httpResponse'));
+Assert::type(Nette\Http\Context::class, @$container->getService('nette.httpContext')); // @ service is deprecated
+Assert::type(Nette\Http\Session::class, $container->getService('session'));
+Assert::type(Nette\Security\User::class, $container->getService('user'));
+Assert::type(Nette\Http\UserStorage::class, $container->getService('nette.userStorage'));
+Assert::type(Nette\Application\Application::class, $container->getService('application'));
+Assert::type(Nette\Application\Routers\RouteList::class, $container->getService('router'));
+Assert::type(Nette\Application\PresenterFactory::class, $container->getService('nette.presenterFactory'));
+Assert::type(Nette\Mail\SendmailMailer::class, $container->getService('nette.mailer'));
+Assert::type(Tracy\Logger::class, $container->getService('tracy.logger'));
+Assert::type(Tracy\BlueScreen::class, $container->getService('tracy.blueScreen'));
+Assert::type(Tracy\Bar::class, $container->getService('tracy.bar'));
+
+Assert::type(Nette\Bridges\ApplicationLatte\ILatteFactory::class, $container->createService('nette.latteFactory'));
+Assert::type(Nette\Bridges\ApplicationLatte\TemplateFactory::class, $container->createService('nette.templateFactory'));
if (PHP_SAPI !== 'cli') {
$headers = headers_list();
- Assert::contains( 'X-Frame-Options: SAMEORIGIN', $headers );
- Assert::contains( 'Content-Type: text/html; charset=utf-8', $headers );
- Assert::contains( 'X-Powered-By: Nette Framework', $headers );
+ Assert::contains('X-Frame-Options: SAMEORIGIN', $headers);
+ Assert::contains('Content-Type: text/html; charset=utf-8', $headers);
+ Assert::contains('X-Powered-By: Nette Framework', $headers);
}
diff --git a/tests/Bootstrap/Configurator.onCompile.phpt b/tests/Bootstrap/Configurator.onCompile.phpt
index 055cb29..38861e3 100644
--- a/tests/Bootstrap/Configurator.onCompile.phpt
+++ b/tests/Bootstrap/Configurator.onCompile.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator and user extension.
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -15,14 +15,14 @@ class FooExtension extends Nette\DI\CompilerExtension
{
public function loadConfiguration()
{
- Assert::same( array('foo' => 'hello'), $this->config );
+ Assert::same(['foo' => 'hello'], $this->config);
}
}
$configurator = new Configurator;
$configurator->setTempDirectory(TEMP_DIR);
-$configurator->onCompile[] = function(Configurator $configurator, Nette\DI\Compiler $compiler) {
+$configurator->onCompile[] = function (Configurator $configurator, Nette\DI\Compiler $compiler) {
$compiler->addExtension('foo', new FooExtension);
};
$configurator->addConfig(Tester\FileMock::create('
diff --git a/tests/Bootstrap/Configurator.presentersDecoration.phpt b/tests/Bootstrap/Configurator.presentersDecoration.phpt
new file mode 100644
index 0000000..4b86cc9
--- /dev/null
+++ b/tests/Bootstrap/Configurator.presentersDecoration.phpt
@@ -0,0 +1,48 @@
+setDebugMode(FALSE);
+ $configurator->setTempDirectory(TEMP_DIR);
+ $configurator->addConfig(Tester\FileMock::create('
+ parameters:
+ param: \'test\'
+ decorator:
+ BasePresenter:
+ setup:
+ - setAttr(%param%)
+ ', 'neon'));
+
+ $container = $configurator->createContainer();
+ $services = array_keys($container->findByTag('nette.presenter'), 'Presenter1');
+ Assert::count(1, $services);
+ $presenter = $container->createService($services[0]);
+ Assert::same('test', $presenter->getAttr());
+});
+
+
+test(function () {
+ $configurator = new Configurator;
+ $configurator->setDebugMode(FALSE);
+ $configurator->setTempDirectory(TEMP_DIR);
+ $configurator->addConfig(Tester\FileMock::create('
+ decorator:
+ BasePresenter:
+ tags: [test.tag]
+ ', 'neon'));
+
+ $container = $configurator->createContainer();
+ $services = $container->findByTag('test.tag');
+ Assert::count(1, $services);
+});
diff --git a/tests/Bootstrap/Configurator.robotLoader.phpt b/tests/Bootstrap/Configurator.robotLoader.phpt
index bdd9330..fd6cb54 100644
--- a/tests/Bootstrap/Configurator.robotLoader.phpt
+++ b/tests/Bootstrap/Configurator.robotLoader.phpt
@@ -4,8 +4,8 @@
* Test: Nette\Configurator::createRobotLoader()
*/
-use Nette\Configurator,
- Tester\Assert;
+use Nette\Configurator;
+use Tester\Assert;
require __DIR__ . '/../bootstrap.php';
@@ -13,13 +13,13 @@ require __DIR__ . '/../bootstrap.php';
$configurator = new Configurator;
-Assert::exception(function() use ($configurator) {
+Assert::exception(function () use ($configurator) {
$configurator->createRobotLoader();
-}, 'Nette\InvalidStateException', "Set path to temporary directory using setTempDirectory().");
+}, Nette\InvalidStateException::class, 'Set path to temporary directory using setTempDirectory().');
$configurator->setTempDirectory(TEMP_DIR);
$loader = $configurator->createRobotLoader();
-Assert::type( 'Nette\Loaders\RobotLoader', $loader );
-Assert::type( 'Nette\Caching\Storages\FileStorage', $loader->getCacheStorage() );
+Assert::type(Nette\Loaders\RobotLoader::class, $loader);
+Assert::type(Nette\Caching\Storages\FileStorage::class, $loader->getCacheStorage());
diff --git a/tests/Bootstrap/files/MyPresenter.php b/tests/Bootstrap/files/MyPresenter.php
new file mode 100644
index 0000000..36fb4f9
--- /dev/null
+++ b/tests/Bootstrap/files/MyPresenter.php
@@ -0,0 +1,20 @@
+attr;
+ }
+
+ function setAttr($attr)
+ {
+ $this->attr = $attr;
+ }
+}
+
+class Presenter1 extends BasePresenter
+{
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 270c4ae..7888ed0 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -28,7 +28,7 @@ function test(\Closure $function)
class Notes
{
- static public $notes = array();
+ static public $notes = [];
public static function add($message)
{
@@ -38,7 +38,7 @@ public static function add($message)
public static function fetch()
{
$res = self::$notes;
- self::$notes = array();
+ self::$notes = [];
return $res;
}
diff --git a/tests/php-unix.ini b/tests/php-unix.ini
new file mode 100644
index 0000000..3cdf095
--- /dev/null
+++ b/tests/php-unix.ini
@@ -0,0 +1,5 @@
+[PHP]
+;extension_dir = "./ext"
+
+[Zend]
+;zend_extension="./ext/zend_extension"
diff --git a/tests/php-win.ini b/tests/php-win.ini
new file mode 100644
index 0000000..ae0f393
--- /dev/null
+++ b/tests/php-win.ini
@@ -0,0 +1,6 @@
+[PHP]
+extension_dir = "./ext"
+extension=php_pdo_sqlite.dll
+
+[Zend]
+;zend_extension="./ext/php_xdebug-2.0.5-5.3-vc6.dll"