Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Use the standard route parser from FastRoute #32

Merged
merged 13 commits into from
Aug 11, 2017
Merged

Use the standard route parser from FastRoute #32

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b0b7ec
Use the standard route parser from FastRoute
geerteltink Mar 22, 2017
73e330b
Rework of integrating the standard route parser from FastRoute
geerteltink Mar 23, 2017
33403ba
Add standard FastRoute tests for Uri generation
geerteltink Mar 23, 2017
8edc7e5
Fix code standard violation
geerteltink Mar 23, 2017
a423933
Fix docheaders
geerteltink Mar 23, 2017
7c04e03
Update dockblocks and comments
geerteltink Mar 23, 2017
7dd04c2
Update dockblocks and comments for hasRequiredParameters
geerteltink Mar 23, 2017
849873d
Rename required parameters to missing parameters for clarification
geerteltink Mar 25, 2017
744be0a
Add route name to the missing parameters exception
geerteltink Mar 25, 2017
2479fb0
Fix typo
geerteltink Mar 25, 2017
fc88301
Fix all typos!!!
geerteltink Mar 25, 2017
b9fed35
Fix typo and docblock formatting
geerteltink Apr 28, 2017
1ac6fd7
Improve value substitute regex
geerteltink Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/FastRouteRouter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ public function generateUri($name, array $substitutions = [], array $options = [

// No valid route was found: list minimal required parameters
throw new Exception\InvalidArgumentException(sprintf(
'Expected parameter values for at least [%s], but received [%s]',
'Route `%s` expects al least parameter values for [%s], but received [%s]',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

al -> at (typo)

$name,
implode(',', $missingParameters),
implode(',', array_keys($substitutions))
));
Expand Down
2 changes: 1 addition & 1 deletion test/FastRouteRouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ public function testGenerateUriRaisesExceptionForMissingMandatoryParameters()
$router->addRoute($route);

$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage('Expected parameter values for at least [id], but received []');
$this->expectExceptionMessage('expects al least parameter values for');

$router->generateUri('foo');
}
Expand Down
2 changes: 1 addition & 1 deletion test/UriGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function provideRouteTests()
'/test/{param}',
['id' => 'foo'],
InvalidArgumentException::class,
'Expected parameter values for at least [param], but received [id]',
'expects al least parameter values for',
],

['/te{ param }st', ['param' => 'foo'], '/tefoost', null],
Expand Down