Update some composer dependancies

Update composer/semver from 1.4.2 to 1.5.0

https://github.com/composer/semver/releases/tag/1.5.0
https://github.com/composer/semver/compare/1.4.2...1.5.0

Update composer/spdx-licenses from 1.4.0 to 1.5.1

https://github.com/composer/spdx-licenses/compare/1.4.0...1.5.1
https://github.com/composer/spdx-licenses/releases/tag/1.5.1

Update mediawiki/codesniffer from 25.0.0 to 26.0.0

https://github.com/wikimedia/mediawiki-tools-codesniffer/releases/tag/v26.0.0
https://github.com/wikimedia/mediawiki-tools-codesniffer/compare/25.0.0...v26.0.0

Disable failing Squiz.WhiteSpace.FunctionSpacing, can be fixed in a later
commit

Change-Id: I89062c8f28bef893f054650f2e81287291ba9ca0
Depends-On: I8f55e77283f83d853ce340f5c1b7704c65e45bc4

diff --git a/.phpcs.xml b/.phpcs.xml
index a9c658a..f4567ac 100644 (file)
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -19,6 +19,7 @@
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
                <exclude name="Squiz.Scope.MethodScope.Missing" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
                <exclude name="Squiz.Scope.MethodScope.Missing" />

+               <exclude name="Squiz.WhiteSpace.FunctionSpacing" />

        </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>
        </rule>
        <rule ref="MediaWiki.NamingConventions.PrefixedGlobalFunctions">
                <properties>

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 03a42c2..45c126b 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -50,6 +50,9 @@ For notes on 1.33.x and older releases, see HISTORY.
 ==== Changed external libraries ====
 * Updated Mustache from 1.0.0 to v3.0.1.
 * Updated OOUI from v0.31.3 to v0.31.5.
 ==== Changed external libraries ====
 * Updated Mustache from 1.0.0 to v3.0.1.
 * Updated OOUI from v0.31.3 to v0.31.5.

+* Updated composer/semver from 1.4.2 to 1.5.0.
+* Updated composer/spdx-licenses from 1.4.0 to 1.5.1 (dev-only).
+* Updated mediawiki/codesniffer from 25.0.0 to 26.0.0 (dev-only).

 * …
 
 ==== Removed external libraries ====
 * …
 
 ==== Removed external libraries ====

diff --git a/composer.json b/composer.json
index a2dcaa1..647025e 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
                "wiki": "https://www.mediawiki.org/"
        },
        "require": {
                "wiki": "https://www.mediawiki.org/"
        },
        "require": {

-               "composer/semver": "1.4.2",
+               "composer/semver": "1.5.0",

                "cssjanus/cssjanus": "1.2.1",
                "ext-ctype": "*",
                "ext-fileinfo": "*",
                "cssjanus/cssjanus": "1.2.1",
                "ext-ctype": "*",
                "ext-fileinfo": "*",


@@ -59,13 +59,13 @@
        },
        "require-dev": {
                "cache/integration-tests": "0.16.0",
        },
        "require-dev": {
                "cache/integration-tests": "0.16.0",

-               "composer/spdx-licenses": "1.4.0",
+               "composer/spdx-licenses": "1.5.1",

                "giorgiosironi/eris": "^0.10.0",
                "hamcrest/hamcrest-php": "^2.0",
                "jakub-onderka/php-console-highlighter": "0.3.2",
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "justinrainbow/json-schema": "~5.2",
                "giorgiosironi/eris": "^0.10.0",
                "hamcrest/hamcrest-php": "^2.0",
                "jakub-onderka/php-console-highlighter": "0.3.2",
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "justinrainbow/json-schema": "~5.2",

-               "mediawiki/mediawiki-codesniffer": "25.0.0",
+               "mediawiki/mediawiki-codesniffer": "26.0.0",

                "monolog/monolog": "~1.22.1",
                "nikic/php-parser": "3.1.5",
                "seld/jsonlint": "1.7.1",
                "monolog/monolog": "~1.22.1",
                "nikic/php-parser": "3.1.5",
                "seld/jsonlint": "1.7.1",