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

Change subject: Remove composer.lock file
......................................................................


Remove composer.lock file

Not needed and caused problems since test's are failing now because of the
file.

Change-Id: I6bb8103c9db0a03b5f74fa36b1174522b70c889d
---
M composer.json
D composer.lock
2 files changed, 1 insertion(+), 124 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 2672528..9a3db7a 100644
--- a/composer.json
+++ b/composer.json
@@ -5,9 +5,7 @@
        "require": {},
        "require-dev": {
                "symfony/dom-crawler": "~2.5",
-               "symfony/css-selector": "~2.5"
-       },
-       "require-dev": {
+               "symfony/css-selector": "~2.5",
                "jakub-onderka/php-parallel-lint": "0.9"
        },
        "scripts": {
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 02da567..0000000
--- a/composer.lock
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at 
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
-        "This file is @generated automatically"
-    ],
-    "hash": "430513e3e3fc840fc6d08892687cbc2d",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "symfony/css-selector",
-            "version": "v2.5.6",
-            "target-dir": "Symfony/Component/CssSelector",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/CssSelector.git";,
-                "reference": "7cdf543a3f31935aae58de4e6e607d4bdeb3f5dc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": 
"https://api.github.com/repos/symfony/CssSelector/zipball/7cdf543a3f31935aae58de4e6e607d4bdeb3f5dc";,
-                "reference": "7cdf543a3f31935aae58de4e6e607d4bdeb3f5dc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/";,
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors";
-                },
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.si...@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fab...@symfony.com"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "http://symfony.com";,
-            "time": "2014-10-09 16:00:03"
-        },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v2.5.6",
-            "target-dir": "Symfony/Component/DomCrawler",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/DomCrawler.git";,
-                "reference": "5b45ef9b8a8e6dda47eb9b9b982f61e8b2caa21e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": 
"https://api.github.com/repos/symfony/DomCrawler/zipball/5b45ef9b8a8e6dda47eb9b9b982f61e8b2caa21e";,
-                "reference": "5b45ef9b8a8e6dda47eb9b9b982f61e8b2caa21e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/";,
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors";
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fab...@symfony.com"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "http://symfony.com";,
-            "time": "2014-10-01 05:50:18"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "platform": [],
-    "platform-dev": []
-}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6bb8103c9db0a03b5f74fa36b1174522b70c889d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: REL1_26
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Mattflaschen <mflasc...@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