From ee61de62fafbd529e5563d58a5e59a4b5e8c8b13 Mon Sep 17 00:00:00 2001 From: Nabeel S Date: Tue, 11 May 2021 18:46:21 -0400 Subject: [PATCH] Update to PHP 8 (#1118) * Update to PHP 8 * Update composer file * Remove PHP 8 incompatible library * Remove PHP 8 incompatible library --- .github/workflows/build.yml | 2 +- composer.json | 5 +- composer.lock | 157 +++++++++++------------------------- config/app.php | 1 - 4 files changed, 49 insertions(+), 116 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c4b408c1..12330b10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: strategy: fail-fast: true matrix: - php-versions: ['7.3', '7.4'] + php-versions: ['7.3', '7.4', '8.0'] name: PHP ${{ matrix.php-versions }} env: extensions: intl, pcov, mbstring diff --git a/composer.json b/composer.json index 16203195..87964eb7 100755 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "guzzlehttp/guzzle": "~6.5", "hashids/hashids": "^4.1.0", "igaster/laravel-theme": "^2.0", - "intervention/image": "2.4.*", + "intervention/image": "^2.4", "irazasyed/laravel-gamp": "^1.8", "jmikola/geojson": "1.0.*", "joshbrw/laravel-module-installer": "^2.0", @@ -49,7 +49,6 @@ "pragmarx/version": ">=v1.2.3", "prettus/l5-repository": "~2.7.0", "santigarcor/laratrust": "~6.3", - "sebastiaanluca/laravel-helpers": "~6.0", "semver/semver": "~1.1.0", "spatie/valuestore": "~1.2", "symfony/polyfill-iconv": "~1.22.0", @@ -61,7 +60,7 @@ "madnest/madzipper": "^1.1.0", "elcobvg/laravel-opcache": "^0.4.1", "laravel/legacy-factories": "^1.1", - "fakerphp/faker": "^1.13", + "fakerphp/faker": "^v1.14", "wildbit/swiftmailer-postmark": "^3.3" }, "require-dev": { diff --git a/composer.lock b/composer.lock index e8d057cb..6e763247 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": "4180601e7a77313a007604954b01f071", + "content-hash": "96fa30e3513fff205da4a374dd799994", "packages": [ { "name": "akaunting/money", @@ -2059,16 +2059,16 @@ }, { "name": "facade/ignition", - "version": "2.8.4", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "87fb348dab0ae1a7c206c3e902a5a44ba541742f" + "reference": "e7db3b601ce742568b92648818ef903904d20164" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/87fb348dab0ae1a7c206c3e902a5a44ba541742f", - "reference": "87fb348dab0ae1a7c206c3e902a5a44ba541742f", + "url": "https://api.github.com/repos/facade/ignition/zipball/e7db3b601ce742568b92648818ef903904d20164", + "reference": "e7db3b601ce742568b92648818ef903904d20164", "shasum": "" }, "require": { @@ -2132,7 +2132,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, - "time": "2021-04-29T13:55:26+00:00" + "time": "2021-05-05T06:45:12+00:00" }, { "name": "facade/ignition-contracts", @@ -2783,16 +2783,16 @@ }, { "name": "intervention/image", - "version": "2.4.3", + "version": "2.5.1", "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "5f5e1c8768d6bb41a7f23706af754b92541de485" + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/5f5e1c8768d6bb41a7f23706af754b92541de485", - "reference": "5f5e1c8768d6bb41a7f23706af754b92541de485", + "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", "shasum": "" }, "require": { @@ -2851,9 +2851,9 @@ ], "support": { "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/2.4.3" + "source": "https://github.com/Intervention/image/tree/master" }, - "time": "2019-05-31T17:08:36+00:00" + "time": "2019-11-02T09:15:47+00:00" }, { "name": "irazasyed/laravel-gamp", @@ -3295,16 +3295,16 @@ }, { "name": "laravel/framework", - "version": "v8.40.0", + "version": "v8.41.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "a654897ad7f97aea9d7ef292803939798c4a02a4" + "reference": "05417155d886df8710e55c84e12622b52d83c47c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/a654897ad7f97aea9d7ef292803939798c4a02a4", - "reference": "a654897ad7f97aea9d7ef292803939798c4a02a4", + "url": "https://api.github.com/repos/laravel/framework/zipball/05417155d886df8710e55c84e12622b52d83c47c", + "reference": "05417155d886df8710e55c84e12622b52d83c47c", "shasum": "" }, "require": { @@ -3412,7 +3412,7 @@ "phpunit/phpunit": "Required to use assertions and run tests (^8.5.8|^9.3.3).", "predis/predis": "Required to use the predis connector (^1.1.2).", "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", - "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0).", + "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0).", "symfony/cache": "Required to PSR-6 cache bridge (^5.1.4).", "symfony/filesystem": "Required to enable support for relative symbolic links (^5.1.4).", "symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).", @@ -3459,7 +3459,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2021-04-28T14:38:56+00:00" + "time": "2021-05-11T14:00:02+00:00" }, { "name": "laravel/helpers", @@ -3704,16 +3704,16 @@ }, { "name": "league/commonmark", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "19a9673b833cc37770439097b381d86cd125bfe8" + "reference": "2651c497f005de305c7ba3f232cbd87b8c00ee8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/19a9673b833cc37770439097b381d86cd125bfe8", - "reference": "19a9673b833cc37770439097b381d86cd125bfe8", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2651c497f005de305c7ba3f232cbd87b8c00ee8c", + "reference": "2651c497f005de305c7ba3f232cbd87b8c00ee8c", "shasum": "" }, "require": { @@ -3801,7 +3801,7 @@ "type": "tidelift" } ], - "time": "2021-05-01T19:00:49+00:00" + "time": "2021-05-08T16:08:00+00:00" }, { "name": "league/csv", @@ -4230,16 +4230,16 @@ }, { "name": "markrogoyski/math-php", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/markrogoyski/math-php.git", - "reference": "0dc59b45943381f0c71dd7e8e2393bd11f533d44" + "reference": "894b01ab517ee0a7bd7f640f792e7ad436187f93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/markrogoyski/math-php/zipball/0dc59b45943381f0c71dd7e8e2393bd11f533d44", - "reference": "0dc59b45943381f0c71dd7e8e2393bd11f533d44", + "url": "https://api.github.com/repos/markrogoyski/math-php/zipball/894b01ab517ee0a7bd7f640f792e7ad436187f93", + "reference": "894b01ab517ee0a7bd7f640f792e7ad436187f93", "shasum": "" }, "require": { @@ -4302,9 +4302,9 @@ ], "support": { "issues": "https://github.com/markrogoyski/math-php/issues", - "source": "https://github.com/markrogoyski/math-php/tree/v1.10.0" + "source": "https://github.com/markrogoyski/math-php/tree/v1.11.0" }, - "time": "2020-12-19T19:41:05+00:00" + "time": "2021-05-09T05:40:47+00:00" }, { "name": "monolog/monolog", @@ -4596,16 +4596,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.4", + "version": "v4.10.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", "shasum": "" }, "require": { @@ -4646,9 +4646,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" }, - "time": "2020-12-20T10:01:03+00:00" + "time": "2021-05-03T19:11:20+00:00" }, { "name": "nwidart/laravel-modules", @@ -6026,76 +6026,6 @@ ], "time": "2021-03-03T13:34:32+00:00" }, - { - "name": "sebastiaanluca/laravel-helpers", - "version": "6.0.0", - "source": { - "type": "git", - "url": "https://github.com/sebastiaanluca/laravel-helpers.git", - "reference": "379748c1b4c4e1576a561383f746578fde133fcd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastiaanluca/laravel-helpers/zipball/379748c1b4c4e1576a561383f746578fde133fcd", - "reference": "379748c1b4c4e1576a561383f746578fde133fcd", - "shasum": "" - }, - "require": { - "laravel/framework": "^7.0|^8.0", - "php": "^7.3" - }, - "require-dev": { - "kint-php/kint": "^3.3", - "nesbot/carbon": "^1.0|^2.0", - "orchestra/testbench": "^5.1|^6.0", - "phpunit/phpunit": "^8.5" - }, - "suggest": { - "kint-php/kint": "A powerful and modern PHP debugging tool. Required for the debug collection macros.", - "nesbot/carbon": "A simple PHP API extension for DateTime. Required for the carbonize collection macro." - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "SebastiaanLuca\\Helpers\\Collections\\CollectionMacrosServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "SebastiaanLuca\\Helpers\\": "src" - }, - "files": [ - "src/Methods/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Sebastiaan Luca", - "email": "hello@sebastiaanluca.com", - "homepage": "https://www.sebastiaanluca.com", - "role": "Author" - } - ], - "description": "An extensive set of Laravel framework helper functions and collection macros.", - "homepage": "https://github.com/sebastiaanluca/laravel-helpers", - "keywords": [ - "collections", - "helpers", - "laravel", - "macros" - ], - "support": { - "issues": "https://github.com/sebastiaanluca/laravel-helpers/issues", - "source": "https://github.com/sebastiaanluca/laravel-helpers/tree/6.0.0" - }, - "time": "2020-10-19T15:36:34+00:00" - }, { "name": "seld/jsonlint", "version": "1.8.3", @@ -9939,16 +9869,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.18.6", + "version": "v2.19.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "5fed214993e7863cef88a08f214344891299b9e4" + "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5fed214993e7863cef88a08f214344891299b9e4", - "reference": "5fed214993e7863cef88a08f214344891299b9e4", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5b8a9d852b292c2f8a035200fa6844b1f82300b", + "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b", "shasum": "" }, "require": { @@ -9996,6 +9926,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.19-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -10031,7 +9966,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.6" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.0" }, "funding": [ { @@ -10039,7 +9974,7 @@ "type": "github" } ], - "time": "2021-04-19T19:45:11+00:00" + "time": "2021-05-03T21:43:24+00:00" }, { "name": "hamcrest/hamcrest-php", diff --git a/config/app.php b/config/app.php index 8e264b64..ed024654 100755 --- a/config/app.php +++ b/config/app.php @@ -66,7 +66,6 @@ return [ Collective\Html\HtmlServiceProvider::class, Laracasts\Flash\FlashServiceProvider::class, Prettus\Repository\Providers\RepositoryServiceProvider::class, - SebastiaanLuca\Helpers\Collections\CollectionMacrosServiceProvider::class, Irazasyed\LaravelGAMP\LaravelGAMPServiceProvider::class, Igaster\LaravelTheme\themeServiceProvider::class, Nwidart\Modules\LaravelModulesServiceProvider::class,