Mercurial > hg > cmmr2012-drupal-site
diff vendor/typo3/phar-stream-wrapper/src/Helper.php @ 5:12f9dff5fda9 tip
Update to Drupal core 8.7.1
author | Chris Cannam |
---|---|
date | Thu, 09 May 2019 15:34:47 +0100 |
parents | a9cd425dd02b |
children |
line wrap: on
line diff
--- a/vendor/typo3/phar-stream-wrapper/src/Helper.php Thu Feb 28 13:11:55 2019 +0000 +++ b/vendor/typo3/phar-stream-wrapper/src/Helper.php Thu May 09 15:34:47 2019 +0100 @@ -11,6 +11,13 @@ * The TYPO3 project - inspiring people to share! */ +/** + * Helper provides low-level tools on file name resolving. However it does not + * (and should not) maintain any runtime state information. In order to resolve + * Phar archive paths according resolvers have to be used. + * + * @see \TYPO3\PharStreamWrapper\Resolvable::resolve() + */ class Helper { /* @@ -56,12 +63,21 @@ /** * @param string $path + * @return bool + */ + public static function hasPharPrefix($path) + { + return stripos($path, 'phar://') === 0; + } + + /** + * @param string $path * @return string */ public static function removePharPrefix($path) { $path = trim($path); - if (stripos($path, 'phar://') !== 0) { + if (!static::hasPharPrefix($path)) { return $path; } return substr($path, 7); @@ -77,7 +93,7 @@ public static function normalizePath($path) { return rtrim( - static::getCanonicalPath( + static::normalizeWindowsPath( static::removePharPrefix($path) ), '/'