From 3733583eefad7cdbe2469d1970e79b6224be8c65 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 23 Apr 2019 19:08:53 +1000 Subject: [PATCH] Revert "Allow installing composer dependencies with PHP 7.3" (#2797) --- .travis.yml | 5 --- composer.json | 2 +- composer.lock | 100 +++++++++++++++++++++----------------------------- 3 files changed, 43 insertions(+), 64 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2388d2a288dd..193a92bfcd57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,8 @@ sudo: true # Prevent tests from taking more than 50 minutes group: deprecated-2017Q4 -matrix: - allow_failures: - - 7.3 - php: - 7.2 - - 7.3 addons: hosts: diff --git a/composer.json b/composer.json index e213073a5396..b17081a62d73 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "league/flysystem-rackspace": "~1.0", "league/fractal": "0.13.*", "maatwebsite/excel": "~2.0", - "mpdf/mpdf": "8.0.0", + "mpdf/mpdf": "7.1.0", "nesbot/carbon": "^1.25", "nwidart/laravel-modules": "1.*", "omnipay/authorizenet": "dev-solution-id as 2.5.0", diff --git a/composer.lock b/composer.lock index 464f022a5b69..3694f263aad5 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": "a92dbdbd860e34d18ef25393a70edcba", + "content-hash": "f1bdbf3d4e931ebd4abd3af608a16e7f", "packages": [ { "name": "abdala/omnipay-pagseguro", @@ -5322,30 +5322,29 @@ }, { "name": "mpdf/mpdf", - "version": "v8.0.0", + "version": "v7.1.0", "source": { "type": "git", "url": "https://github.com/mpdf/mpdf.git", - "reference": "c13ebc0fd5cc0613dfb1fd37d55a67859b92cf0c" + "reference": "8e3d0d7bf74f71d04904215fb487d01e924c469a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mpdf/mpdf/zipball/c13ebc0fd5cc0613dfb1fd37d55a67859b92cf0c", - "reference": "c13ebc0fd5cc0613dfb1fd37d55a67859b92cf0c", + "url": "https://api.github.com/repos/mpdf/mpdf/zipball/8e3d0d7bf74f71d04904215fb487d01e924c469a", + "reference": "8e3d0d7bf74f71d04904215fb487d01e924c469a", "shasum": "" }, "require": { "ext-gd": "*", "ext-mbstring": "*", "myclabs/deep-copy": "^1.7", - "paragonie/random_compat": "^1.4|^2.0|9.99.99", - "php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0", + "paragonie/random_compat": "^1.4|^2.0", + "php": "^5.6 || ~7.0.0 || ~7.1.0 || ~7.2.0", "psr/log": "^1.0", - "setasign/fpdi": "^2.1" + "setasign/fpdi": "1.6.*" }, "require-dev": { "mockery/mockery": "^0.9.5", - "mpdf/qrcode": "^1.0.0", "phpunit/phpunit": "^5.0", "squizlabs/php_codesniffer": "^2.7.0", "tracy/tracy": "^2.4" @@ -5358,7 +5357,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-development": "7.x-dev" + "dev-development": "7.0-dev" } }, "autoload": { @@ -5380,14 +5379,14 @@ "role": "Developer (retired)" } ], - "description": "PHP library generating PDF files from UTF-8 encoded HTML", + "description": "A PHP class to generate PDF files from HTML with Unicode/UTF-8 and CJK support", "homepage": "https://mpdf.github.io", "keywords": [ "pdf", "php", "utf-8" ], - "time": "2019-03-15T22:03:58+00:00" + "time": "2018-05-18T05:41:37+00:00" }, { "name": "mtdowling/cron-expression", @@ -5490,28 +5489,25 @@ }, { "name": "myclabs/deep-copy", - "version": "1.9.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72" + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", - "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "shasum": "" }, "require": { - "php": "^7.1" - }, - "replace": { - "myclabs/deep-copy": "self.version" + "php": "^5.6 || ^7.0" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "phpunit/phpunit": "^4.1" }, "type": "library", "autoload": { @@ -5534,7 +5530,7 @@ "object", "object graph" ], - "time": "2019-04-07T13:18:21+00:00" + "time": "2017-10-19T19:58:43+00:00" }, { "name": "nesbot/carbon", @@ -7591,16 +7587,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.18", + "version": "v2.0.17", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db" + "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0a58ef6e3146256cc3dc7cc393927bcc7d1b72db", - "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d", + "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", "shasum": "" }, "require": { @@ -7636,7 +7632,7 @@ "pseudorandom", "random" ], - "time": "2019-01-03T20:59:08+00:00" + "time": "2018-07-04T16:31:37+00:00" }, { "name": "patricktalmadge/bootstrapper", @@ -8210,16 +8206,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -8253,7 +8249,7 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psy/psysh", @@ -8780,39 +8776,32 @@ }, { "name": "setasign/fpdi", - "version": "v2.2.0", + "version": "1.6.2", "source": { "type": "git", "url": "https://github.com/Setasign/FPDI.git", - "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f" + "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Setasign/FPDI/zipball/3c266002f8044f61b17329f7cd702d44d73f0f7f", - "reference": "3c266002f8044f61b17329f7cd702d44d73f0f7f", + "url": "https://api.github.com/repos/Setasign/FPDI/zipball/a6ad58897a6d97cc2d2cd2adaeda343b25a368ea", + "reference": "a6ad58897a6d97cc2d2cd2adaeda343b25a368ea", "shasum": "" }, - "require": { - "ext-zlib": "*", - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "~5.7", - "setasign/fpdf": "~1.8", - "setasign/tfpdf": "1.25", - "tecnickcom/tcpdf": "~6.2" - }, "suggest": { - "setasign/fpdf": "FPDI will extend this class but as it is also possible to use TCPDF or tFPDF as an alternative. There's no fixed dependency configured.", + "setasign/fpdf": "FPDI will extend this class but as it is also possible to use \"tecnickcom/tcpdf\" as an alternative there's no fixed dependency configured.", "setasign/fpdi-fpdf": "Use this package to automatically evaluate dependencies to FPDF.", - "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF.", - "setasign/fpdi-tfpdf": "Use this package to automatically evaluate dependencies to tFPDF." + "setasign/fpdi-tcpdf": "Use this package to automatically evaluate dependencies to TCPDF." }, "type": "library", "autoload": { - "psr-4": { - "setasign\\Fpdi\\": "src/" - } + "classmap": [ + "filters/", + "fpdi.php", + "fpdf_tpl.php", + "fpdi_pdf_parser.php", + "pdf_context.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -8823,11 +8812,6 @@ "name": "Jan Slabon", "email": "jan.slabon@setasign.com", "homepage": "https://www.setasign.com" - }, - { - "name": "Maximilian Kresse", - "email": "maximilian.kresse@setasign.com", - "homepage": "https://www.setasign.com" } ], "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.", @@ -8837,7 +8821,7 @@ "fpdi", "pdf" ], - "time": "2019-01-30T14:11:19+00:00" + "time": "2017-05-11T14:25:49+00:00" }, { "name": "simshaun/recurr",