jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367185 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I39de920deeeadf9402f43cf6faa82f83512ec383
---
M composer.json
M includes/JsonSchema.php
M includes/JsonSchemaContent.php
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 1366381..55507be 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0",
+ "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/JsonSchema.php b/includes/JsonSchema.php
index 3d9cd28..8b6f7c6 100644
--- a/includes/JsonSchema.php
+++ b/includes/JsonSchema.php
@@ -76,7 +76,7 @@
} elseif ( is_string( $var ) ) {
return preg_replace( '/[^a-z0-9\-_:\.]/i', '', $var );
} else {
- throw new JsonSchemaException( 'jsonschema-idconvert',
JsonUtil::encodeForMsg( $var ) );
+ throw new JsonSchemaException( 'jsonschema-idconvert',
self::encodeForMsg( $var ) );
}
}
@@ -164,18 +164,18 @@
*/
public static function getSchemaArray( $parent ) {
$schema = [];
- $schema['type'] = JsonUtil::getType( $parent );
+ $schema['type'] = self::getType( $parent );
switch ( $schema['type'] ) {
case 'object':
$schema['properties'] = [];
foreach ( $parent as $name ) {
- $schema['properties'][$name] =
JsonUtil::getSchemaArray( $parent[$name] );
+ $schema['properties'][$name] =
self::getSchemaArray( $parent[$name] );
}
break;
case 'array':
$schema['items'] = [];
- $schema['items'][0] = JsonUtil::getSchemaArray(
$parent[0] );
+ $schema['items'][0] = self::getSchemaArray(
$parent[0] );
break;
}
diff --git a/includes/JsonSchemaContent.php b/includes/JsonSchemaContent.php
index 6fecfa9..6e82c51 100644
--- a/includes/JsonSchemaContent.php
+++ b/includes/JsonSchemaContent.php
@@ -38,7 +38,7 @@
* @return array Expanded schema object
*/
public static function expand( $schema,
- $recursionLimit =
JsonSchemaContent::DEFAULT_RECURSION_LIMIT ) {
+ $recursionLimit = self::DEFAULT_RECURSION_LIMIT ) {
return array_map( function ( $value ) use( $recursionLimit ) {
if ( is_array( $value ) && $recursionLimit > 0 ) {
if ( isset( $value['$ref'] ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/367185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39de920deeeadf9402f43cf6faa82f83512ec383
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: MaxSem <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
