From ab706e3b610ecd7aba3efe18beeb7f08827b3d32 Mon Sep 17 00:00:00 2001 From: vnmedeiros Date: Fri, 12 Feb 2021 10:34:04 -0300 Subject: [PATCH] add PHP 8.0 on travis and platform overrides to compose install --- .travis.yml | 1 + composer.json | 7 ++- composer.lock | 138 +++++++++++++++++++++++++------------------------- 3 files changed, 76 insertions(+), 70 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d45456cc..7feb6842f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: true language: php php: +- 8.0 - 7.1 - 7.2 - 5.6 diff --git a/composer.json b/composer.json index c6480e1ff..f93e1e319 100644 --- a/composer.json +++ b/composer.json @@ -9,12 +9,15 @@ }, "require-dev": { "squizlabs/php_codesniffer": "^2.2 || ^3.0.2", - "wimg/php-compatibility": "*" + "phpcompatibility/php-compatibility": "*" }, "prefer-stable" : true, "minimum-stability": "dev", "config": { - "vendor-dir": "src/vendor" + "vendor-dir": "src/vendor", + "platform": { + "php": "7.2" + } }, "scripts": { "post-install-cmd": "\"src/vendor/bin/phpcs\" --config-set installed_paths src/vendor/wimg/php-compatibility", diff --git a/composer.lock b/composer.lock index 281a6c9da..cdefe23ac 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": "666f5355343e235ef29dd8eaae61ad43", + "content-hash": "977d4fe3cad3f53c6559a0cc2656dcc1", "packages": [ { "name": "kornrunner/blurhash", @@ -114,26 +114,26 @@ }, { "name": "smalot/pdfparser", - "version": "v0.17.1", + "version": "v0.18.1", "source": { "type": "git", "url": "https://github.com/smalot/pdfparser.git", - "reference": "dc1e42293e7774353003b754cce9c64dd9546c2d" + "reference": "b47f26425e32a814dc1ee55e3ce669b9e73b8458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smalot/pdfparser/zipball/dc1e42293e7774353003b754cce9c64dd9546c2d", - "reference": "dc1e42293e7774353003b754cce9c64dd9546c2d", + "url": "https://api.github.com/repos/smalot/pdfparser/zipball/b47f26425e32a814dc1ee55e3ce669b9e73b8458", + "reference": "b47f26425e32a814dc1ee55e3ce669b9e73b8458", "shasum": "" }, "require": { "ext-zlib": "*", "php": ">=5.6", - "symfony/polyfill-mbstring": "^1.18.1" + "symfony/polyfill-mbstring": "^1.18" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.16.3", - "symfony/phpunit-bridge": "^4.2.3" + "friendsofphp/php-cs-fixer": "^2.16", + "symfony/phpunit-bridge": "^5.2" }, "type": "library", "autoload": { @@ -160,20 +160,20 @@ "pdf", "text" ], - "time": "2020-10-29T20:59:50+00:00" + "time": "2021-01-05T08:52:07+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", "shasum": "" }, "require": { @@ -185,7 +185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -237,63 +237,12 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" } ], "packages-dev": [ { - "name": "squizlabs/php_codesniffer", - "version": "3.5.8", - "source": { - "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", - "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", - "shasum": "" - }, - "require": { - "ext-simplexml": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" - }, - "bin": [ - "bin/phpcs", - "bin/phpcbf" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Greg Sherwood", - "role": "lead" - } - ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", - "keywords": [ - "phpcs", - "standards" - ], - "time": "2020-10-23T02:01:07+00:00" - }, - { - "name": "wimg/php-compatibility", + "name": "phpcompatibility/php-compatibility", "version": "9.3.5", "source": { "type": "git", @@ -348,8 +297,58 @@ "phpcs", "standards" ], - "abandoned": "phpcompatibility/php-compatibility", "time": "2019-12-27T09:44:58+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.5.8", + "source": { + "type": "git", + "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "bin": [ + "bin/phpcs", + "bin/phpcbf" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "lead" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards" + ], + "time": "2020-10-23T02:01:07+00:00" } ], "aliases": [], @@ -359,5 +358,8 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], + "platform-overrides": { + "php": "7.2" + }, "plugin-api-version": "1.1.0" }