Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/256926
Change subject: Don't commit composer.lock file ...................................................................... Don't commit composer.lock file We don't do this for other repositories with only development dependencies, and jenkins totally ignores it anyways. Change-Id: Ie3b86b1acb355448bd8ae7bc033a7c4f8a8b9650 --- M .gitignore D composer.lock 2 files changed, 1 insertion(+), 177 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys refs/changes/26/256926/1 diff --git a/.gitignore b/.gitignore index 97ff0e5..44194b0 100644 --- a/.gitignore +++ b/.gitignore @@ -33,8 +33,5 @@ ### Composer ### composer.phar vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock +composer.lock diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 38f3509..0000000 --- a/composer.lock +++ /dev/null @@ -1,173 +0,0 @@ -{ - "_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": "697d204581780e096180621680b246ea", - "packages": [], - "packages-dev": [ - { - "name": "jakub-onderka/php-parallel-lint", - "version": "v0.9", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Parallel-Lint.git";, - "reference": "1b693fb455201cacf595163c92bfb1adfa2158d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Parallel-Lint/zipball/1b693fb455201cacf595163c92bfb1adfa2158d8";, - "reference": "1b693fb455201cacf595163c92bfb1adfa2158d8", - "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" - ], - "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-06-16 10:17:07" - }, - { - "name": "mediawiki/mediawiki-codesniffer", - "version": "v0.3.0", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/mediawiki-tools-codesniffer.git";, - "reference": "cb25db9fba6b3d3b6cc6ee95a87772ff1302929b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-tools-codesniffer/zipball/cb25db9fba6b3d3b6cc6ee95a87772ff1302929b";, - "reference": "cb25db9fba6b3d3b6cc6ee95a87772ff1302929b", - "shasum": "" - }, - "require": { - "squizlabs/php_codesniffer": "2.3.0" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.8.*", - "phpunit/phpunit": "~4.1.0" - }, - "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": "2015-06-19 16:36:59" - }, - { - "name": "squizlabs/php_codesniffer", - "version": "2.3.0", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git";, - "reference": "5046b0e01c416fc2b06df961d0673c85bcdc896c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5046b0e01c416fc2b06df961d0673c85bcdc896c";, - "reference": "5046b0e01c416fc2b06df961d0673c85bcdc896c", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.1.2" - }, - "bin": [ - "scripts/phpcs", - "scripts/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.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": "2015-03-04 02:07:03" - } - ], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [] -} -- To view, visit https://gerrit.wikimedia.org/r/256926 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3b86b1acb355448bd8ae7bc033a7c4f8a8b9650 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/QuickSurveys Gerrit-Branch: dev Gerrit-Owner: Addshore <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
