jenkins-bot has submitted this change and it was merged.

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.7.1
......................................................................


build: Updating mediawiki/mediawiki-codesniffer to 0.7.1

Also added "composer fix" command.

Change-Id: Id4f7bb88d117f85c63dde4ffea0b8926184bd097
---
M composer.json
A composer.lock
M includes/Cards.hooks.php
3 files changed, 192 insertions(+), 10 deletions(-)

Approvals:
  Tim Starling: Looks good to me, approved
  Jforrester: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index db22539..33ad1e1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,15 @@
 {
        "require-dev": {
                "jakub-onderka/php-parallel-lint": "0.9.2",
-               "mediawiki/mediawiki-codesniffer": "0.4.0"
+               "mediawiki/mediawiki-codesniffer": "0.7.1"
        },
        "scripts": {
                "test": [
                        "parallel-lint . --exclude vendor",
                        "phpcs -p -s"
+               ],
+               "fix": [
+                       "phpcbf"
                ]
        }
 }
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000..0f749e0
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,179 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
+        "This file is @generated automatically"
+    ],
+    "hash": "3b0013734a655bbfb8437bf53fdfa549",
+    "content-hash": "a947cbc88a80f4405c346e8d5ae50405",
+    "packages": [],
+    "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": "jakub.onde...@gmail.com"
+                }
+            ],
+            "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"
+        },
+        {
+            "name": "mediawiki/mediawiki-codesniffer",
+            "version": "v0.7.1",
+            "source": {
+                "type": "git",
+                "url": 
"https://github.com/wikimedia/mediawiki-tools-codesniffer.git";,
+                "reference": "e722267df7a0c0e6e05831d2c8c030d6e18a5321"
+            },
+            "dist": {
+                "type": "zip",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/e722267df7a0c0e6e05831d2c8c030d6e18a5321";,
+                "reference": "e722267df7a0c0e6e05831d2c8c030d6e18a5321",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">= 5.5.9",
+                "squizlabs/php_codesniffer": "2.6.0"
+            },
+            "require-dev": {
+                "jakub-onderka/php-parallel-lint": "0.9.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/";,
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "MediaWiki CodeSniffer Standards",
+            "homepage": 
"https://www.mediawiki.org/wiki/Manual:Coding_conventions/PHP";,
+            "keywords": [
+                "codesniffer",
+                "mediawiki"
+            ],
+            "time": "2016-05-06 19:53:37"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "2.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git";,
+                "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": 
"https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1bcdf03b068a530ac1962ce671dead356eeba43b";,
+                "reference": "1bcdf03b068a530ac1962ce671dead356eeba43b",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/";,
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS 
files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer";,
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2016-04-03 22:58:34"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/includes/Cards.hooks.php b/includes/Cards.hooks.php
index c8d346a..7fbd4c9 100644
--- a/includes/Cards.hooks.php
+++ b/includes/Cards.hooks.php
@@ -22,22 +22,22 @@
         */
        public static function onResourceLoaderTestModules(
                array &$testModules, ResourceLoader &$resourceLoader ) {
-               $resourceFileModulePaths = array(
+               $resourceFileModulePaths = [
                        'localBasePath' => __DIR__ . '/../tests/qunit/',
                        'remoteExtPath' => 'Cards/tests/qunit',
-                       'targets' => array( 'mobile' ),
-               );
+                       'targets' => [ 'mobile' ],
+               ];
 
-               $testModules['qunit']['ext.cards.tests'] = array(
-                       'dependencies' => array(
+               $testModules['qunit']['ext.cards.tests'] = [
+                       'dependencies' => [
                                'ext.cards'
-                       ),
-                       'scripts' => array(
+                       ],
+                       'scripts' => [
                                'CardModel.js',
                                'CardsGateway.js',
                                'CardView.js',
-                       )
-               ) + $resourceFileModulePaths;
+                       ]
+               ] + $resourceFileModulePaths;
 
                return true;
        }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4f7bb88d117f85c63dde4ffea0b8926184bd097
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cards
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to