From 9388d9f1c9ada0174869e5d8cfdb4d0132026d4e Mon Sep 17 00:00:00 2001 From: Adrian Skierniewski Date: Wed, 12 Apr 2017 13:20:55 +0200 Subject: [PATCH] Updated packages versions to use dev-master --- composer.json | 10 +-- composer.lock | 177 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 137 insertions(+), 50 deletions(-) diff --git a/composer.json b/composer.json index 5aaf7359..c308e13c 100644 --- a/composer.json +++ b/composer.json @@ -19,9 +19,9 @@ "require": { "php": ">=7.1.0", "laravel/framework": "5.4.*", - "gzero/cms": "dev-laravel_5_4_upgrade", - "gzero/api": "dev-laravel_5_4_upgrade", - "gzero/admin": "dev-laravel_5_4_upgrade", + "gzero/cms": "dev-master", + "gzero/api": "dev-master", + "gzero/admin": "dev-master", "predis/predis": "^1.1", "league/flysystem-aws-s3-v3": "^1.0" }, @@ -31,10 +31,10 @@ "codeception/codeception": "2.2.*", "fzaninotto/faker": "~1.4", "mockery/mockery": "0.9.*", - "phpunit/phpunit": "~6.0", + "phpunit/phpunit": "~5.7", "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", - "satooshi/php-coveralls": "dev-master", + "satooshi/php-coveralls": "^1.0", "flow/jsonpath": "0.3.*", "gzero/testing": "3.*" }, diff --git a/composer.lock b/composer.lock index 0db8e64f..2ea51227 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "5b1cc94b4465b9c7f2b5541435be6066", + "content-hash": "974b5479a9b8ec7d2fc3401c5f6f4c2f", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.25.6", + "version": "3.25.7", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "fe98140a4811abbe9104477b167dc3c7f9a8391b" + "reference": "d4f1104f5ac9c755875c5e6e9bade2c70708219a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fe98140a4811abbe9104477b167dc3c7f9a8391b", - "reference": "fe98140a4811abbe9104477b167dc3c7f9a8391b", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d4f1104f5ac9c755875c5e6e9bade2c70708219a", + "reference": "d4f1104f5ac9c755875c5e6e9bade2c70708219a", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "s3", "sdk" ], - "time": "2017-04-07T20:21:45+00:00" + "time": "2017-04-11T22:31:27+00:00" }, { "name": "barryvdh/laravel-cors", @@ -676,24 +676,24 @@ }, { "name": "gzero/admin", - "version": "dev-laravel_5_4_upgrade", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/GrupaZero/admin.git", - "reference": "c6f5eea58f016af1ed55564e0913d1d042d236ef" + "reference": "b0ecb1d004c2488e6ea1b3006f46727ecf5dfb3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrupaZero/admin/zipball/c6f5eea58f016af1ed55564e0913d1d042d236ef", - "reference": "c6f5eea58f016af1ed55564e0913d1d042d236ef", + "url": "https://api.github.com/repos/GrupaZero/admin/zipball/b0ecb1d004c2488e6ea1b3006f46727ecf5dfb3a", + "reference": "b0ecb1d004c2488e6ea1b3006f46727ecf5dfb3a", "shasum": "" }, "require": { - "gzero/core": "dev-laravel_5_4_upgrade", + "gzero/core": "dev-master", "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "5.6.*" + "phpunit/phpunit": "5.7.*" }, "type": "library", "autoload": { @@ -718,29 +718,29 @@ "gzero cms", "laravel" ], - "time": "2017-04-11T12:32:27+00:00" + "time": "2017-04-12T10:56:52+00:00" }, { "name": "gzero/api", - "version": "dev-laravel_5_4_upgrade", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/GrupaZero/api.git", - "reference": "f70c3634e551b587b2ab0d9f0c312d5555f74508" + "reference": "ab0d2e9916a65dd80c72cd2c84518bec7e07b655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrupaZero/api/zipball/f70c3634e551b587b2ab0d9f0c312d5555f74508", - "reference": "f70c3634e551b587b2ab0d9f0c312d5555f74508", + "url": "https://api.github.com/repos/GrupaZero/api/zipball/ab0d2e9916a65dd80c72cd2c84518bec7e07b655", + "reference": "ab0d2e9916a65dd80c72cd2c84518bec7e07b655", "shasum": "" }, "require": { "barryvdh/laravel-cors": "0.9.*", "flow/jsonpath": "^0.3.4", - "gzero/core": "dev-laravel_5_4_upgrade", - "gzero/entity": "dev-laravel_5_4_upgrade", - "gzero/repository": "dev-laravel_5_4_upgrade", - "gzero/validator": "dev-laravel_5_4_upgrade", + "gzero/core": "dev-master", + "gzero/entity": "dev-master", + "gzero/repository": "dev-master", + "gzero/validator": "dev-master", "illuminate/pagination": "5.4.*", "illuminate/routing": "5.4.*", "laravel/passport": "^2.0", @@ -780,20 +780,20 @@ "cms", "laravel" ], - "time": "2017-04-11T12:24:39+00:00" + "time": "2017-04-12T11:10:40+00:00" }, { "name": "gzero/cms", - "version": "dev-laravel_5_4_upgrade", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/GrupaZero/cms.git", - "reference": "00a9d4f0d179827e00e6b1d5c5689d5666f9414b" + "reference": "833e3bc903075480fdb4aee3e5a2e7d7e2433396" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrupaZero/cms/zipball/00a9d4f0d179827e00e6b1d5c5689d5666f9414b", - "reference": "00a9d4f0d179827e00e6b1d5c5689d5666f9414b", + "url": "https://api.github.com/repos/GrupaZero/cms/zipball/833e3bc903075480fdb4aee3e5a2e7d7e2433396", + "reference": "833e3bc903075480fdb4aee3e5a2e7d7e2433396", "shasum": "" }, "require": { @@ -846,7 +846,7 @@ "framework", "laravel" ], - "time": "2017-04-11T11:53:50+00:00" + "time": "2017-04-12T10:40:42+00:00" }, { "name": "gzero/eloquent-tree", @@ -3614,6 +3614,99 @@ ], "time": "2016-04-29T12:21:54+00:00" }, + { + "name": "guzzle/guzzle", + "version": "v3.8.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "php": ">=5.3.3", + "symfony/event-dispatcher": ">=2.1" + }, + "replace": { + "guzzle/batch": "self.version", + "guzzle/cache": "self.version", + "guzzle/common": "self.version", + "guzzle/http": "self.version", + "guzzle/inflection": "self.version", + "guzzle/iterator": "self.version", + "guzzle/log": "self.version", + "guzzle/parser": "self.version", + "guzzle/plugin": "self.version", + "guzzle/plugin-async": "self.version", + "guzzle/plugin-backoff": "self.version", + "guzzle/plugin-cache": "self.version", + "guzzle/plugin-cookie": "self.version", + "guzzle/plugin-curlauth": "self.version", + "guzzle/plugin-error-response": "self.version", + "guzzle/plugin-history": "self.version", + "guzzle/plugin-log": "self.version", + "guzzle/plugin-md5": "self.version", + "guzzle/plugin-mock": "self.version", + "guzzle/plugin-oauth": "self.version", + "guzzle/service": "self.version", + "guzzle/stream": "self.version" + }, + "require-dev": { + "doctrine/cache": "*", + "monolog/monolog": "1.*", + "phpunit/phpunit": "3.7.*", + "psr/log": "1.0.*", + "symfony/class-loader": "*", + "zendframework/zend-cache": "<2.3", + "zendframework/zend-log": "<2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.8-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle": "src/", + "Guzzle\\Tests": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Guzzle Community", + "homepage": "https://github.com/guzzle/guzzle/contributors" + } + ], + "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "abandoned": "guzzlehttp/guzzle", + "time": "2014-01-28T22:29:15+00:00" + }, { "name": "gzero/testing", "version": "v3.1.0", @@ -4456,28 +4549,28 @@ }, { "name": "satooshi/php-coveralls", - "version": "dev-master", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "d7285decc88dff59c5ff02c4b1052ab424ba7fa5" + "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/d7285decc88dff59c5ff02c4b1052ab424ba7fa5", - "reference": "d7285decc88dff59c5ff02c4b1052ab424ba7fa5", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/da51d304fe8622bf9a6da39a8446e7afd432115c", + "reference": "da51d304fe8622bf9a6da39a8446e7afd432115c", "shasum": "" }, "require": { "ext-json": "*", "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.0", - "php": "^5.5 || ^7.0", + "guzzle/guzzle": "^2.8|^3.0", + "php": ">=5.3.3", "psr/log": "^1.0", - "symfony/config": "^2.1 || ^3.0", - "symfony/console": "^2.1 || ^3.0", - "symfony/stopwatch": "^2.0 || ^3.0", - "symfony/yaml": "^2.0 || ^3.0" + "symfony/config": "^2.1|^3.0", + "symfony/console": "^2.1|^3.0", + "symfony/stopwatch": "^2.0|^3.0", + "symfony/yaml": "^2.0|^3.0" }, "suggest": { "symfony/http-kernel": "Allows Symfony integration" @@ -4486,11 +4579,6 @@ "bin/coveralls" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, "autoload": { "psr-4": { "Satooshi\\": "src/Satooshi/" @@ -4515,7 +4603,7 @@ "github", "test" ], - "time": "2017-03-31T10:12:47+00:00" + "time": "2016-01-20T17:35:46+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5509,8 +5597,7 @@ "stability-flags": { "gzero/cms": 20, "gzero/api": 20, - "gzero/admin": 20, - "satooshi/php-coveralls": 20 + "gzero/admin": 20 }, "prefer-stable": false, "prefer-lowest": false,