Skip to content

Commit

Permalink
tests: renamed .inc to .php
Browse files Browse the repository at this point in the history
  • Loading branch information
dg committed Dec 2, 2015
1 parent 562f622 commit 7f051bf
Show file tree
Hide file tree
Showing 52 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion tests/Routers/Route.arrayParams.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route(' ? arr=<arr>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.basic.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/<action=default>/<id= \d{1,3}>');
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.camelcapsVsDash.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.closure.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$closure = function() {};
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.combinedUrlParam.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('extra<presenter>/<action>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.extraDefaultParam.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/<action>/<id \d{1,3}>/', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filter.global.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filter.query.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route(' ? action=<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filter.url.object.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$identityMap = [];
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filter.url.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filterTable.query.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route(' ? action=<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filterTable.strict.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.filterTable.url.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.firstOptionalParam.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/<action>/<id \d{1,3}>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.fooParameter.default.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('index<?.xml \.html?|\.php|>/', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.fooParameter.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('index<?.xml>/', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.fullMatchParam.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<param .+>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.longParameter.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<parameter-longer-than-32-characters>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.mandatoryAction.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<action>', 'Default:');
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.modules.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.noDefaultParams.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/<action>/<extra>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.noParams.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('index.php', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.oneWay.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/<action>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.autooptional1.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/[<action>/[<id \d{1,3}>]]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.autooptional2.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>[/<action>[/<id \d{1,3}>]]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.module.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[<module admin|image>/]<presenter>/<action>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.nested.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[<lang [a-z]{2}>[-<sub>]/]<name>[/page-<page>]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('index[.html]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.precedence.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[<one>/][<two>]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.preferred.nested1.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[!<lang [a-z]{2}>[-<sub>]/]<name>[/page-<page>]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.preferred.nested2.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[<lang [a-z]{2}>[!-<sub>]/]<name>[/page-<page>]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.preferred.nested3.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[!<lang [a-z]{2}>[-<sub>]/]<name>[/page-<page>]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.preferred.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('index[!.html]', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.optional.regexp.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('[<one [a-z]+><two [0-9]+>]', [
Expand Down
6 changes: 3 additions & 3 deletions tests/Routers/Route.inc → tests/Routers/Route.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
function testRouteIn(Nette\Application\IRouter $route, $url, $expectedPresenter = NULL, $expectedParams = NULL, $expectedUrl = NULL)
{
$url = new Nette\Http\UrlScript("http://example.com$url");
$url->appendQuery(array(
$url->appendQuery([
'test' => 'testvalue',
'presenter' => 'querypresenter',
));
]);

$httpRequest = new Nette\Http\Request($url);

Expand All @@ -38,7 +38,7 @@ function testRouteIn(Nette\Application\IRouter $route, $url, $expectedPresenter
}


function testRouteOut(Nette\Application\IRouter $route, $presenter, $params = array())
function testRouteOut(Nette\Application\IRouter $route, $presenter, $params = [])
{
$url = new Nette\Http\Url('http://example.com');
$request = new Nette\Application\Request($presenter, 'GET', $params);
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.secured.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<param>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.slash.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<param>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.type.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<id=5>');
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.urlEncoding.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<param .*>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.utf8Param.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<param č>', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.variables.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


testRouteIn(new Route('//<?%domain%>/<path>', 'Default:default'), '/abc', 'Default', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.withAbsolutePath.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('/<abspath>/', [
Expand Down
2 changes: 1 addition & 1 deletion tests/Routers/Route.withDefaultPresenterAndAction.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use Tester\Assert;

require __DIR__ . '/../bootstrap.php';

require __DIR__ . '/Route.inc';
require __DIR__ . '/Route.php';


$route = new Route('<presenter>/<action>', [
Expand Down
Loading

0 comments on commit 7f051bf

Please sign in to comment.