X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=vendor%2Fdrupal%2Fconsole-core%2Fsrc%2Ffunctions.php;h=fc44e158a54e47e800d85a270aee64a52067b643;hb=4e1bfbf98b844da83b18aca92ef00f11a4735806;hp=044a703185942dbf7c498d9b6e566b2de4973338;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/vendor/drupal/console-core/src/functions.php b/vendor/drupal/console-core/src/functions.php
index 044a70318..fc44e158a 100644
--- a/vendor/drupal/console-core/src/functions.php
+++ b/vendor/drupal/console-core/src/functions.php
@@ -1,5 +1,7 @@
 <?php
 
+use Webmozart\PathUtil\Path;
+
 /**
  * @param string $path
  * @return null|string
@@ -10,27 +12,13 @@ function calculateRealPath($path)
         return null;
     }
 
-    if (realpath($path)) {
+    if (strpos($path, 'phar://')===0) {
         return $path;
     }
 
-    return transformToRealPath($path);
-}
-
-/**
- * @param $path
- * @return string
- */
-function transformToRealPath($path)
-{
-    if (strpos($path, '~') === 0) {
-        $home = rtrim(getenv('HOME') ?: getenv('USERPROFILE'), '/');
-        $path = preg_replace('/~/', $home, $path, 1);
-    }
-
-    if (!(strpos($path, '/') === 0)) {
-        $path = sprintf('%s/%s', getcwd(), $path);
+    if (realpath($path)) {
+        return $path;
     }
 
-    return realpath($path);
+    return Path::canonicalize($path);
 }