From d330ef8c1b52bb93e02de3992edb9041f2c99fb5 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 14 Feb 2016 16:24:00 +0100
Subject: [ticket/14478] Move facebook/webdriver dependency to main composer
 file

Also updated to latest version and now using proper version in
composer.json.

PHPBB3-14478
---
 phpBB/composer.json |  1 +
 phpBB/composer.lock | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/composer.json b/phpBB/composer.json
index a6c3a2aa93..88df2bfa3d 100644
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -49,6 +49,7 @@
 	},
 	"require-dev": {
 		"fabpot/goutte": "~2.0",
+		"facebook/webdriver": "~1.1",
 		"phing/phing": "2.4.*",
 		"phpunit/dbunit": "1.3.*",
 		"phpunit/phpunit": "4.1.*",
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index cad14d8913..9a278fa8cf 100644
--- a/phpBB/composer.lock
+++ b/phpBB/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": "d4e2fb7ee961c4734df4e385db2e6995",
-    "content-hash": "b15dfee84d1e9f3e2f5a3cc290b0be58",
+    "hash": "2de20b0ffe0ca05fb62a7c685a25ca79",
+    "content-hash": "6e427257e82c0d33fc94040d9685f516",
     "packages": [
         {
             "name": "bantu/ini-get-wrapper",
@@ -1606,6 +1606,49 @@
             ],
             "time": "2015-05-05 21:14:57"
         },
+        {
+            "name": "facebook/webdriver",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "1c98108ba3eb435b681655764de11502a0653705"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705",
+                "reference": "1c98108ba3eb435b681655764de11502a0653705",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.19"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.6.*"
+            },
+            "suggest": {
+                "phpdocumentor/phpdocumentor": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A PHP client for WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2015-12-31 15:58:49"
+        },
         {
             "name": "michelf/php-markdown",
             "version": "1.6.0",
-- 
cgit v1.2.1