Skip to content

Commit 31c27d3

Browse files
Merge branch '3.4'
* 3.4: [3.4] Remove useless docblocks [3.3] More docblock fixes [2.7] More docblock fixes [TwigBridge] Fix BC break due required twig environment Random fixes Docblock fixes [DI] Fix cannot bind env var Fix some signatures in PHP-DSLs [HttpKernel] Enhance deprecation message bumped Symfony version to 3.4.0 updated VERSION for 3.4.0-BETA3 updated CHANGELOG for 3.4.0-BETA3 [SecurityBundle] Fix the datacollector to properly support decision.object being null
2 parents 63967ee + 2365c3d commit 31c27d3

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

Tests/FilesystemTest.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,9 +1089,6 @@ public function testMakePathRelative($endPath, $startPath, $expectedPath)
10891089
$this->assertEquals($expectedPath, $path);
10901090
}
10911091

1092-
/**
1093-
* @return array
1094-
*/
10951092
public function providePathsForMakePathRelative()
10961093
{
10971094
$paths = array(
@@ -1334,9 +1331,6 @@ public function testIsAbsolutePath($path, $expectedResult)
13341331
$this->assertEquals($expectedResult, $result);
13351332
}
13361333

1337-
/**
1338-
* @return array
1339-
*/
13401334
public function providePathsForIsAbsolutePath()
13411335
{
13421336
return array(

0 commit comments

Comments
 (0)