Skip to content

Commit 0c9ed72

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: (28 commits) [Process] Use stream based storage to avoid memory issues Fix upgrade guides concerning erroneous removal of assets helper [Process] Remove a misleading comment Fix markdown typo ChooseBaseUrl should return an index [Form] ChoiceType: Fix a notice when 'choices' normalizer is replaced Improve the phpdoc of SplFileInfo methods [Process] Use stream based storage to avoid memory issues [FrameworkBundle] Don't log twice with the error handler Remove useless is_object condition [Process] Fix typo, no arguments needed anymore [Serializer] Introduce constants for context keys Fixed the documentation of VoterInterface::supportsAttribute Fixed Bootstrap form theme form "reset" buttons Remove useless duplicated tests [FrameworkBundle] Optimize framework extension tests synchronize 2.7 and 3.0 upgrade files fix merge 2.3 into 2.7 for SecureRandom dependency Use is_subclass_of instead of reflection Use is_subclass_of instead of Reflection when possible ...
2 parents c90fabd + 5fdca77 commit 0c9ed72

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

SplFileInfo.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public function __construct($file, $relativePath, $relativePathname)
3838
/**
3939
* Returns the relative path.
4040
*
41+
* This path does not contain the file name.
42+
*
4143
* @return string the relative path
4244
*/
4345
public function getRelativePath()
@@ -48,6 +50,8 @@ public function getRelativePath()
4850
/**
4951
* Returns the relative path name.
5052
*
53+
* This path contains the file name.
54+
*
5155
* @return string the relative path name
5256
*/
5357
public function getRelativePathname()

0 commit comments

Comments
 (0)