jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342027 )
Change subject: Update pear/pear-core-minimal from 1.10.1 to 1.10.3 ...................................................................... Update pear/pear-core-minimal from 1.10.1 to 1.10.3 https://github.com/pear/pear-core-minimal/releases/tag/v1.10.2 https://github.com/pear/pear-core-minimal/releases/tag/v1.10.3 https://github.com/pear/pear-core-minimal/compare/v1.10.1...v1.10.3 Change-Id: Id5f6eeabf9117cc0e89bfe139aac5797e5895530 --- M composer.json M composer.lock M composer/autoload_namespaces.php M composer/autoload_static.php M composer/include_paths.php M composer/installed.json D pear/pear-core-minimal/.gitignore M pear/pear-core-minimal/composer.json D pear/pear-core-minimal/copy-from-pear-core.sh M pear/pear-core-minimal/src/PEAR.php M pear/pear-core-minimal/src/System.php 11 files changed, 64 insertions(+), 69 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.json b/composer.json index 9a8de97..39e7340 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "pear/mail_mime-decode": "1.5.5.2", "pear/net_smtp": "1.7.3", "pear/net_socket": "1.0.14", - "pear/pear-core-minimal": "1.10.1", + "pear/pear-core-minimal": "1.10.3", "pear/pear_exception": "1.0.0", "php": ">=5.5.9", "ruflin/elastica": "5.1.0", diff --git a/composer.lock b/composer.lock index a24e7c7..830d9a0 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": "f02d563e660b902386d8edbac1edb437", + "content-hash": "f0a72cf5dd6b98384d94dd3f7590ceb5", "packages": [ { "name": "composer/semver", @@ -922,20 +922,20 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.1", + "version": "v1.10.3", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git";, - "reference": "cae0f1ce0cb5bddb611b0a652d322905a65a5896" + "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/cae0f1ce0cb5bddb611b0a652d322905a65a5896";, - "reference": "cae0f1ce0cb5bddb611b0a652d322905a65a5896", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/070f0b600b2caca2501e2c9b7e553016e4b0d115";, + "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115", "shasum": "" }, "require": { - "pear/console_getopt": "~1.3", + "pear/console_getopt": "~1.4", "pear/pear_exception": "~1.0" }, "replace": { @@ -962,7 +962,7 @@ } ], "description": "Minimal set of PEAR core files to be used as composer dependency", - "time": "2015-10-17T11:41:19+00:00" + "time": "2017-02-28T16:46:11+00:00" }, { "name": "pear/pear_exception", diff --git a/composer/autoload_namespaces.php b/composer/autoload_namespaces.php index e8e85e8..82e4e70 100644 --- a/composer/autoload_namespaces.php +++ b/composer/autoload_namespaces.php @@ -16,5 +16,5 @@ 'Less' => array($vendorDir . '/oyejorge/less.php/lib'), 'Kafka\\' => array($vendorDir . '/nmred/kafka-php/src'), 'Console' => array($vendorDir . '/pear/console_getopt'), - '' => array($vendorDir . '/pear/pear-core-minimal/src', $vendorDir . '/cssjanus/cssjanus/src'), + '' => array($vendorDir . '/cssjanus/cssjanus/src', $vendorDir . '/pear/pear-core-minimal/src'), ); diff --git a/composer/autoload_static.php b/composer/autoload_static.php index 95518f4..bdb9b5f 100644 --- a/composer/autoload_static.php +++ b/composer/autoload_static.php @@ -186,8 +186,8 @@ ); public static $fallbackDirsPsr0 = array ( - 0 => __DIR__ . '/..' . '/pear/pear-core-minimal/src', - 1 => __DIR__ . '/..' . '/cssjanus/cssjanus/src', + 0 => __DIR__ . '/..' . '/cssjanus/cssjanus/src', + 1 => __DIR__ . '/..' . '/pear/pear-core-minimal/src', ); public static $classMap = array ( diff --git a/composer/include_paths.php b/composer/include_paths.php index 091254e..285bd4d 100644 --- a/composer/include_paths.php +++ b/composer/include_paths.php @@ -8,10 +8,10 @@ return array( $vendorDir . '/pear/pear_exception', $vendorDir . '/pear/console_getopt', - $vendorDir . '/pear/pear-core-minimal/src', $vendorDir . '/pear/mail_mime', $vendorDir . '/pear/mail_mime-decode', $vendorDir . '/pear/net_socket', $vendorDir . '/pear/mail', $vendorDir . '/pear/net_smtp', + $vendorDir . '/pear/pear-core-minimal/src', ); diff --git a/composer/installed.json b/composer/installed.json index c3ff0f1..389587b 100644 --- a/composer/installed.json +++ b/composer/installed.json @@ -249,52 +249,6 @@ "description": "More info available on: http://pear.php.net/package/Console_Getopt"; }, { - "name": "pear/pear-core-minimal", - "version": "v1.10.1", - "version_normalized": "1.10.1.0", - "source": { - "type": "git", - "url": "https://github.com/pear/pear-core-minimal.git";, - "reference": "cae0f1ce0cb5bddb611b0a652d322905a65a5896" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/cae0f1ce0cb5bddb611b0a652d322905a65a5896";, - "reference": "cae0f1ce0cb5bddb611b0a652d322905a65a5896", - "shasum": "" - }, - "require": { - "pear/console_getopt": "~1.3", - "pear/pear_exception": "~1.0" - }, - "replace": { - "rsky/pear-core-min": "self.version" - }, - "time": "2015-10-17T11:41:19+00:00", - "type": "library", - "installation-source": "dist", - "autoload": { - "psr-0": { - "": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/";, - "include-path": [ - "src/" - ], - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Christian Weiske", - "email": "cwei...@php.net", - "role": "Lead" - } - ], - "description": "Minimal set of PEAR core files to be used as composer dependency" - }, - { "name": "pear/mail_mime", "version": "1.10.0", "version_normalized": "1.10.0.0", @@ -2192,5 +2146,51 @@ ], "description": "Provides library of common widgets, layouts, and windows.", "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"; + }, + { + "name": "pear/pear-core-minimal", + "version": "v1.10.3", + "version_normalized": "1.10.3.0", + "source": { + "type": "git", + "url": "https://github.com/pear/pear-core-minimal.git";, + "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/070f0b600b2caca2501e2c9b7e553016e4b0d115";, + "reference": "070f0b600b2caca2501e2c9b7e553016e4b0d115", + "shasum": "" + }, + "require": { + "pear/console_getopt": "~1.4", + "pear/pear_exception": "~1.0" + }, + "replace": { + "rsky/pear-core-min": "self.version" + }, + "time": "2017-02-28T16:46:11+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/";, + "include-path": [ + "src/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cwei...@php.net", + "role": "Lead" + } + ], + "description": "Minimal set of PEAR core files to be used as composer dependency" } ] diff --git a/pear/pear-core-minimal/.gitignore b/pear/pear-core-minimal/.gitignore deleted file mode 100644 index daa30a3..0000000 --- a/pear/pear-core-minimal/.gitignore +++ /dev/null @@ -1 +0,0 @@ -README.html diff --git a/pear/pear-core-minimal/composer.json b/pear/pear-core-minimal/composer.json index c3e8e4a..d805f56 100644 --- a/pear/pear-core-minimal/composer.json +++ b/pear/pear-core-minimal/composer.json @@ -23,7 +23,7 @@ }, "type": "library", "require": { - "pear/console_getopt": "~1.3", + "pear/console_getopt": "~1.4", "pear/pear_exception": "~1.0" }, "replace": { diff --git a/pear/pear-core-minimal/copy-from-pear-core.sh b/pear/pear-core-minimal/copy-from-pear-core.sh deleted file mode 100755 index d68655b..0000000 --- a/pear/pear-core-minimal/copy-from-pear-core.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -cp ../pear-core/OS/Guess.php src/OS/Guess.php -cp ../pear-core/PEAR.php src/PEAR.php -cp ../pear-core/PEAR/ErrorStack.php src/PEAR/ErrorStack.php -cp ../pear-core/System.php src/System.php diff --git a/pear/pear-core-minimal/src/PEAR.php b/pear/pear-core-minimal/src/PEAR.php index 9914a7f..b6bb191 100644 --- a/pear/pear-core-minimal/src/PEAR.php +++ b/pear/pear-core-minimal/src/PEAR.php @@ -450,7 +450,7 @@ } /** - * This method deletes all occurences of the specified element from + * This method deletes all occurrences of the specified element from * the expected error codes stack. * * @param mixed $error_code error code that should be deleted @@ -914,7 +914,8 @@ } else { $format = $options; } - die(sprintf($format, $msg)); + printf($format, $msg); + exit($code); } if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) { diff --git a/pear/pear-core-minimal/src/System.php b/pear/pear-core-minimal/src/System.php index a61df2d..89c53e3 100644 --- a/pear/pear-core-minimal/src/System.php +++ b/pear/pear-core-minimal/src/System.php @@ -22,7 +22,7 @@ $GLOBALS['_System_temp_files'] = array(); /** -* System offers cross plattform compatible system functions +* System offers cross platform compatible system functions * * Static functions for different operations. Should work under * Unix and Windows. The names and usage has been taken from its respectively @@ -547,7 +547,7 @@ * System::find("$dir -name *.php -name *.htm*"); * System::find("$dir -maxdepth 1"); * - * Params implmented: + * Params implemented: * $dir -> Start the search at this directory * -type d -> return only directories * -type f -> return only files -- To view, visit https://gerrit.wikimedia.org/r/342027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5f6eeabf9117cc0e89bfe139aac5797e5895530 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/vendor Gerrit-Branch: master Gerrit-Owner: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Legoktm <lego...@member.fsf.org> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
