jenkins-bot has submitted this change and it was merged.
Change subject: Add composer.json with phplint, also fix two files with
incorrect paths
......................................................................
Add composer.json with phplint, also fix two files with incorrect paths
Also fix path to LintYaml.php in composer.json
Also correct path for
$sql = file_get_contents( __DIR__ .
'/../../../../vendor/wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sqlite.sql'
); ->
$sql = file_get_contents( __DIR__ .
'/../../../../vendor/wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sql'
);
Change-Id: I10758296bfccbb180825734452354b6bf401c7ab
---
M composer.json
M composer.lock
M tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
M tests/phpunit/LintYaml.php
4 files changed, 63 insertions(+), 9 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 53cce13..ff07415 100644
--- a/composer.json
+++ b/composer.json
@@ -34,6 +34,9 @@
"symfony/yaml": "^2.8",
"wikimedia/smash-pig": "dev-master"
},
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2"
+ },
"repositories": [
{
"type": "vcs",
@@ -49,6 +52,9 @@
"prepend-autoloader": false
},
"scripts": {
- "test": "php tests/LintYaml.php"
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "php tests/phpunit/LintYaml.php"
+ ]
}
}
diff --git a/composer.lock b/composer.lock
index b841b98..5332109 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "c346a77e77f45dd18d0371568095d533",
- "content-hash": "9d01d4c0875ec4774829b9b80d1ab4f0",
+ "hash": "9e29cbff77457b9da548f665e5e010ea",
+ "content-hash": "b48455e6e53399fe588ca65fb1257c5e",
"packages": [
{
"name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -887,13 +887,13 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/wikimedia/fundraising/SmashPig.git";,
- "reference": "42ef005f9ae9e98b449325267c1079284e09a6fd"
+ "reference": "aa1532a9c046a5378572a3177b5f194a820bee4e"
},
"require": {
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "^2.1.1",
- "php": "^5.3.3",
+ "php": ">=5.3.3",
"phpmailer/phpmailer": "^5.2",
"predis/predis": "^1.1",
"symfony/event-dispatcher": "^2.1",
@@ -938,7 +938,7 @@
"donations",
"payments"
],
- "time": "2016-08-09 16:17:09"
+ "time": "2016-08-25 19:50:04"
},
{
"name": "zordius/lightncandy",
@@ -988,7 +988,55 @@
"time": "2015-11-05 07:14:57"
}
],
- "packages-dev": [],
+ "packages-dev": [
+ {
+ "name": "jakub-onderka/php-parallel-lint",
+ "version": "v0.9.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git";,
+ "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa";,
+ "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "jakub-onderka/php-console-highlighter": "~0.3",
+ "nette/tester": "~1.3"
+ },
+ "suggest": {
+ "jakub-onderka/php-console-highlighter": "Highlight syntax in
code snippet"
+ },
+ "bin": [
+ "parallel-lint"
+ ],
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "./"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "BSD-2-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Jakub Onderka",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "This tool check syntax of PHP files about 20x
faster than serial check.",
+ "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint";,
+ "time": "2015-12-15 10:42:16"
+ }
+ ],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
diff --git
a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
index 794fab7..dd3c0f6 100644
--- a/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
+++ b/tests/phpunit/Adapter/GlobalCollect/GlobalCollectOrphanRectifierTest.php
@@ -78,7 +78,7 @@
// Create the schema.
// FIXME: Reuse something from SmashPig\Tests
- $sql = file_get_contents( __DIR__ .
'/../../../../vendor/wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sqlite.sql'
);
+ $sql = file_get_contents( __DIR__ .
'/../../../../vendor/wikimedia/smash-pig/Schema/sqlite/001_CreatePendingTable.sql'
);
$this->pendingDb->getDatabase()->exec( $sql );
}
diff --git a/tests/phpunit/LintYaml.php b/tests/phpunit/LintYaml.php
index 340ad44..bd8a5f0 100644
--- a/tests/phpunit/LintYaml.php
+++ b/tests/phpunit/LintYaml.php
@@ -45,6 +45,6 @@
}
$exitStatus = 0;
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../../vendor/autoload.php';
runForYamlFiles( 'lintYamlFile' );
exit($exitStatus);
--
To view, visit https://gerrit.wikimedia.org/r/307528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10758296bfccbb180825734452354b6bf401c7ab
Gerrit-PatchSet: 14
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: JanZerebecki <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
