diff --git a/composer.lock b/composer.lock index 3253536..a406a5d 100644 --- a/composer.lock +++ b/composer.lock @@ -2627,23 +2627,23 @@ }, { "name": "jcalderonzumba/mink-phantomjs-driver", - "version": "dev-master", + "version": "v0.3.1", "source": { "type": "git", "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git", - "reference": "10d7c48c9a4129463052321b52450d98983c4332" + "reference": "782892dbea4af7d04024374672b3790b6c008def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/10d7c48c9a4129463052321b52450d98983c4332", - "reference": "10d7c48c9a4129463052321b52450d98983c4332", + "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/782892dbea4af7d04024374672b3790b6c008def", + "reference": "782892dbea4af7d04024374672b3790b6c008def", "shasum": "" }, "require": { "behat/mink": "~1.6", "jcalderonzumba/gastonjs": "~1.0", "php": ">=5.4", - "twig/twig": "~1.8" + "twig/twig": "~1.20|~2.0" }, "require-dev": { "phpunit/phpunit": "~4.6", @@ -2684,7 +2684,7 @@ "phantomjs", "testing" ], - "time": "2015-10-05 18:24:44" + "time": "2015-12-04 13:55:02" }, { "name": "mikey179/vfsStream", @@ -3740,39 +3740,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "php": 0, - "symfony/class-loader": 0, - "symfony/console": 0, - "symfony/dependency-injection": 0, - "symfony/event-dispatcher": 0, - "symfony/http-foundation": 0, - "symfony/http-kernel": 0, - "symfony/routing": 0, - "symfony/serializer": 0, - "symfony/translation": 0, - "symfony/validator": 0, - "symfony/process": 0, - "symfony/yaml": 0, - "twig/twig": 0, - "doctrine/common": 0, - "doctrine/annotations": 0, - "guzzlehttp/guzzle": 0, - "symfony-cmf/routing": 0, - "easyrdf/easyrdf": 0, - "zendframework/zend-feed": 0, - "stack/builder": 0, - "egulias/email-validator": 0, - "masterminds/html5": 0, - "symfony/psr-http-message-bridge": 0, - "zendframework/zend-diactoros": 0, - "composer/semver": 0, - "behat/mink": 0, - "behat/mink-goutte-driver": 0, - "jcalderonzumba/gastonjs": 20, - "jcalderonzumba/mink-phantomjs-driver": 20, - "mikey179/vfsstream": 0, - "phpunit/phpunit": 0, - "symfony/css-selector": 0 + "jcalderonzumba/gastonjs": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/core/composer.json b/core/composer.json index afb170a..1eabf49 100644 --- a/core/composer.json +++ b/core/composer.json @@ -35,7 +35,7 @@ "behat/mink": "~1.6", "behat/mink-goutte-driver": "~1.2", "jcalderonzumba/gastonjs": "^1.1@dev", - "jcalderonzumba/mink-phantomjs-driver": "dev-master#10d7c48c9a4129463052321b52450d98983c4332", + "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", "mikey179/vfsStream": "~1.2", "phpunit/phpunit": "~4.8", "symfony/css-selector": "2.7.*" diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 5e1469e..990cfdc 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -13,9 +13,7 @@ namespace Composer\Autoload; /** - * ClassLoader implements a PSR-0 class loader - * - * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. * * $loader = new \Composer\Autoload\ClassLoader(); * @@ -39,6 +37,8 @@ * * @author Fabien Potencier * @author Jordi Boggiano + * @see http://www.php-fig.org/psr/psr-0/ + * @see http://www.php-fig.org/psr/psr-4/ */ class ClassLoader { diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index 52711f4..0e9136e 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -6,8 +6,8 @@ $baseDir = dirname($vendorDir); return array( - $vendorDir . '/guzzlehttp/promises/src/functions_include.php', - $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', - $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', - $baseDir . '/core/lib/Drupal.php', + 'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php', + 'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php', + '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php', + '454414594637b9dd94a19af83f56f1a2' => $baseDir . '/core/lib/Drupal.php', ); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 4bd9987..4303fce 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -41,15 +41,19 @@ public static function getLoader() $loader->register(true); $includeFiles = require __DIR__ . '/autoload_files.php'; - foreach ($includeFiles as $file) { - composerRequireDrupal8($file); + foreach ($includeFiles as $fileIdentifier => $file) { + composerRequireDrupal8($fileIdentifier, $file); } return $loader; } } -function composerRequireDrupal8($file) +function composerRequireDrupal8($fileIdentifier, $file) { - require $file; + if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { + require $file; + + $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; + } } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b58ef9a..e2b7991 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2736,69 +2736,6 @@ ] }, { - "name": "jcalderonzumba/mink-phantomjs-driver", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git", - "reference": "10d7c48c9a4129463052321b52450d98983c4332" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/10d7c48c9a4129463052321b52450d98983c4332", - "reference": "10d7c48c9a4129463052321b52450d98983c4332", - "shasum": "" - }, - "require": { - "behat/mink": "~1.6", - "jcalderonzumba/gastonjs": "~1.0", - "php": ">=5.4", - "twig/twig": "~1.8" - }, - "require-dev": { - "phpunit/phpunit": "~4.6", - "silex/silex": "~1.2", - "symfony/css-selector": "~2.1", - "symfony/phpunit-bridge": "~2.7", - "symfony/process": "~2.3" - }, - "time": "2015-10-05 18:24:44", - "type": "mink-driver", - "extra": { - "branch-alias": { - "dev-master": "0.4.x-dev" - } - }, - "installation-source": "source", - "autoload": { - "psr-4": { - "Zumba\\Mink\\Driver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Juan Francisco Calderón Zumba", - "email": "juanfcz@gmail.com", - "homepage": "http://github.com/jcalderonzumba" - } - ], - "description": "PhantomJS driver for Mink framework", - "homepage": "http://mink.behat.org/", - "keywords": [ - "ajax", - "browser", - "headless", - "javascript", - "phantomjs", - "testing" - ] - }, - { "name": "symfony/class-loader", "version": "v2.7.6", "version_normalized": "2.7.6.0", @@ -3857,5 +3794,68 @@ } ], "description": "Composer plugin to merge multiple composer.json files" + }, + { + "name": "jcalderonzumba/mink-phantomjs-driver", + "version": "v0.3.1", + "version_normalized": "0.3.1.0", + "source": { + "type": "git", + "url": "https://github.com/jcalderonzumba/MinkPhantomJSDriver.git", + "reference": "782892dbea4af7d04024374672b3790b6c008def" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/782892dbea4af7d04024374672b3790b6c008def", + "reference": "782892dbea4af7d04024374672b3790b6c008def", + "shasum": "" + }, + "require": { + "behat/mink": "~1.6", + "jcalderonzumba/gastonjs": "~1.0", + "php": ">=5.4", + "twig/twig": "~1.20|~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "silex/silex": "~1.2", + "symfony/css-selector": "~2.1", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.3" + }, + "time": "2015-12-04 13:55:02", + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "0.4.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Zumba\\Mink\\Driver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Juan Francisco Calderón Zumba", + "email": "juanfcz@gmail.com", + "homepage": "http://github.com/jcalderonzumba" + } + ], + "description": "PhantomJS driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "ajax", + "browser", + "headless", + "javascript", + "phantomjs", + "testing" + ] } ] diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/.gitignore b/vendor/jcalderonzumba/mink-phantomjs-driver/.gitignore new file mode 100644 index 0000000..7df1a0b --- /dev/null +++ b/vendor/jcalderonzumba/mink-phantomjs-driver/.gitignore @@ -0,0 +1,8 @@ +.idea/* +vendor/* +bin/behat +bin/phantomjs +bin/phpunit +composer.lock +tmp/* +tests/integration/ScreenShotContext.php diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/bin/run-tests.sh b/vendor/jcalderonzumba/mink-phantomjs-driver/bin/run-tests.sh old mode 100644 new mode 100755 diff --git a/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json b/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json index 31b4f57..e5cbde8 100644 --- a/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json +++ b/vendor/jcalderonzumba/mink-phantomjs-driver/composer.json @@ -22,7 +22,7 @@ "require": { "php": ">=5.4", "behat/mink": "~1.6", - "twig/twig": "~1.8", + "twig/twig": "~1.20|~2.0", "jcalderonzumba/gastonjs": "~1.0" }, "require-dev": {