From af9e84f8328cce141008f282c66cf7176c193996 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Thu, 14 May 2020 10:54:13 +0200 Subject: [PATCH] Unifiy dependencies constraints --- composer.json | 13 ++++++------- composer.lock | 48 ++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 51deb71..b6c84a6 100644 --- a/composer.json +++ b/composer.json @@ -7,22 +7,21 @@ "require": { "ext-intl": "*", "ext-json": "*", - "aura/session": "~2.1.0", - "barracudanetworks/archivestream-php": "~1.0.5", + "aura/session": "^2.1", + "barracudanetworks/archivestream-php": "^1.0", "guzzlehttp/guzzle": "^6.5", "jawira/case-converter": "^3.4", - "mathmarques/smarty-view": "~1.1.0", + "mathmarques/smarty-view": "^1.1", "npm-asset/open-sans-fontface": "^1.4", "phpro/grumphp": "^0.18.0", - "rinvex/countries": "~3.1.0", - "slim/slim": "~3.12.1", + "rinvex/countries": "^6.1", "symfony/process": "^4.0", "symfony/translation": "^4.0", "symfony/yaml": "^4.0", - "zonuexe/http-accept-language": "~0.4.1" + "zonuexe/http-accept-language": "^0.4.1" }, "require-dev": { - "anam/phantomjs-linux-x86-binary": "~2.1.1", + "anam/phantomjs-linux-x86-binary": "^2.1", "consolidation/robo": "^2.0", "ffmpeg/ffmpeg": "^4.1", "heroku/heroku-buildpack-php": "^162.0", diff --git a/composer.lock b/composer.lock index 91d9271..d696976 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "66aaa3c92cd4b75c8e9693a23d2c5b8c", + "content-hash": "4dd2359c7a7df39f4889c9257e636003", "packages": [ { "name": "aura/session", @@ -783,29 +783,29 @@ }, { "name": "pimple/pimple", - "version": "v3.2.3", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "reference": "e55d12f9d6a0e7f9c85992b73df1267f46279930" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/e55d12f9d6a0e7f9c85992b73df1267f46279930", + "reference": "e55d12f9d6a0e7f9c85992b73df1267f46279930", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": "^7.2.5", "psr/container": "^1.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^3.4|^4.4|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.3.x-dev" } }, "autoload": { @@ -824,12 +824,12 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], - "time": "2018-01-21T07:42:36+00:00" + "time": "2020-03-03T09:12:48+00:00" }, { "name": "psr/container", @@ -1019,28 +1019,32 @@ }, { "name": "rinvex/countries", - "version": "v3.1.0", + "version": "v6.1.2", "source": { "type": "git", "url": "https://github.com/rinvex/countries.git", - "reference": "e32228ef43f26d3b02296be9454f842c52d492f3" + "reference": "0dd9da817c1faa33429fe56b8ba059fdabe6e0fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rinvex/countries/zipball/e32228ef43f26d3b02296be9454f842c52d492f3", - "reference": "e32228ef43f26d3b02296be9454f842c52d492f3", + "url": "https://api.github.com/repos/rinvex/countries/zipball/0dd9da817c1faa33429fe56b8ba059fdabe6e0fe", + "reference": "0dd9da817c1faa33429fe56b8ba059fdabe6e0fe", "shasum": "" }, "require": { - "php": "^7.0.0" + "php": "^7.2.0" }, "require-dev": { - "phpunit/phpunit": "^5.4.0" + "codedungeon/phpunit-result-printer": "^0.26.0", + "laravel/helpers": "^1.1.0", + "phpunit/phpunit": "^8.3.0" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "3.0-dev" + "laravel": { + "providers": [ + "Rinvex\\Country\\Providers\\CountryServiceProvider" + ] } }, "autoload": { @@ -1068,11 +1072,11 @@ "role": "Project Lead" }, { - "name": "The Generous Laravel Community", - "homepage": "https://github.com/rinvex/country/contributors" + "name": "The Generous PHP Community", + "homepage": "https://github.com/rinvex/countries/contributors" } ], - "description": "Rinvex Country is a simple and lightweight package for retrieving country details with flexibility. A whole bunch of data including name, demonym, capital, iso codes, dialling codes, geo data, currencies, flags, emoji, and other attributes for all 250 countries worldwide at your fingertips.", + "description": "Rinvex Countries is a simple and lightweight package for retrieving country details with flexibility. A whole bunch of data including name, demonym, capital, iso codes, dialling codes, geo data, currencies, flags, emoji, and other attributes for all 250 countries worldwide at your fingertips.", "homepage": "https://rinvex.com", "keywords": [ "Flexible", @@ -1089,7 +1093,7 @@ "rinvex", "svg" ], - "time": "2017-03-07T18:40:20+00:00" + "time": "2020-03-13T18:04:45+00:00" }, { "name": "seld/jsonlint",