Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/360369 )
Change subject: Update MediaWiki CodeSniffer to version 0.9.0
......................................................................
Update MediaWiki CodeSniffer to version 0.9.0
Change-Id: I550c0894e9230d5d6a301241100efe679fabbd30
---
M Purtle.php
M composer.json
M init.mw.php
M phpcs.xml
M src/RdfWriterBase.php
M src/TurtleRdfWriter.php
M src/XmlRdfWriter.php
M tests/phpunit/RdfWriterTestBase.php
8 files changed, 28 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/purtle refs/changes/69/360369/1
diff --git a/Purtle.php b/Purtle.php
index 8733494..b52ab16 100644
--- a/Purtle.php
+++ b/Purtle.php
@@ -13,7 +13,7 @@
}
if ( defined( 'MEDIAWIKI' ) ) {
- call_user_func( function() {
+ call_user_func( function () {
require_once __DIR__ . '/init.mw.php';
} );
}
diff --git a/composer.json b/composer.json
index cd3b69d..efe3875 100644
--- a/composer.json
+++ b/composer.json
@@ -24,10 +24,10 @@
"irc": "irc://irc.freenode.net/wikimedia-dev"
},
"require": {
- "php": ">=5.5.0"
+ "php": ">=5.5.9"
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "mediawiki/mediawiki-codesniffer": "0.9.0",
"ockcyp/covers-validator": "~0.4.0",
"phpunit/phpunit": "4.8.24",
"phpmd/phpmd": "~2.3"
@@ -48,23 +48,23 @@
},
"scripts": {
"test": [
- "composer validate --no-interaction",
+ "@validate --no-interaction",
"phpunit",
- "vendor/bin/covers-validator"
+ "covers-validator"
],
"cs": [
- "composer phpcs",
- "composer phpmd"
+ "@phpcs",
+ "@phpmd"
],
"ci": [
- "composer test",
- "composer cs"
+ "@test",
+ "@cs"
],
"phpcs": [
- "vendor/bin/phpcs src/* tests/* --standard=phpcs.xml
--extensions=php -sp"
+ "phpcs -p -s"
],
"phpmd": [
- "vendor/bin/phpmd src/ text phpmd.xml"
+ "phpmd src/ text phpmd.xml"
]
}
}
diff --git a/init.mw.php b/init.mw.php
index c24474f..e892cd5 100644
--- a/init.mw.php
+++ b/init.mw.php
@@ -20,7 +20,6 @@
'license-name' => 'GPL-2.0+'
);
-
-$GLOBALS['wgHooks']['UnitTestsList'][] = function( array &$paths ) {
+$GLOBALS['wgHooks']['UnitTestsList'][] = function ( array &$paths ) {
$paths[] = __DIR__ . '/tests/phpunit';
};
diff --git a/phpcs.xml b/phpcs.xml
index 79990b6..ea66b49 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -3,6 +3,7 @@
<!-- See
https://github.com/wikimedia/mediawiki-tools-codesniffer/blob/master/MediaWiki/ruleset.xml
-->
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="Generic.Arrays.DisallowLongArraySyntax" />
+ <exclude name="MediaWiki.Commenting.FunctionComment" />
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment" />
</rule>
@@ -18,7 +19,15 @@
<rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
+ <rule
ref="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName">
+ <!-- Exclude test methods like
"testGivenInvalidInput_methodThrowsException". -->
+ <exclude-pattern>tests/phpunit/*Test*\.php</exclude-pattern>
+ </rule>
+
<rule ref="PSR1" />
+ <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
+ <exclude-pattern>Purtle\.php</exclude-pattern>
+ </rule>
<rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
<!-- Exclude test methods like
"testGivenInvalidInput_methodThrowsException". -->
<exclude-pattern>tests/phpunit/*Test*\.php</exclude-pattern>
diff --git a/src/RdfWriterBase.php b/src/RdfWriterBase.php
index 00129fc..ce53e76 100644
--- a/src/RdfWriterBase.php
+++ b/src/RdfWriterBase.php
@@ -110,8 +110,7 @@
}
$this->role = $role;
-
- $this->labeler = $labeler?: new BNodeLabeler();
+ $this->labeler = $labeler ?: new BNodeLabeler();
$this->registerShorthand( 'a', 'rdf', 'type' );
diff --git a/src/TurtleRdfWriter.php b/src/TurtleRdfWriter.php
index 84257cd..c63c281 100644
--- a/src/TurtleRdfWriter.php
+++ b/src/TurtleRdfWriter.php
@@ -43,7 +43,7 @@
$this->transitionTable[self::STATE_DOCUMENT][self::STATE_SUBJECT] = "\n";
$this->transitionTable[self::STATE_SUBJECT][self::STATE_PREDICATE] = ' ';
$this->transitionTable[self::STATE_PREDICATE][self::STATE_OBJECT] = ' ';
- $this->transitionTable[self::STATE_START][self::STATE_DOCUMENT]
= function() {
+ $this->transitionTable[self::STATE_START][self::STATE_DOCUMENT]
= function () {
$this->beginDocument();
};
}
diff --git a/src/XmlRdfWriter.php b/src/XmlRdfWriter.php
index d2b1423..6ef9673 100644
--- a/src/XmlRdfWriter.php
+++ b/src/XmlRdfWriter.php
@@ -15,16 +15,16 @@
public function __construct( $role = parent::DOCUMENT_ROLE,
BNodeLabeler $labeler = null ) {
parent::__construct( $role, $labeler );
- $this->transitionTable[self::STATE_START][self::STATE_DOCUMENT]
= function() {
+ $this->transitionTable[self::STATE_START][self::STATE_DOCUMENT]
= function () {
$this->beginDocument();
};
-
$this->transitionTable[self::STATE_DOCUMENT][self::STATE_FINISH] = function() {
+
$this->transitionTable[self::STATE_DOCUMENT][self::STATE_FINISH] = function () {
$this->finishDocument();
};
-
$this->transitionTable[self::STATE_OBJECT][self::STATE_DOCUMENT] = function() {
+
$this->transitionTable[self::STATE_OBJECT][self::STATE_DOCUMENT] = function () {
$this->finishSubject();
};
- $this->transitionTable[self::STATE_OBJECT][self::STATE_SUBJECT]
= function() {
+ $this->transitionTable[self::STATE_OBJECT][self::STATE_SUBJECT]
= function () {
$this->finishSubject();
};
}
@@ -118,7 +118,7 @@
$this->write( "<?xml version=\"1.0\"?>\n" );
// define a callback for generating namespace attributes
- $namespaceAttrCallback = function() {
+ $namespaceAttrCallback = function () {
$attr = '';
$namespaces = $this->getPrefixes();
diff --git a/tests/phpunit/RdfWriterTestBase.php
b/tests/phpunit/RdfWriterTestBase.php
index 6f03e39..7f7c527 100644
--- a/tests/phpunit/RdfWriterTestBase.php
+++ b/tests/phpunit/RdfWriterTestBase.php
@@ -205,7 +205,6 @@
$rdf = $writer->drain();
$this->assertOutputLines( 'Resources', $rdf );
-
}
public function testTexts() {
--
To view, visit https://gerrit.wikimedia.org/r/360369
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I550c0894e9230d5d6a301241100efe679fabbd30
Gerrit-PatchSet: 1
Gerrit-Project: purtle
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
