Skip to content

Commit 78e46a2

Browse files
Merge branch '3.3' into 3.4
* 3.3: [3.3] More docblock fixes [2.7] More docblock fixes
2 parents 8ace430 + cf7fa1d commit 78e46a2

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

RouteCompiler.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,6 @@ private static function compilePattern(Route $route, $pattern, $isHost)
233233
/**
234234
* Determines the longest static prefix possible for a route.
235235
*
236-
* @param Route $route
237-
* @param array $tokens
238-
*
239236
* @return string The leading static part of a route's path
240237
*/
241238
private static function determineStaticPrefix(Route $route, array $tokens)

Tests/CompiledRouteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CompiledRouteTest extends TestCase
1818
{
1919
public function testAccessors()
2020
{
21-
$compiled = new CompiledRoute('prefix', 'regex', array('tokens'), array(), array(), array(), array(), array('variables'));
21+
$compiled = new CompiledRoute('prefix', 'regex', array('tokens'), array(), null, array(), array(), array('variables'));
2222
$this->assertEquals('prefix', $compiled->getStaticPrefix(), '__construct() takes a static prefix as its second argument');
2323
$this->assertEquals('regex', $compiled->getRegex(), '__construct() takes a regexp as its third argument');
2424
$this->assertEquals(array('tokens'), $compiled->getTokens(), '__construct() takes an array of tokens as its fourth argument');

0 commit comments

Comments
 (0)