diff --git a/composer.lock b/composer.lock index a406a5d..e092980 100644 --- a/composer.lock +++ b/composer.lock @@ -2570,16 +2570,16 @@ }, { "name": "jcalderonzumba/gastonjs", - "version": "dev-master", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/jcalderonzumba/gastonjs.git", - "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad" + "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/5e231b4df98275c404e1371fc5fadd34f6a121ad", - "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad", + "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/21bebb8ca03eb0f93ec2f3fad61192fb079e2622", + "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622", "shasum": "" }, "require": { @@ -2623,7 +2623,7 @@ "headless", "phantomjs" ], - "time": "2015-10-07 11:40:41" + "time": "2016-01-18 09:21:03" }, { "name": "jcalderonzumba/mink-phantomjs-driver", @@ -3739,9 +3739,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "jcalderonzumba/gastonjs": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/core/composer.json b/core/composer.json index 1eabf49..024a387 100644 --- a/core/composer.json +++ b/core/composer.json @@ -34,7 +34,7 @@ "require-dev": { "behat/mink": "~1.6", "behat/mink-goutte-driver": "~1.2", - "jcalderonzumba/gastonjs": "^1.1@dev", + "jcalderonzumba/gastonjs": "~1.0.2", "jcalderonzumba/mink-phantomjs-driver": "~0.3.1", "mikey179/vfsStream": "~1.2", "phpunit/phpunit": "~4.8", diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 990cfdc..ff6ecfb 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -147,7 +147,7 @@ public function add($prefix, $paths, $prepend = false) * appending or prepending to the ones previously set for this namespace. * * @param string $prefix The prefix/namespace, with trailing '\\' - * @param array|string $paths The PSR-0 base directories + * @param array|string $paths The PSR-4 base directories * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e2b7991..38b3a3d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2677,65 +2677,6 @@ ] }, { - "name": "jcalderonzumba/gastonjs", - "version": "dev-master", - "version_normalized": "9999999-dev", - "source": { - "type": "git", - "url": "https://github.com/jcalderonzumba/gastonjs.git", - "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/5e231b4df98275c404e1371fc5fadd34f6a121ad", - "reference": "5e231b4df98275c404e1371fc5fadd34f6a121ad", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "~5.0|~6.0", - "php": ">=5.4" - }, - "require-dev": { - "phpunit/phpunit": "~4.6", - "silex/silex": "~1.2", - "symfony/phpunit-bridge": "~2.7", - "symfony/process": "~2.1" - }, - "time": "2015-10-07 11:40:41", - "type": "phantomjs-api", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "installation-source": "source", - "autoload": { - "psr-4": { - "Zumba\\GastonJS\\": "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 API based server for webpage automation", - "homepage": "https://github.com/jcalderonzumba/gastonjs", - "keywords": [ - "api", - "automation", - "browser", - "headless", - "phantomjs" - ] - }, - { "name": "symfony/class-loader", "version": "v2.7.6", "version_normalized": "2.7.6.0", @@ -3857,5 +3798,64 @@ "phantomjs", "testing" ] + }, + { + "name": "jcalderonzumba/gastonjs", + "version": "v1.0.2", + "version_normalized": "1.0.2.0", + "source": { + "type": "git", + "url": "https://github.com/jcalderonzumba/gastonjs.git", + "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jcalderonzumba/gastonjs/zipball/21bebb8ca03eb0f93ec2f3fad61192fb079e2622", + "reference": "21bebb8ca03eb0f93ec2f3fad61192fb079e2622", + "shasum": "" + }, + "require": { + "guzzlehttp/guzzle": "~5.0|~6.0", + "php": ">=5.4" + }, + "require-dev": { + "phpunit/phpunit": "~4.6", + "silex/silex": "~1.2", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.1" + }, + "time": "2016-01-18 09:21:03", + "type": "phantomjs-api", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "installation-source": "dist", + "autoload": { + "psr-4": { + "Zumba\\GastonJS\\": "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 API based server for webpage automation", + "homepage": "https://github.com/jcalderonzumba/gastonjs", + "keywords": [ + "api", + "automation", + "browser", + "headless", + "phantomjs" + ] } ] diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/browser.js b/vendor/jcalderonzumba/gastonjs/src/Client/browser.js index df667fb..257b035 100644 --- a/vendor/jcalderonzumba/gastonjs/src/Client/browser.js +++ b/vendor/jcalderonzumba/gastonjs/src/Client/browser.js @@ -19,14 +19,15 @@ Poltergeist.Browser = (function () { * @param owner * @param width * @param height + * @param jsErrors * @constructor */ - function Browser(owner, width, height) { + function Browser(owner, width, height, jsErrors) { this.owner = owner; this.width = width || 1024; this.height = height || 768; this.pages = []; - this.js_errors = true; + this.js_errors = (typeof jsErrors === 'boolean') ? jsErrors : true; this._debug = false; this._counter = 0; this.resetPage(); diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/main.js b/vendor/jcalderonzumba/gastonjs/src/Client/main.js index a8f2ecb..59fd320 100644 --- a/vendor/jcalderonzumba/gastonjs/src/Client/main.js +++ b/vendor/jcalderonzumba/gastonjs/src/Client/main.js @@ -26,4 +26,4 @@ phantom.injectJs("" + phantom.libraryPath + "/browser.js"); system = require('system'); -new Poltergeist(system.args[1], system.args[2], system.args[3]); +new Poltergeist(system.args[1], system.args[2], system.args[3], system.args[4] === 'false' ? false : true); diff --git a/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js b/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js index 20f0267..4e86d08 100644 --- a/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js +++ b/vendor/jcalderonzumba/gastonjs/src/Client/poltergeist.js @@ -5,11 +5,12 @@ Poltergeist = (function () { * @param port * @param width * @param height + * @param jsErrors * @constructor */ - function Poltergeist(port, width, height) { + function Poltergeist(port, width, height, jsErrors) { var self; - this.browser = new Poltergeist.Browser(this, width, height); + this.browser = new Poltergeist.Browser(this, width, height, jsErrors); this.commandServer = new Poltergeist.Server(this, port); this.commandServer.start();