Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390937 )

Change subject: Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct 
RELEASE-NOTES
......................................................................

Updated phpunit/phpunit from v4.8.35 to v4.8.36 in correct RELEASE-NOTES

Change-Id: I034e234348755e6746fbd9755d070f10bf91303d
---
M RELEASE-NOTES-1.30
M RELEASE-NOTES-1.31
D composer.json
3 files changed, 2 insertions(+), 118 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/37/390937/1

diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index d92c38c..1449dab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -87,6 +87,7 @@
 * Updated OOjs from v2.0.0 to v2.1.0.
 * Updated OOUI from v0.21.1 to v0.23.0.
 * Updated QUnit from v1.23.1 to v2.4.0.
+* Updated phpunit/phpunit from v4.8.35 to v4.8.36.
 
 ==== New external libraries ====
 * The class \TestingAccessWrapper has been moved to the external library
diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 9ded68c..49bcbe4 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -24,7 +24,7 @@
 === External library changes in 1.31 ===
 
 ==== Upgraded external libraries ====
-* Updated dev dependancy phpunit/phpunit from v4.8.35 to v4.8.36.
+* …
 
 ==== New external libraries ====
 * …
diff --git a/composer.json b/composer.json
deleted file mode 100644
index 71c9398..0000000
--- a/composer.json
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-       "name": "mediawiki/core",
-       "description": "Free software wiki application developed by the 
Wikimedia Foundation and others",
-       "keywords": ["mediawiki", "wiki"],
-       "homepage": "https://www.mediawiki.org/";,
-       "authors": [
-               {
-                       "name": "MediaWiki Community",
-                       "homepage": 
"https://www.mediawiki.org/wiki/Special:Version/Credits";
-               }
-       ],
-       "license": "GPL-2.0+",
-       "support": {
-               "issues": "https://bugs.mediawiki.org/";,
-               "irc": "irc://irc.freenode.net/mediawiki",
-               "wiki": "https://www.mediawiki.org/";
-       },
-       "require": {
-               "composer/semver": "1.4.2",
-               "cssjanus/cssjanus": "1.2.0",
-               "ext-ctype": "*",
-               "ext-iconv": "*",
-               "ext-json": "*",
-               "ext-mbstring": "*",
-               "ext-xml": "*",
-               "liuggio/statsd-php-client": "1.0.18",
-               "mediawiki/at-ease": "1.1.0",
-               "oojs/oojs-ui": "0.24.2",
-               "oyejorge/less.php": "1.7.0.14",
-               "php": ">=5.5.9",
-               "psr/log": "1.0.2",
-               "wikimedia/assert": "0.2.2",
-               "wikimedia/base-convert": "1.0.1",
-               "wikimedia/cdb": "1.4.1",
-               "wikimedia/cldr-plural-rule-parser": "1.0.0",
-               "wikimedia/composer-merge-plugin": "1.4.1",
-               "wikimedia/html-formatter": "1.0.1",
-               "wikimedia/ip-set": "1.1.0",
-               "wikimedia/php-session-serializer": "1.0.4",
-               "wikimedia/purtle": "1.0.6",
-               "wikimedia/relpath": "2.0.0",
-               "wikimedia/remex-html": "1.0.1",
-               "wikimedia/running-stat": "1.1.0",
-               "wikimedia/scoped-callback": "1.0.0",
-               "wikimedia/utfnormal": "1.1.0",
-               "wikimedia/timestamp": "1.0.0",
-               "wikimedia/wait-condition-loop": "1.0.1",
-               "wikimedia/wrappedstring": "2.2.0",
-               "zordius/lightncandy": "0.23"
-       },
-       "require-dev": {
-               "composer/spdx-licenses": "1.1.4",
-               "hamcrest/hamcrest-php": "^2.0",
-               "jakub-onderka/php-parallel-lint": "0.9.2",
-               "jetbrains/phpstorm-stubs": 
"dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
-               "justinrainbow/json-schema": "~5.2",
-               "mediawiki/mediawiki-codesniffer": "14.1.0",
-               "monolog/monolog": "~1.22.1",
-               "nikic/php-parser": "2.1.0",
-               "nmred/kafka-php": "0.1.5",
-               "phpunit/phpunit": "4.8.36",
-               "psy/psysh": "0.8.11",
-               "wikimedia/avro": "1.7.7",
-               "wikimedia/testing-access-wrapper": "~1.0",
-               "wmde/hamcrest-html-matchers": "^0.1.0"
-       },
-       "suggest": {
-               "ext-apc": "Local data and opcode cache",
-               "ext-curl": "Improved http communication abilities",
-               "ext-fileinfo": "Improved mime magic detection",
-               "ext-intl": "ICU integration",
-               "ext-wikidiff2": "Diff accelerator",
-               "monolog/monolog": "Flexible debug logging system",
-               "nmred/kafka-php": "Send debug log events to kafka",
-               "pear/mail": "Mail sending support",
-               "pear/mail_mime": "Mail sending support",
-               "pear/mail_mime-decode": "Mail sending support",
-               "wikimedia/avro": "Binary serialization format used with kafka"
-       },
-       "autoload": {
-               "psr-0": {
-                       "ComposerHookHandler": "includes/composer"
-               },
-               "files": [
-                       "includes/compat/Timestamp.php"
-               ]
-       },
-       "autoload-dev": {
-               "files": [
-                       "vendor/hamcrest/hamcrest-php/hamcrest/Hamcrest.php",
-                       "vendor/wmde/hamcrest-html-matchers/src/functions.php"
-               ]
-       },
-       "scripts": {
-               "lint": "parallel-lint --exclude vendor",
-               "phpcs": "phpcs -p -s",
-               "fix": "phpcbf",
-               "pre-install-cmd": "ComposerHookHandler::onPreInstall",
-               "pre-update-cmd": "ComposerHookHandler::onPreUpdate",
-               "test": [
-                       "composer lint",
-                       "composer phpcs"
-               ]
-       },
-       "config": {
-               "optimize-autoloader": true,
-               "prepend-autoloader": false
-       },
-       "extra": {
-               "merge-plugin": {
-                       "include": [
-                               "composer.local.json"
-                       ],
-                       "merge-dev": false
-               }
-       }
-}

-- 
To view, visit https://gerrit.wikimedia.org/r/390937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I034e234348755e6746fbd9755d070f10bf91303d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to