From 8b27a5142b837b2428df893317518b2c33f73389 Mon Sep 17 00:00:00 2001 From: Pavel Date: Tue, 18 Jun 2019 17:52:58 +0300 Subject: [PATCH] Fix requirements --- .travis.yml | 1 - Makefile | 4 +- composer.json | 14 ++- composer.lock | 290 ++++++++++++++++++++++++++++++------------------ phpdoc.dist.xml | 2 +- 5 files changed, 191 insertions(+), 120 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe2315f..1c2ba4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ cache: - $HOME/.composer/cache php: - - '7.0' - '7.1' - '7.2' diff --git a/Makefile b/Makefile index 2010005..e0c55b5 100644 --- a/Makefile +++ b/Makefile @@ -24,5 +24,5 @@ ifeq ($(wildcard *.phar), ) @wget https://github.com/phpDocumentor/phpDocumentor2/releases/download/v3.0.0-alpha.3/phpDocumentor.phar -O phpDocumentor.phar @wget https://github.com/phpDocumentor/phpDocumentor2/releases/download/v3.0.0-alpha.3/phpDocumentor.phar.pubkey -O phpDocumentor.phar.pubkey @chmod +x phpDocumentor.phar - @php phpDocumentor.phar --config $(ROOT_DIR)/phpdoc.dist.xml -endif \ No newline at end of file +endif + @php phpDocumentor.phar --config $(ROOT_DIR)/phpdoc.dist.xml \ No newline at end of file diff --git a/composer.json b/composer.json index 836779f..0509248 100644 --- a/composer.json +++ b/composer.json @@ -12,21 +12,21 @@ } ], "require": { - "php": ">=7.0", + "php": ">=7.1", "ext-curl": "*", "ext-json": "*", - "doctrine/annotations": "^1.6", - "doctrine/cache": "^1.8", + "doctrine/cache": "1.6.*", "guzzlehttp/guzzle": "6.0", "lazyjsonmapper/lazyjsonmapper": "^1.6", - "symfony/validator": "^4.3" + "symfony/validator": "3.4.*", + "doctrine/annotations": "1.6.*", + "symfony/dotenv": "3.4.*" }, "require-dev": { "phpunit/phpunit": "6.5.*", "phpmd/phpmd": "2.6.*", "phpstan/phpstan": "0.9.*", "squizlabs/php_codesniffer": "3.4.*", - "symfony/dotenv": "^4.2", "friendsofphp/php-cs-fixer": "^2.14" }, "support": { @@ -47,5 +47,7 @@ "config": { "bin-dir": "bin", "process-timeout": 600 - } + }, + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/composer.lock b/composer.lock index dfa678f..29381f4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "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": "2d108dc8d869c82038b7dd68b27c44c9", + "content-hash": "fb7d2f0fa929696c1e3b8b70cc4eafe4", "packages": [ { "name": "corneltek/getoptionkit", @@ -118,38 +118,33 @@ }, { "name": "doctrine/cache", - "version": "v1.8.0", + "version": "v1.6.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" + "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", + "url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b", + "reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b", "shasum": "" }, "require": { - "php": "~7.1" + "php": "~5.5|~7.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "alcaeus/mongo-php-adapter": "^1.1", - "doctrine/coding-standard": "^4.0", - "mongodb/mongodb": "^1.1", - "phpunit/phpunit": "^7.0", - "predis/predis": "~1.0" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver" + "phpunit/phpunit": "~4.8|~5.0", + "predis/predis": "~1.0", + "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.8.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -184,30 +179,33 @@ } ], "description": "Caching library offering an object-oriented API for many cache backends", - "homepage": "https://www.doctrine-project.org", + "homepage": "http://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2018-08-21T18:01:43+00:00" + "time": "2017-07-22T12:49:21+00:00" }, { "name": "doctrine/lexer", - "version": "v1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "^4.5" + }, "type": "library", "extra": { "branch-alias": { @@ -215,8 +213,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } }, "notification-url": "https://packagist.org/downloads/", @@ -237,13 +235,16 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", "keywords": [ + "annotations", + "docblock", "lexer", - "parser" + "parser", + "php" ], - "time": "2014-09-09T13:34:57+00:00" + "time": "2019-06-08T11:03:04+00:00" }, { "name": "guzzlehttp/guzzle", @@ -644,6 +645,63 @@ ], "time": "2019-06-05T13:28:50+00:00" }, + { + "name": "symfony/dotenv", + "version": "v3.4.28", + "source": { + "type": "git", + "url": "https://github.com/symfony/dotenv.git", + "reference": "7b33c7b6f497898a173e4b9d6a7698cd789d54ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/7b33c7b6f497898a173e4b9d6a7698cd789d54ce", + "reference": "7b33c7b6f497898a173e4b9d6a7698cd789d54ce", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8" + }, + "require-dev": { + "symfony/process": "~3.2|~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Dotenv\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Registers environment variables from a .env file", + "homepage": "https://symfony.com", + "keywords": [ + "dotenv", + "env", + "environment" + ], + "time": "2019-04-01T07:08:40+00:00" + }, { "name": "symfony/polyfill-ctype", "version": "v1.11.0", @@ -762,49 +820,120 @@ "time": "2019-02-06T07:57:58+00:00" }, { - "name": "symfony/validator", + "name": "symfony/translation", "version": "v4.3.1", "source": { "type": "git", - "url": "https://github.com/symfony/validator.git", - "reference": "ea74d2843fd8a9f2d4800136c985d13da586a405" + "url": "https://github.com/symfony/translation.git", + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/ea74d2843fd8a9f2d4800136c985d13da586a405", - "reference": "ea74d2843fd8a9f2d4800136c985d13da586a405", + "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa", + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa", "shasum": "" }, "require": { "php": "^7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^1.1.2" + }, + "conflict": { + "symfony/config": "<3.4", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" + }, + "provide": { + "symfony/translation-implementation": "1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/intl": "~3.4|~4.0", + "symfony/service-contracts": "^1.1.2", + "symfony/var-dumper": "~3.4|~4.0", + "symfony/yaml": "~3.4|~4.0" + }, + "suggest": { + "psr/log-implementation": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.3-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Translation Component", + "homepage": "https://symfony.com", + "time": "2019-06-03T20:27:40+00:00" + }, + { + "name": "symfony/validator", + "version": "v3.4.28", + "source": { + "type": "git", + "url": "https://github.com/symfony/validator.git", + "reference": "23cf394faaffb6257f5764fbfc2db12ec30956f1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/validator/zipball/23cf394faaffb6257f5764fbfc2db12ec30956f1", + "reference": "23cf394faaffb6257f5764fbfc2db12ec30956f1", + "shasum": "" + }, + "require": { + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^1.1" + "symfony/translation": "~2.8|~3.0|~4.0" }, "conflict": { "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/dependency-injection": "<3.4", - "symfony/http-kernel": "<3.4", - "symfony/intl": "<4.3", - "symfony/translation": "<4.2", + "symfony/dependency-injection": "<3.3", + "symfony/http-kernel": "<3.3.5", "symfony/yaml": "<3.4" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/cache": "~1.0", "egulias/email-validator": "^1.2.8|~2.0", - "symfony/cache": "~3.4|~4.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/expression-language": "~3.4|~4.0", - "symfony/http-client": "^4.3", - "symfony/http-foundation": "~4.1", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/intl": "^4.3", - "symfony/property-access": "~3.4|~4.0", - "symfony/property-info": "~3.4|~4.0", - "symfony/translation": "~4.2", - "symfony/var-dumper": "~3.4|~4.0", + "symfony/cache": "~3.1|~4.0", + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~2.8|~3.0|~4.0", + "symfony/http-kernel": "^3.3.5|~4.0", + "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/property-access": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -817,14 +946,12 @@ "symfony/http-foundation": "", "symfony/intl": "", "symfony/property-access": "For accessing properties within comparison constraints", - "symfony/property-info": "To automatically add NotNull and Type constraints", - "symfony/translation": "For translating validation errors.", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -851,7 +978,7 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2019-06-03T20:27:40+00:00" + "time": "2019-05-05T16:11:06+00:00" } ], "packages-dev": [ @@ -3762,63 +3889,6 @@ "homepage": "https://symfony.com", "time": "2019-03-30T15:58:42+00:00" }, - { - "name": "symfony/dotenv", - "version": "v4.2.5", - "source": { - "type": "git", - "url": "https://github.com/symfony/dotenv.git", - "reference": "b541d63b83532be55a020db8ed2e50598385a583" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/b541d63b83532be55a020db8ed2e50598385a583", - "reference": "b541d63b83532be55a020db8ed2e50598385a583", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "require-dev": { - "symfony/process": "~3.4|~4.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Dotenv\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Registers environment variables from a .env file", - "homepage": "https://symfony.com", - "keywords": [ - "dotenv", - "env", - "environment" - ], - "time": "2019-04-01T07:32:59+00:00" - }, { "name": "symfony/event-dispatcher", "version": "v4.2.5", diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml index 18287ae..e6d5719 100644 --- a/phpdoc.dist.xml +++ b/phpdoc.dist.xml @@ -12,7 +12,7 @@ mg-bot-api-client-php.pages -