Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368519 )
Change subject: Update wikimedia/relpath from 1.0.3 -> 2.0.0
......................................................................
Update wikimedia/relpath from 1.0.3 -> 2.0.0
Change-Id: I98eb809ff72c4d09bfbb89a9dad9bc7094868240
Depends-On: I4111af30dfbfe2c72d52325bbd1923773e3b4202
---
M composer.json
M composer.lock
M composer/autoload_files.php
M composer/autoload_static.php
M composer/installed.json
M wikimedia/relpath/src/RelPath.php
6 files changed, 65 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/19/368519/1
diff --git a/composer.json b/composer.json
index 767763d..8410b2d 100644
--- a/composer.json
+++ b/composer.json
@@ -72,7 +72,7 @@
"wikimedia/ip-set": "1.1.0",
"wikimedia/php-session-serializer": "1.0.4",
"wikimedia/purtle": "1.0.6",
- "wikimedia/relpath": "1.0.3",
+ "wikimedia/relpath": "2.0.0",
"wikimedia/remex-html": "1.0.1",
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
diff --git a/composer.lock b/composer.lock
index 1ee12bd..f2711f6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "content-hash": "8157e60908252c7c0a6af8e5eb5f7ff4",
+ "content-hash": "d3e0811f4f6f8eb8bd96e36bd53702ea",
"packages": [
{
"name": "composer/semver",
@@ -1839,20 +1839,20 @@
},
{
"name": "wikimedia/relpath",
- "version": "1.0.3",
+ "version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/RelPath.git";,
- "reference": "ee38e19f3b059e5cec8863b03e35a451b8f35106"
+ "reference": "b0eeb17d31e4cde22dea0932dfb920a71a167c33"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/RelPath/zipball/ee38e19f3b059e5cec8863b03e35a451b8f35106";,
- "reference": "ee38e19f3b059e5cec8863b03e35a451b8f35106",
+ "url":
"https://api.github.com/repos/wikimedia/RelPath/zipball/b0eeb17d31e4cde22dea0932dfb920a71a167c33";,
+ "reference": "b0eeb17d31e4cde22dea0932dfb920a71a167c33",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.5.9"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.0.0",
@@ -1877,7 +1877,7 @@
],
"description": "Compute a relative filepath between two paths.",
"homepage": "https://www.mediawiki.org/wiki/RelPath";,
- "time": "2015-09-29T21:17:03+00:00"
+ "time": "2017-07-28T21:20:05+00:00"
},
{
"name": "wikimedia/remex-html",
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index f874be0..92f8179 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -8,7 +8,7 @@
return array(
'a24b5daa493ecb5e767c7d1592a8da36' => $vendorDir .
'/mediawiki/at-ease/src/Functions.php',
'c3f7f0e81464740a933532e81fa26cc7' => $vendorDir .
'/wikimedia/base-convert/src/Functions.php',
- 'd55c27a601de788b19a09b7d057d07ae' => $vendorDir .
'/wikimedia/relpath/src/RelPath.php',
'c50606d667a3fde2b80a955639479d3d' => $vendorDir .
'/wikimedia/timestamp/src/defines.php',
'04c6c5c2f7095ccf6c481d3e53e1776f' => $vendorDir .
'/mustangostang/spyc/Spyc.php',
+ 'd55c27a601de788b19a09b7d057d07ae' => $vendorDir .
'/wikimedia/relpath/src/RelPath.php',
);
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 7c805d9..52d715c 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -9,9 +9,9 @@
public static $files = array (
'a24b5daa493ecb5e767c7d1592a8da36' => __DIR__ . '/..' .
'/mediawiki/at-ease/src/Functions.php',
'c3f7f0e81464740a933532e81fa26cc7' => __DIR__ . '/..' .
'/wikimedia/base-convert/src/Functions.php',
- 'd55c27a601de788b19a09b7d057d07ae' => __DIR__ . '/..' .
'/wikimedia/relpath/src/RelPath.php',
'c50606d667a3fde2b80a955639479d3d' => __DIR__ . '/..' .
'/wikimedia/timestamp/src/defines.php',
'04c6c5c2f7095ccf6c481d3e53e1776f' => __DIR__ . '/..' .
'/mustangostang/spyc/Spyc.php',
+ 'd55c27a601de788b19a09b7d057d07ae' => __DIR__ . '/..' .
'/wikimedia/relpath/src/RelPath.php',
);
public static $prefixLengthsPsr4 = array (
diff --git a/composer/installed.json b/composer/installed.json
index 7279b8c..36c3a06 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -511,50 +511,6 @@
"homepage": "https://www.mediawiki.org/wiki/CLDRPluralRuleParser";
},
{
- "name": "wikimedia/relpath",
- "version": "1.0.3",
- "version_normalized": "1.0.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/RelPath.git";,
- "reference": "ee38e19f3b059e5cec8863b03e35a451b8f35106"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/RelPath/zipball/ee38e19f3b059e5cec8863b03e35a451b8f35106";,
- "reference": "ee38e19f3b059e5cec8863b03e35a451b8f35106",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "^0.9.0.0",
- "mediawiki/mediawiki-codesniffer": "^0.4.0.0",
- "phpunit/phpunit": "^4.8.9.0"
- },
- "time": "2015-09-29T21:17:03+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "src/RelPath.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ori Livneh",
- "email": "o...@wikimedia.org"
- }
- ],
- "description": "Compute a relative filepath between two paths.",
- "homepage": "https://www.mediawiki.org/wiki/RelPath";
- },
- {
"name": "wikimedia/running-stat",
"version": "v1.1.0",
"version_normalized": "1.1.0.0",
@@ -2404,5 +2360,49 @@
"json",
"schema"
]
+ },
+ {
+ "name": "wikimedia/relpath",
+ "version": "2.0.0",
+ "version_normalized": "2.0.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wikimedia/RelPath.git";,
+ "reference": "b0eeb17d31e4cde22dea0932dfb920a71a167c33"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/RelPath/zipball/b0eeb17d31e4cde22dea0932dfb920a71a167c33";,
+ "reference": "b0eeb17d31e4cde22dea0932dfb920a71a167c33",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.9"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "^0.9.0.0",
+ "mediawiki/mediawiki-codesniffer": "^0.4.0.0",
+ "phpunit/phpunit": "^4.8.9.0"
+ },
+ "time": "2017-07-28T21:20:05+00:00",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "src/RelPath.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Ori Livneh",
+ "email": "o...@wikimedia.org"
+ }
+ ],
+ "description": "Compute a relative filepath between two paths.",
+ "homepage": "https://www.mediawiki.org/wiki/RelPath";
}
]
diff --git a/wikimedia/relpath/src/RelPath.php
b/wikimedia/relpath/src/RelPath.php
index 055f468..62b5bbe 100644
--- a/wikimedia/relpath/src/RelPath.php
+++ b/wikimedia/relpath/src/RelPath.php
@@ -38,6 +38,14 @@
while ( true ) {
$cur = dirname( $path );
+ if ( $cur[0] === DIRECTORY_SEPARATOR ) {
+ // dirname() on Windows sometimes returns a leading
backslash, but other
+ // times retains the leading forward slash. Slashes
other than the leading one
+ // are returned as-is, and therefore do not need to be
touched.
+ // Furthermore, don't break on *nix where \ is allowed
in file/directory names.
+ $cur[0] = '/';
+ }
+
if ( $cur === $path || ( $cur === '.' && basename( $path ) ===
$path ) ) {
break;
}
@@ -69,12 +77,14 @@
* @param string $path File path.
* @param string $start Start directory. Optional; if not specified, the
current
* working directory will be used.
- * @return array|bool Array of path components or false if file does not exist.
+ * @return string|bool Relative path, or false if input was invalid.
*/
function getRelativePath( $path, $start = null ) {
if ( $start === null ) {
+ // @codeCoverageIgnoreStart
$start = getcwd();
}
+ // @codeCoverageIgnoreEnd
if ( substr( $path, 0, 1 ) !== '/' || substr( $start, 0, 1 ) !== '/' ) {
return false;
--
To view, visit https://gerrit.wikimedia.org/r/368519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98eb809ff72c4d09bfbb89a9dad9bc7094868240
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
