diff --git a/.idea/php.xml b/.idea/php.xml index 7694ddd..a38beb5 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -147,4 +147,9 @@ + + + + + \ No newline at end of file diff --git a/.rnd b/.rnd index 13f85ba..68ec130 100644 Binary files a/.rnd and b/.rnd differ diff --git a/composer.json b/composer.json index 932af6f..d28d169 100644 --- a/composer.json +++ b/composer.json @@ -12,16 +12,9 @@ "coraxster/flysystem-aws-s3-v3-minio": "^1.0", "fideloper/proxy": "^4.0", "kalnoy/nestedset": "^5.0", -<<<<<<< HEAD "laravel/framework": "^8.0", "laravel/passport": "^10", "laravel/tinker": "^2.0", -======= - "laravel/framework": "^6.2", - "laravel/passport": "^7.3", - "laravel/tinker": "^1.0", - "lcobucci/jwt": "3.3.3", ->>>>>>> dev "maatwebsite/excel": "^3.1", "spatie/laravel-medialibrary": "^8.0.0", "wm/blog": "dev-master", diff --git a/composer.lock b/composer.lock index 998dd19..57db8f0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,6 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], -<<<<<<< HEAD "content-hash": "8f5498d899ee8ca761de0be543d89e5c", "packages": [ { @@ -19,22 +18,6 @@ "type": "zip", "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bfd16503bd71491e654483773efd23c431817710", "reference": "bfd16503bd71491e654483773efd23c431817710", -======= - "content-hash": "970f3cb1cc47cef0da6491d06289bbea", - "packages": [ - { - "name": "aws/aws-sdk-php", - "version": "3.164.0", - "source": { - "type": "git", - "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "39ecf57d828eb50ab23fd70255a68b8996392ac9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/39ecf57d828eb50ab23fd70255a68b8996392ac9", - "reference": "39ecf57d828eb50ab23fd70255a68b8996392ac9", ->>>>>>> dev "shasum": "" }, "require": { @@ -109,7 +92,6 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", -<<<<<<< HEAD "source": "https://github.com/aws/aws-sdk-php/tree/3.164.1" }, "time": "2020-12-01T04:29:55+00:00" @@ -169,11 +151,6 @@ } ], "time": "2020-08-18T23:57:15+00:00" -======= - "source": "https://github.com/aws/aws-sdk-php/tree/3.164.0" - }, - "time": "2020-11-24T19:18:22+00:00" ->>>>>>> dev }, { "name": "coraxster/flysystem-aws-s3-v3-minio", @@ -581,7 +558,6 @@ }, { "name": "dragonmantank/cron-expression", -<<<<<<< HEAD "version": "v3.1.0", "source": { "type": "git", @@ -606,25 +582,6 @@ "phpstan/phpstan": "^0.12", "phpstan/phpstan-webmozart-assert": "^0.12.7", "phpunit/phpunit": "^7.0|^8.0|^9.0" -======= - "version": "v2.3.1", - "source": { - "type": "git", - "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "65b2d8ee1f10915efb3b55597da3404f096acba2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2", - "reference": "65b2d8ee1f10915efb3b55597da3404f096acba2", - "shasum": "" - }, - "require": { - "php": "^7.0|^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.4|^7.0|^8.0|^9.0" ->>>>>>> dev }, "type": "library", "autoload": { @@ -650,11 +607,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", -<<<<<<< HEAD "source": "https://github.com/dragonmantank/cron-expression/tree/v3.1.0" -======= - "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1" ->>>>>>> dev }, "funding": [ { @@ -662,11 +615,7 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-11-24T19:55:57+00:00" -======= - "time": "2020-10-13T00:52:37+00:00" ->>>>>>> dev }, { "name": "egulias/email-validator", @@ -994,7 +943,6 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", -<<<<<<< HEAD "source": "https://github.com/guzzle/guzzle/tree/7.2.0" }, "funding": [ @@ -1016,11 +964,6 @@ } ], "time": "2020-10-10T11:47:56+00:00" -======= - "source": "https://github.com/guzzle/guzzle/tree/6.5" - }, - "time": "2020-06-16T21:01:06+00:00" ->>>>>>> dev }, { "name": "guzzlehttp/promises", @@ -1223,112 +1166,9 @@ "support": { "issues": "https://github.com/Intervention/image/issues", "source": "https://github.com/Intervention/image/tree/master" -<<<<<<< HEAD - }, - "time": "2019-11-02T09:15:47+00:00" -======= }, "time": "2019-11-02T09:15:47+00:00" }, - { - "name": "jakub-onderka/php-console-color", - "version": "v0.2", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", - "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "1.0", - "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "~4.3", - "squizlabs/php_codesniffer": "1.*" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleColor\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com" - } - ], - "support": { - "issues": "https://github.com/JakubOnderka/PHP-Console-Color/issues", - "source": "https://github.com/JakubOnderka/PHP-Console-Color/tree/master" - }, - "abandoned": "php-parallel-lint/php-console-color", - "time": "2018-09-29T17:23:10+00:00" - }, - { - "name": "jakub-onderka/php-console-highlighter", - "version": "v0.4", - "source": { - "type": "git", - "url": "https://github.com/JakubOnderka/PHP-Console-Highlighter.git", - "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Highlighter/zipball/9f7a229a69d52506914b4bc61bfdb199d90c5547", - "reference": "9f7a229a69d52506914b4bc61bfdb199d90c5547", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "jakub-onderka/php-console-color": "~0.2", - "php": ">=5.4.0" - }, - "require-dev": { - "jakub-onderka/php-code-style": "~1.0", - "jakub-onderka/php-parallel-lint": "~1.0", - "jakub-onderka/php-var-dump-check": "~0.1", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "JakubOnderka\\PhpConsoleHighlighter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jakub Onderka", - "email": "acci@acci.cz", - "homepage": "http://www.acci.cz/" - } - ], - "description": "Highlight PHP code in terminal", - "support": { - "issues": "https://github.com/JakubOnderka/PHP-Console-Highlighter/issues", - "source": "https://github.com/JakubOnderka/PHP-Console-Highlighter/tree/master" - }, - "abandoned": "php-parallel-lint/php-console-highlighter", - "time": "2018-09-29T18:48:56+00:00" ->>>>>>> dev - }, { "name": "kalnoy/nestedset", "version": "v5.0.2", @@ -1394,55 +1234,31 @@ }, { "name": "laravel/framework", -<<<<<<< HEAD - "version": "v8.16.1", - "source": { - "type": "git", - "url": "https://github.com/laravel/framework.git", - "reference": "f7dfc22e6c42e9ed4dda14c05814349af6943206" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f7dfc22e6c42e9ed4dda14c05814349af6943206", - "reference": "f7dfc22e6c42e9ed4dda14c05814349af6943206", -======= - "version": "v6.20.5", + "version": "v8.17.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "1ba4354b0263a7f97d1de1323aab21f73b38dc4d" + "reference": "09bd79531d3f958f02fa34f1f14197b1716ef29b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/1ba4354b0263a7f97d1de1323aab21f73b38dc4d", - "reference": "1ba4354b0263a7f97d1de1323aab21f73b38dc4d", ->>>>>>> dev + "url": "https://api.github.com/repos/laravel/framework/zipball/09bd79531d3f958f02fa34f1f14197b1716ef29b", + "reference": "09bd79531d3f958f02fa34f1f14197b1716ef29b", "shasum": "" }, "require": { "doctrine/inflector": "^1.4|^2.0", -<<<<<<< HEAD "dragonmantank/cron-expression": "^3.0.2", -======= - "dragonmantank/cron-expression": "^2.3.1", ->>>>>>> dev "egulias/email-validator": "^2.1.10", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", "league/commonmark": "^1.3", "league/flysystem": "^1.1", -<<<<<<< HEAD "monolog/monolog": "^2.0", "nesbot/carbon": "^2.31", "opis/closure": "^3.6", "php": "^7.3|^8.0", -======= - "monolog/monolog": "^1.12|^2.0", - "nesbot/carbon": "^2.31", - "opis/closure": "^3.6", - "php": "^7.2.5|^8.0", ->>>>>>> dev "psr/container": "^1.0", "psr/simple-cache": "^1.0", "ramsey/uuid": "^4.0", @@ -1501,7 +1317,6 @@ }, "require-dev": { "aws/aws-sdk-php": "^3.155", -<<<<<<< HEAD "doctrine/dbal": "^2.6|^3.0", "filp/whoops": "^2.8", "guzzlehttp/guzzle": "^6.5.5|^7.0.1", @@ -1510,27 +1325,12 @@ "orchestra/testbench-core": "^6.5", "pda/pheanstalk": "^4.0", "phpunit/phpunit": "^8.5.8|^9.3.3", -======= - "doctrine/dbal": "^2.6", - "filp/whoops": "^2.8", - "guzzlehttp/guzzle": "^6.3.1|^7.0.1", - "league/flysystem-cached-adapter": "^1.0", - "mockery/mockery": "~1.3.3|^1.4.2", - "moontoast/math": "^1.1", - "orchestra/testbench-core": "^4.8", - "pda/pheanstalk": "^4.0", - "phpunit/phpunit": "^7.5.15|^8.4|^9.3.3", ->>>>>>> dev "predis/predis": "^1.1.1", "symfony/cache": "^5.1" }, "suggest": { "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).", -<<<<<<< HEAD "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6|^3.0).", -======= - "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", ->>>>>>> dev "ext-ftp": "Required to use the Flysystem FTP driver.", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", "ext-memcached": "Required to use the memcache cache driver.", @@ -1539,11 +1339,7 @@ "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "filp/whoops": "Required for friendly error pages in development (^2.8).", -<<<<<<< HEAD "guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).", -======= - "guzzlehttp/guzzle": "Required to use the Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0.1).", ->>>>>>> dev "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).", "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).", @@ -1601,11 +1397,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, -<<<<<<< HEAD - "time": "2020-11-25T15:01:02+00:00" -======= - "time": "2020-11-24T16:12:27+00:00" ->>>>>>> dev + "time": "2020-12-01T15:01:58+00:00" }, { "name": "laravel/passport", @@ -1682,11 +1474,7 @@ "issues": "https://github.com/laravel/passport/issues", "source": "https://github.com/laravel/passport" }, -<<<<<<< HEAD "time": "2020-11-26T07:57:30+00:00" -======= - "time": "2019-10-08T16:45:24+00:00" ->>>>>>> dev }, { "name": "laravel/tinker", @@ -1752,7 +1540,6 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", -<<<<<<< HEAD "source": "https://github.com/laravel/tinker/tree/v2.5.0" }, "time": "2020-10-29T13:07:12+00:00" @@ -1817,11 +1604,6 @@ } ], "time": "2020-08-27T18:56:02+00:00" -======= - "source": "https://github.com/laravel/tinker/tree/v1.0.10" - }, - "time": "2019-08-07T15:10:45+00:00" ->>>>>>> dev }, { "name": "lcobucci/jwt", @@ -1885,11 +1667,7 @@ ], "support": { "issues": "https://github.com/lcobucci/jwt/issues", -<<<<<<< HEAD "source": "https://github.com/lcobucci/jwt/tree/4.0.0" -======= - "source": "https://github.com/lcobucci/jwt/tree/3.3.3" ->>>>>>> dev }, "funding": [ { @@ -1901,11 +1679,7 @@ "type": "patreon" } ], -<<<<<<< HEAD "time": "2020-11-25T02:06:12+00:00" -======= - "time": "2020-08-20T13:22:28+00:00" ->>>>>>> dev }, { "name": "league/commonmark", @@ -2354,7 +2128,6 @@ ], "support": { "issues": "https://github.com/thephpleague/oauth2-server/issues", -<<<<<<< HEAD "source": "https://github.com/thephpleague/oauth2-server/tree/8.2.2" }, "funding": [ @@ -2364,11 +2137,6 @@ } ], "time": "2020-11-30T10:10:52+00:00" -======= - "source": "https://github.com/thephpleague/oauth2-server/tree/master" - }, - "time": "2019-05-05T09:22:01+00:00" ->>>>>>> dev }, { "name": "maatwebsite/excel", @@ -3235,7 +3003,6 @@ "homepage": "https://paragonie.com" } ], -<<<<<<< HEAD "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ "csprng", @@ -3249,14 +3016,6 @@ "source": "https://github.com/paragonie/random_compat" }, "time": "2020-10-15T08:29:30+00:00" -======= - "description": "A PHP-Wrapper around the Ghostscript-CLI", - "support": { - "issues": "https://github.com/heiglandreas/Org_Heigl_Ghostscript/issues", - "source": "https://github.com/heiglandreas/Org_Heigl_Ghostscript/tree/2.3.2" - }, - "time": "2020-09-23T05:00:00+00:00" ->>>>>>> dev }, { "name": "php-http/message-factory", @@ -3307,18 +3066,10 @@ "uri" ], "support": { -<<<<<<< HEAD "issues": "https://github.com/php-http/message-factory/issues", "source": "https://github.com/php-http/message-factory/tree/master" }, "time": "2015-12-19T14:08:53+00:00" -======= - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/random_compat/issues", - "source": "https://github.com/paragonie/random_compat" - }, - "time": "2018-07-02T15:55:56+00:00" ->>>>>>> dev }, { "name": "phpoffice/phpspreadsheet", @@ -3652,65 +3403,8 @@ "time": "2017-02-14T16:28:37+00:00" }, { -<<<<<<< HEAD "name": "psr/event-dispatcher", "version": "1.0.0", -======= - "name": "psr/http-client", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "shasum": "" - }, - "require": { - "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Client\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP clients", - "homepage": "https://github.com/php-fig/http-client", - "keywords": [ - "http", - "http-client", - "psr", - "psr-18" - ], - "support": { - "source": "https://github.com/php-fig/http-client/tree/master" - }, - "time": "2020-06-29T06:28:15+00:00" - }, - { - "name": "psr/http-factory", - "version": "1.0.1", ->>>>>>> dev "source": { "type": "git", "url": "https://github.com/php-fig/event-dispatcher.git", @@ -3753,16 +3447,10 @@ "psr-14" ], "support": { -<<<<<<< HEAD "issues": "https://github.com/php-fig/event-dispatcher/issues", "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" }, "time": "2019-01-08T18:20:26+00:00" -======= - "source": "https://github.com/php-fig/http-factory/tree/master" - }, - "time": "2019-04-30T12:38:16+00:00" ->>>>>>> dev }, { "name": "psr/http-client", @@ -3812,15 +3500,9 @@ "psr-18" ], "support": { -<<<<<<< HEAD "source": "https://github.com/php-fig/http-client/tree/master" }, "time": "2020-06-29T06:28:15+00:00" -======= - "source": "https://github.com/php-fig/http-message/tree/master" - }, - "time": "2016-08-06T14:39:51+00:00" ->>>>>>> dev }, { "name": "psr/http-factory", @@ -4103,15 +3785,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", -<<<<<<< HEAD "source": "https://github.com/bobthecow/psysh/tree/master" }, "time": "2020-05-03T19:32:03+00:00" -======= - "source": "https://github.com/bobthecow/psysh/tree/v0.9.12" - }, - "time": "2019-12-06T14:19:43+00:00" ->>>>>>> dev }, { "name": "ralouphie/getallheaders", @@ -4312,7 +3988,6 @@ "support": { "issues": "https://github.com/ramsey/uuid/issues", "rss": "https://github.com/ramsey/uuid/releases.atom", -<<<<<<< HEAD "source": "https://github.com/ramsey/uuid" }, "funding": [ @@ -4322,12 +3997,6 @@ } ], "time": "2020-08-18T17:17:46+00:00" -======= - "source": "https://github.com/ramsey/uuid", - "wiki": "https://github.com/ramsey/uuid/wiki" - }, - "time": "2020-02-21T04:36:14+00:00" ->>>>>>> dev }, { "name": "spatie/image", @@ -4452,7 +4121,6 @@ }, { "name": "spatie/laravel-medialibrary", -<<<<<<< HEAD "version": "8.10.1", "source": { "type": "git", @@ -4463,24 +4131,11 @@ "type": "zip", "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/72b408972ba0b994eb52f39d38169621699e549b", "reference": "72b408972ba0b994eb52f39d38169621699e549b", -======= - "version": "7.19.5", - "source": { - "type": "git", - "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "70082a769683cf192d4dc987392042cb502b9305" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/70082a769683cf192d4dc987392042cb502b9305", - "reference": "70082a769683cf192d4dc987392042cb502b9305", ->>>>>>> dev "shasum": "" }, "require": { "ext-fileinfo": "*", "ext-json": "*", -<<<<<<< HEAD "illuminate/bus": "^6.18|^7.0|^8.0", "illuminate/console": "^6.18|^7.0|^8.0", "illuminate/database": "^6.18|^7.0|^8.0", @@ -4489,19 +4144,9 @@ "league/flysystem": "^1.0.64", "maennchen/zipstream-php": "^1.0|^2.0", "php": "^7.4", -======= - "illuminate/bus": "~5.8.35|^6.0|^7.0|^8.0", - "illuminate/console": "~5.8.35|^6.0|^7.0|^8.0", - "illuminate/database": "~5.8.35|^6.0|^7.0|^8.0", - "illuminate/pipeline": "~5.8.35|^6.0|^7.0|^8.0", - "illuminate/support": "~5.8.35|^6.0|^7.0|^8.0", - "league/flysystem": "^1.0.8", - "maennchen/zipstream-php": "^1.0|^2.0", - "php": "^7.2", ->>>>>>> dev "spatie/image": "^1.4.0", "spatie/temporary-directory": "^1.1", - "symfony/console": "^4.4|^5.1" + "symfony/console": "^4.4|^5.0" }, "conflict": { "php-ffmpeg/php-ffmpeg": "<0.6.1" @@ -4510,7 +4155,6 @@ "aws/aws-sdk-php": "^3.133.11", "doctrine/dbal": "^2.5.2", "ext-pdo_sqlite": "*", -<<<<<<< HEAD "ext-zip": "*", "guzzlehttp/guzzle": "^6.3|^7.0", "league/flysystem-aws-s3-v3": "^1.0.23", @@ -4520,14 +4164,6 @@ "phpunit/phpunit": "^9.1", "spatie/pdf-to-image": "^2.0", "spatie/phpunit-snapshot-assertions": "^4.0" -======= - "guzzlehttp/guzzle": "^6.3|^7.0.1", - "league/flysystem-aws-s3-v3": "^1.0.13", - "mockery/mockery": "^1.0", - "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0", - "phpunit/phpunit": "^8.0|^9.0", - "spatie/phpunit-snapshot-assertions": "^2.0" ->>>>>>> dev }, "suggest": { "league/flysystem-aws-s3-v3": "Required to use AWS S3 file storage", @@ -4573,51 +4209,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", -<<<<<<< HEAD "source": "https://github.com/spatie/laravel-medialibrary/tree/8.10.1" -======= - "source": "https://github.com/spatie/laravel-medialibrary/tree/7.19.5" - }, - "funding": [ - { - "url": "https://spatie.be/open-source/support-us", - "type": "custom" - }, - { - "url": "https://github.com/spatie", - "type": "github" - } - ], - "time": "2020-11-04T21:08:45+00:00" - }, - { - "name": "spatie/pdf-to-image", - "version": "v2.x-dev", - "source": { - "type": "git", - "url": "https://github.com/spatie/pdf-to-image.git", - "reference": "6718a89065c34dfadfbb2ca61eb1c3e6a956e503" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/spatie/pdf-to-image/zipball/6718a89065c34dfadfbb2ca61eb1c3e6a956e503", - "reference": "6718a89065c34dfadfbb2ca61eb1c3e6a956e503", - "shasum": "" - }, - "require": { - "org_heigl/ghostscript": "^2.2", - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.2", - "spatie/temporary-directory": "^1.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Spatie\\PdfToImage\\": "src" - } ->>>>>>> dev }, "funding": [ { @@ -4629,24 +4221,7 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-05T21:54:57+00:00" -======= - "description": "Convert a pdf to an image", - "homepage": "https://github.com/spatie/pdf-to-image", - "keywords": [ - "convert", - "image", - "pdf", - "pdf-to-image", - "spatie" - ], - "support": { - "issues": "https://github.com/spatie/pdf-to-image/issues", - "source": "https://github.com/spatie/pdf-to-image/tree/v2" - }, - "time": "2017-06-20T05:58:45+00:00" ->>>>>>> dev }, { "name": "spatie/temporary-directory", @@ -4767,7 +4342,6 @@ }, { "name": "symfony/console", -<<<<<<< HEAD "version": "v5.2.0", "source": { "type": "git", @@ -4778,18 +4352,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/console/zipball/3e0564fb08d44a98bd5f1960204c958e57bd586b", "reference": "3e0564fb08d44a98bd5f1960204c958e57bd586b", -======= - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "c8e37f6928c19816437a4dd7bf16e3bd79941470" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c8e37f6928c19816437a4dd7bf16e3bd79941470", - "reference": "c8e37f6928c19816437a4dd7bf16e3bd79941470", ->>>>>>> dev "shasum": "" }, "require": { @@ -4850,7 +4412,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", -<<<<<<< HEAD "keywords": [ "cli", "command line", @@ -4859,10 +4420,6 @@ ], "support": { "source": "https://github.com/symfony/console/tree/v5.2.0" -======= - "support": { - "source": "https://github.com/symfony/console/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -4878,11 +4435,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-28T11:24:18+00:00" -======= - "time": "2020-11-28T10:15:42+00:00" ->>>>>>> dev }, { "name": "symfony/css-selector", @@ -4950,39 +4503,35 @@ "time": "2020-10-28T21:31:18+00:00" }, { -<<<<<<< HEAD -======= - "name": "symfony/debug", - "version": "v4.4.17", + "name": "symfony/deprecation-contracts", + "version": "v2.2.0", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "65fe7b49868378319b82da3035fb30801b931c47" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/65fe7b49868378319b82da3035fb30801b931c47", - "reference": "65fe7b49868378319b82da3035fb30801b931c47", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/log": "~1.0", - "symfony/polyfill-php80": "^1.15" - }, - "conflict": { - "symfony/http-kernel": "<3.4" - }, - "require-dev": { - "symfony/http-kernel": "^3.4|^4.0|^5.0" + "php": ">=7.1" }, "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" }, - "exclude-from-classmap": [ - "/Tests/" + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4991,18 +4540,18 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.17" + "source": "https://github.com/symfony/deprecation-contracts/tree/master" }, "funding": [ { @@ -5018,79 +4567,10 @@ "type": "tidelift" } ], - "time": "2020-10-28T20:42:29+00:00" - }, - { ->>>>>>> dev - "name": "symfony/deprecation-contracts", - "version": "v2.2.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "files": [ - "function.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "A generic function and convention to trigger deprecation notices", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2020-09-07T11:33:47+00:00" }, { "name": "symfony/error-handler", -<<<<<<< HEAD "version": "v5.2.0", "source": { "type": "git", @@ -5101,18 +4581,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/error-handler/zipball/289008c5be039e39908d33ae0a8ac99be1210bba", "reference": "289008c5be039e39908d33ae0a8ac99be1210bba", -======= - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/error-handler.git", - "reference": "b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf", - "reference": "b0887cf8fc692eef2a4cf11cee3c5f5eb93fcfdf", ->>>>>>> dev "shasum": "" }, "require": { @@ -5152,11 +4620,7 @@ "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/error-handler/tree/v5.2.0" -======= - "source": "https://github.com/symfony/error-handler/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -5172,7 +4636,6 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-10-28T21:46:03+00:00" }, { @@ -5187,22 +4650,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/aa13a09811e6d2ad43f8fb336bebdb7691d85d3c", "reference": "aa13a09811e6d2ad43f8fb336bebdb7691d85d3c", -======= - "time": "2020-10-28T20:42:29+00:00" - }, - { - "name": "symfony/event-dispatcher", - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f029d6f21eac61ab23198e7aca40e7638e8c8924" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f029d6f21eac61ab23198e7aca40e7638e8c8924", - "reference": "f029d6f21eac61ab23198e7aca40e7638e8c8924", ->>>>>>> dev "shasum": "" }, "require": { @@ -5258,11 +4705,7 @@ "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.0" -======= - "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -5278,11 +4721,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-01T16:14:45+00:00" -======= - "time": "2020-10-31T22:44:29+00:00" ->>>>>>> dev }, { "name": "symfony/event-dispatcher-contracts", @@ -5345,11 +4784,7 @@ "standards" ], "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" -======= - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9" ->>>>>>> dev }, "funding": [ { @@ -5365,7 +4800,6 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-09-07T11:33:47+00:00" }, { @@ -5380,22 +4814,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/finder/zipball/fd8305521692f27eae3263895d1ef1571c71a78d", "reference": "fd8305521692f27eae3263895d1ef1571c71a78d", -======= - "time": "2020-07-06T13:19:58+00:00" - }, - { - "name": "symfony/finder", - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9f1d1d883b79a91ef320c0c6e803494e042ef36e", - "reference": "9f1d1d883b79a91ef320c0c6e803494e042ef36e", ->>>>>>> dev "shasum": "" }, "require": { @@ -5427,11 +4845,7 @@ "description": "Symfony Finder Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/finder/tree/v5.2.0" -======= - "source": "https://github.com/symfony/finder/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -5447,11 +4861,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-18T09:42:36+00:00" -======= - "time": "2020-11-17T19:45:34+00:00" ->>>>>>> dev }, { "name": "symfony/http-client-contracts", @@ -5534,7 +4944,6 @@ }, { "name": "symfony/http-foundation", -<<<<<<< HEAD "version": "v5.2.0", "source": { "type": "git", @@ -5545,18 +4954,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e4576271ee99123aa59a40564c7b5405f0ebd1e6", "reference": "e4576271ee99123aa59a40564c7b5405f0ebd1e6", -======= - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "9eeb37ec0ff3049c782ca67041648e28ddd75a94" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/9eeb37ec0ff3049c782ca67041648e28ddd75a94", - "reference": "9eeb37ec0ff3049c782ca67041648e28ddd75a94", ->>>>>>> dev "shasum": "" }, "require": { @@ -5571,12 +4968,9 @@ "symfony/expression-language": "^4.4|^5.0", "symfony/mime": "^4.4|^5.0" }, -<<<<<<< HEAD "suggest": { "symfony/mime": "To use the file extension guesser" }, -======= ->>>>>>> dev "type": "library", "autoload": { "psr-4": { @@ -5603,11 +4997,7 @@ "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/http-foundation/tree/v5.2.0" -======= - "source": "https://github.com/symfony/http-foundation/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -5623,7 +5013,6 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-27T06:13:25+00:00" }, { @@ -5638,22 +5027,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/http-kernel/zipball/38907e5ccb2d9d371191a946734afc83c7a03160", "reference": "38907e5ccb2d9d371191a946734afc83c7a03160", -======= - "time": "2020-11-03T11:58:18+00:00" - }, - { - "name": "symfony/http-kernel", - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-kernel.git", - "reference": "9f5605ee05406d8afa40dc4f2954c6a61de3a984" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9f5605ee05406d8afa40dc4f2954c6a61de3a984", - "reference": "9f5605ee05406d8afa40dc4f2954c6a61de3a984", ->>>>>>> dev "shasum": "" }, "require": { @@ -5736,11 +5109,7 @@ "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/http-kernel/tree/v5.2.0" -======= - "source": "https://github.com/symfony/http-kernel/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -5756,11 +5125,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-30T05:54:18+00:00" -======= - "time": "2020-11-29T09:23:08+00:00" ->>>>>>> dev }, { "name": "symfony/mime", @@ -6002,7 +5367,6 @@ "time": "2020-10-23T14:02:19+00:00" }, { -<<<<<<< HEAD "name": "symfony/polyfill-intl-grapheme", "version": "v1.20.0", "source": { @@ -6018,25 +5382,6 @@ }, "require": { "php": ">=7.1" -======= - "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" ->>>>>>> dev }, "suggest": { "ext-intl": "For best performance" @@ -6084,11 +5429,7 @@ "shim" ], "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.20.0" -======= - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0" ->>>>>>> dev }, "funding": [ { @@ -6107,7 +5448,6 @@ "time": "2020-10-23T14:02:19+00:00" }, { -<<<<<<< HEAD "name": "symfony/polyfill-intl-idn", "version": "v1.20.0", "source": { @@ -6125,23 +5465,6 @@ "php": ">=7.1", "symfony/polyfill-intl-normalizer": "^1.10", "symfony/polyfill-php72": "^1.10" -======= - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "727d1096295d807c309fb01a851577302394c897" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", - "reference": "727d1096295d807c309fb01a851577302394c897", - "shasum": "" - }, - "require": { - "php": ">=7.1" ->>>>>>> dev }, "suggest": { "ext-intl": "For best performance" @@ -6193,11 +5516,7 @@ "shim" ], "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0" -======= - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0" ->>>>>>> dev }, "funding": [ { @@ -6216,7 +5535,6 @@ "time": "2020-10-23T14:02:19+00:00" }, { -<<<<<<< HEAD "name": "symfony/polyfill-intl-normalizer", "version": "v1.20.0", "source": { @@ -6228,19 +5546,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", "reference": "727d1096295d807c309fb01a851577302394c897", -======= - "name": "symfony/polyfill-mbstring", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", - "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", ->>>>>>> dev "shasum": "" }, "require": { @@ -6295,7 +5600,6 @@ "shim" ], "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0" }, "funding": [ @@ -6357,25 +5661,15 @@ "MIT" ], "authors": [ -======= - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0" - }, - "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, ->>>>>>> dev - { - "url": "https://github.com/fabpot", - "type": "github" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], -<<<<<<< HEAD "description": "Symfony polyfill for the Mbstring extension", "homepage": "https://symfony.com", "keywords": [ @@ -6402,8 +5696,6 @@ "type": "tidelift" } ], -======= ->>>>>>> dev "time": "2020-10-23T14:02:19+00:00" }, { @@ -6646,7 +5938,6 @@ }, { "name": "symfony/process", -<<<<<<< HEAD "version": "v5.2.0", "source": { "type": "git", @@ -6657,18 +5948,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/process/zipball/240e74140d4d956265048f3025c0aecbbc302d54", "reference": "240e74140d4d956265048f3025c0aecbbc302d54", -======= - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "ec1482f13d53911a8a32e54ba6f9a3b43a57d943" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ec1482f13d53911a8a32e54ba6f9a3b43a57d943", - "reference": "ec1482f13d53911a8a32e54ba6f9a3b43a57d943", ->>>>>>> dev "shasum": "" }, "require": { @@ -6701,11 +5980,7 @@ "description": "Symfony Process Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/process/tree/v5.2.0" -======= - "source": "https://github.com/symfony/process/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -6721,11 +5996,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-02T15:47:15+00:00" -======= - "time": "2020-11-02T15:10:16+00:00" ->>>>>>> dev }, { "name": "symfony/psr-http-message-bridge", @@ -6791,7 +6062,6 @@ ], "support": { "issues": "https://github.com/symfony/psr-http-message-bridge/issues", -<<<<<<< HEAD "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.0.2" }, "funding": [ @@ -6822,24 +6092,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/routing/zipball/130ac5175ad2fd417978baebd8062e2e6b2bc28b", "reference": "130ac5175ad2fd417978baebd8062e2e6b2bc28b", -======= - "source": "https://github.com/symfony/psr-http-message-bridge/tree/master" - }, - "time": "2019-11-25T19:33:50+00:00" - }, - { - "name": "symfony/routing", - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "08712c5dd5041c03e997e13892f45884faccd868" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/08712c5dd5041c03e997e13892f45884faccd868", - "reference": "08712c5dd5041c03e997e13892f45884faccd868", ->>>>>>> dev "shasum": "" }, "require": { @@ -6900,11 +6152,7 @@ "url" ], "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/routing/tree/v5.2.0" -======= - "source": "https://github.com/symfony/routing/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -6920,11 +6168,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-27T00:39:34+00:00" -======= - "time": "2020-11-24T13:31:32+00:00" ->>>>>>> dev }, { "name": "symfony/service-contracts", @@ -7090,7 +6334,6 @@ }, { "name": "symfony/translation", -<<<<<<< HEAD "version": "v5.2.0", "source": { "type": "git", @@ -7101,18 +6344,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/translation/zipball/52f486a707510884450df461b5a6429dd7a67379", "reference": "52f486a707510884450df461b5a6429dd7a67379", -======= - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "84821e6a14a637e817f25d11147388695b6f790a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/84821e6a14a637e817f25d11147388695b6f790a", - "reference": "84821e6a14a637e817f25d11147388695b6f790a", ->>>>>>> dev "shasum": "" }, "require": { @@ -7176,11 +6407,7 @@ "description": "Symfony Translation Component", "homepage": "https://symfony.com", "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/translation/tree/v5.2.0" -======= - "source": "https://github.com/symfony/translation/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -7196,11 +6423,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-28T11:24:18+00:00" -======= - "time": "2020-11-27T06:35:49+00:00" ->>>>>>> dev }, { "name": "symfony/translation-contracts", @@ -7282,7 +6505,6 @@ }, { "name": "symfony/var-dumper", -<<<<<<< HEAD "version": "v5.2.0", "source": { "type": "git", @@ -7293,18 +6515,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/173a79c462b1c81e1fa26129f71e41333d846b26", "reference": "173a79c462b1c81e1fa26129f71e41333d846b26", -======= - "version": "v4.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/65c6f1e848cda840ef7278686c8e30a7cc353c93", - "reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93", ->>>>>>> dev "shasum": "" }, "require": { @@ -7363,11 +6573,7 @@ "dump" ], "support": { -<<<<<<< HEAD "source": "https://github.com/symfony/var-dumper/tree/v5.2.0" -======= - "source": "https://github.com/symfony/var-dumper/tree/v4.4.17" ->>>>>>> dev }, "funding": [ { @@ -7383,11 +6589,7 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-11-27T00:39:34+00:00" -======= - "time": "2020-11-24T09:55:37+00:00" ->>>>>>> dev }, { "name": "symfony/yaml", @@ -7583,11 +6785,7 @@ ], "support": { "issues": "https://github.com/vlucas/phpdotenv/issues", -<<<<<<< HEAD "source": "https://github.com/vlucas/phpdotenv/tree/v5.2.0" -======= - "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.7" ->>>>>>> dev }, "funding": [ { @@ -7599,7 +6797,6 @@ "type": "tidelift" } ], -<<<<<<< HEAD "time": "2020-09-14T15:57:31+00:00" }, { @@ -7609,17 +6806,6 @@ "type": "git", "url": "https://github.com/voku/portable-ascii.git", "reference": "80953678b19901e5165c56752d087fc11526017c" -======= - "time": "2020-07-14T19:04:52+00:00" - }, - { - "name": "wm/blog", - "version": "dev-master", - "dist": { - "type": "path", - "url": "./modules/wm-blog", - "reference": "60f2745ab658419c87f3b123dbf472112d4de865" ->>>>>>> dev }, "dist": { "type": "zip", @@ -7791,11 +6977,7 @@ "dist": { "type": "path", "url": "./modules/wm-common", -<<<<<<< HEAD "reference": "35c1e0da9bf2059fa416a8672facd3c946efb1c3" -======= - "reference": "0bce219041b4ba3b1faf3d9de5b02c6c2558cdce" ->>>>>>> dev }, "require": { "php": "^7.1.3", @@ -7841,11 +7023,7 @@ "dist": { "type": "path", "url": "./modules/wm-core", -<<<<<<< HEAD "reference": "b8ac7be3411f7706caf3ce8f7448b059bd4e7ecf" -======= - "reference": "073430f10b6ecdacef3c29114d433115c5b3da9b" ->>>>>>> dev }, "require": { "php": "^7.1.3" @@ -7894,11 +7072,7 @@ "dist": { "type": "path", "url": "./modules/wm-crm", -<<<<<<< HEAD "reference": "0c78c1991eb4f7a8a716d15b35413a6b206c372a" -======= - "reference": "e1da259305cdef45c660fbe033a5fc35709be0d6" ->>>>>>> dev }, "require": { "php": "^7.1.3", @@ -7929,7 +7103,6 @@ "autoload-dev": { "psr-4": { "WM\\CRM\\Tests\\": "tests/" -<<<<<<< HEAD } }, "license": [ @@ -8023,8 +7196,6 @@ "autoload-dev": { "psr-4": { "WM\\Product\\Tests\\": "tests/" -======= ->>>>>>> dev } }, "license": [ @@ -8036,20 +7207,17 @@ } }, { - "name": "wm/portfolio", + "name": "wm/service", "version": "dev-master", "dist": { "type": "path", -<<<<<<< HEAD "url": "./modules/wm-service", "reference": "bfb5ac11217a616324a8b801146fe45b2fcfff8c" -======= - "url": "./modules/wm-portfolio", - "reference": "0653f4f52da2f326e66434d628bd85822cecf833" ->>>>>>> dev }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "wm/common": "dev-master", + "wm/core": "dev-master" }, "require-dev": { "orchestra/testbench": "~3.6.0", @@ -8059,14 +7227,13 @@ "extra": { "laravel": { "providers": [ - "WM\\Portfolio\\PortfolioServiceProvider", - "WM\\Portfolio\\DependencyProvider" + "WM\\Service\\ServiceServiceProvider" ] } }, "autoload": { "psr-4": { - "WM\\Portfolio\\": "src/" + "WM\\Service\\": "src/" }, "classmap": [ "database/seeds", @@ -8075,225 +7242,49 @@ }, "autoload-dev": { "psr-4": { - "WM\\Portfolio\\Tests\\": "tests/" + "WM\\Service\\Tests\\": "tests/" } }, "license": [ "MIT" ], -<<<<<<< HEAD -======= - "description": "Portfolio management", + "description": "Service Management Service", "transport-options": { "relative": true } }, { - "name": "wm/product", - "version": "dev-master", + "name": "zircote/swagger-php", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/zircote/swagger-php.git", + "reference": "9d172471e56433b5c7061006b9a766f262a3edfd" + }, "dist": { - "type": "path", - "url": "./modules/wm-product", - "reference": "5167706bd2ad79abaf5079640a7eaf3f9896de97" + "type": "zip", + "url": "https://api.github.com/repos/zircote/swagger-php/zipball/9d172471e56433b5c7061006b9a766f262a3edfd", + "reference": "9d172471e56433b5c7061006b9a766f262a3edfd", + "shasum": "" }, "require": { - "php": "^7.1.3", - "wm/common": "dev-master", - "wm/core": "dev-master" + "doctrine/annotations": "*", + "ext-json": "*", + "php": ">=7.2", + "symfony/finder": ">=2.2", + "symfony/yaml": ">=3.3" }, "require-dev": { - "orchestra/testbench": "~3.6.0", - "phpunit/phpunit": "^7.0" + "friendsofphp/php-cs-fixer": "^2.16", + "phpunit/phpunit": ">=8" }, + "bin": [ + "bin/openapi" + ], "type": "library", - "extra": { - "laravel": { - "providers": [ - "WM\\Product\\ProductServiceProvider" - ] - } - }, "autoload": { "psr-4": { - "WM\\Product\\": "src/" - }, - "classmap": [ - "database/seeds", - "database/factories" - ] - }, - "autoload-dev": { - "psr-4": { - "WM\\Product\\Tests\\": "tests/" - } - }, - "license": [ - "MIT" - ], - "description": "client relationship management", - "transport-options": { - "relative": true - } - }, - { - "name": "wm/service", - "version": "dev-master", - "dist": { - "type": "path", - "url": "./modules/wm-service", - "reference": "bfb5ac11217a616324a8b801146fe45b2fcfff8c" - }, - "require": { - "php": "^7.1.3", - "wm/common": "dev-master", - "wm/core": "dev-master" - }, - "require-dev": { - "orchestra/testbench": "~3.6.0", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "laravel": { - "providers": [ - "WM\\Service\\ServiceServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "WM\\Service\\": "src/" - }, - "classmap": [ - "database/seeds", - "database/factories" - ] - }, - "autoload-dev": { - "psr-4": { - "WM\\Service\\Tests\\": "tests/" - } - }, - "license": [ - "MIT" - ], ->>>>>>> dev - "description": "Service Management Service", - "transport-options": { - "relative": true - } -<<<<<<< HEAD -======= - }, - { - "name": "zendframework/zend-diactoros", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "de5847b068362a88684a55b0dbb40d85986cfa52" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/de5847b068362a88684a55b0dbb40d85986cfa52", - "reference": "de5847b068362a88684a55b0dbb40d85986cfa52", - "shasum": "" - }, - "require": { - "php": "^7.1", - "psr/http-factory": "^1.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-factory-implementation": "1.0", - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "ext-curl": "*", - "ext-dom": "*", - "ext-libxml": "*", - "http-interop/http-factory-tests": "^0.5.0", - "php-http/psr7-integration-tests": "dev-master", - "phpunit/phpunit": "^7.0.2", - "zendframework/zend-coding-standard": "~1.0.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1.x-dev", - "dev-develop": "2.2.x-dev", - "dev-release-1.8": "1.8.x-dev" - } - }, - "autoload": { - "files": [ - "src/functions/create_uploaded_file.php", - "src/functions/marshal_headers_from_sapi.php", - "src/functions/marshal_method_from_sapi.php", - "src/functions/marshal_protocol_version_from_sapi.php", - "src/functions/marshal_uri_from_sapi.php", - "src/functions/normalize_server.php", - "src/functions/normalize_uploaded_files.php", - "src/functions/parse_cookie_header.php" - ], - "psr-4": { - "Zend\\Diactoros\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "PSR HTTP Message implementations", - "keywords": [ - "http", - "psr", - "psr-7" - ], - "support": { - "docs": "https://docs.zendframework.com/zend-diactoros/", - "forum": "https://discourse.zendframework.com/c/questions/exprssive", - "issues": "https://github.com/zendframework/zend-diactoros/issues", - "rss": "https://github.com/zendframework/zend-diactoros/releases.atom", - "slack": "https://zendframework-slack.herokuapp.com", - "source": "https://github.com/zendframework/zend-diactoros" - }, - "abandoned": "laminas/laminas-diactoros", - "time": "2019-11-13T19:16:13+00:00" ->>>>>>> dev - }, - { - "name": "zircote/swagger-php", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/zircote/swagger-php.git", - "reference": "9d172471e56433b5c7061006b9a766f262a3edfd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/zircote/swagger-php/zipball/9d172471e56433b5c7061006b9a766f262a3edfd", - "reference": "9d172471e56433b5c7061006b9a766f262a3edfd", - "shasum": "" - }, - "require": { - "doctrine/annotations": "*", - "ext-json": "*", - "php": ">=7.2", - "symfony/finder": ">=2.2", - "symfony/yaml": ">=3.3" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.16", - "phpunit/phpunit": ">=8" - }, - "bin": [ - "bin/openapi" - ], - "type": "library", - "autoload": { - "psr-4": { - "OpenApi\\": "src" + "OpenApi\\": "src" }, "files": [ "src/functions.php" @@ -8471,7 +7462,6 @@ }, { "name": "facade/ignition", -<<<<<<< HEAD "version": "2.5.2", "source": { "type": "git", @@ -8482,18 +7472,6 @@ "type": "zip", "url": "https://api.github.com/repos/facade/ignition/zipball/08668034beb185fa2ac6f09b1034eaa440952ace", "reference": "08668034beb185fa2ac6f09b1034eaa440952ace", -======= - "version": "1.16.4", - "source": { - "type": "git", - "url": "https://github.com/facade/ignition.git", - "reference": "1da1705e7f6b24ed45af05461463228da424e14f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/1da1705e7f6b24ed45af05461463228da424e14f", - "reference": "1da1705e7f6b24ed45af05461463228da424e14f", ->>>>>>> dev "shasum": "" }, "require": { @@ -8502,7 +7480,6 @@ "facade/flare-client-php": "^1.3.7", "facade/ignition-contracts": "^1.0.2", "filp/whoops": "^2.4", -<<<<<<< HEAD "illuminate/support": "^7.0|^8.0", "monolog/monolog": "^2.0", "php": "^7.2.5|^8.0", @@ -8514,18 +7491,6 @@ "mockery/mockery": "^1.3", "orchestra/testbench": "^5.0|^6.0", "psalm/plugin-laravel": "^1.2" -======= - "illuminate/support": "~5.5.0 || ~5.6.0 || ~5.7.0 || ~5.8.0 || ^6.0", - "monolog/monolog": "^1.12 || ^2.0", - "php": "^7.1|^8.0", - "scrivo/highlight.php": "^9.15", - "symfony/console": "^3.4 || ^4.0", - "symfony/var-dumper": "^3.4 || ^4.0" - }, - "require-dev": { - "mockery/mockery": "~1.3.3|^1.4.2", - "orchestra/testbench": "^3.5 || ^3.6 || ^3.7 || ^3.8 || ^4.0" ->>>>>>> dev }, "suggest": { "laravel/telescope": "^3.1" @@ -8570,11 +7535,7 @@ "issues": "https://github.com/facade/ignition/issues", "source": "https://github.com/facade/ignition" }, -<<<<<<< HEAD "time": "2020-11-17T09:18:51+00:00" -======= - "time": "2020-10-30T13:40:01+00:00" ->>>>>>> dev }, { "name": "facade/ignition-contracts", @@ -8932,7 +7893,6 @@ }, { "name": "nunomaduro/collision", -<<<<<<< HEAD "version": "v5.1.0", "source": { "type": "git", @@ -8962,29 +7922,6 @@ "orchestra/testbench": "^6.0", "phpstan/phpstan": "^0.12.36", "phpunit/phpunit": "^9.3.3" -======= - "version": "v3.1.0", - "source": { - "type": "git", - "url": "https://github.com/nunomaduro/collision.git", - "reference": "88b58b5bd9bdcc54756480fb3ce87234696544ee" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/88b58b5bd9bdcc54756480fb3ce87234696544ee", - "reference": "88b58b5bd9bdcc54756480fb3ce87234696544ee", - "shasum": "" - }, - "require": { - "filp/whoops": "^2.1.4", - "jakub-onderka/php-console-highlighter": "0.3.*|0.4.*", - "php": "^7.1 || ^8.0", - "symfony/console": "~2.8|~3.3|~4.0" - }, - "require-dev": { - "laravel/framework": "^6.0", - "phpunit/phpunit": "^8.0 || ^9.0" ->>>>>>> dev }, "type": "library", "extra": { @@ -9040,11 +7977,7 @@ "type": "patreon" } ], -<<<<<<< HEAD "time": "2020-10-29T14:50:40+00:00" -======= - "time": "2020-10-29T16:05:21+00:00" ->>>>>>> dev }, { "name": "phar-io/manifest", @@ -9384,7 +8317,6 @@ }, { "name": "phpunit/php-code-coverage", -<<<<<<< HEAD "version": "9.2.5", "source": { "type": "git", @@ -9395,25 +8327,12 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1", "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1", -======= - "version": "7.0.13", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ad0dcd7b184e76f7198a1fe07685bfbec3ae911a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ad0dcd7b184e76f7198a1fe07685bfbec3ae911a", - "reference": "ad0dcd7b184e76f7198a1fe07685bfbec3ae911a", ->>>>>>> dev "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", -<<<<<<< HEAD "nikic/php-parser": "^4.10.2", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", @@ -9424,16 +8343,6 @@ "sebastian/lines-of-code": "^1.0.3", "sebastian/version": "^3.0.1", "theseer/tokenizer": "^1.2.0" -======= - "php": ">=7.2", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.1.1", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.2.2", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1.3" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -9473,11 +8382,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5" -======= - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.13" ->>>>>>> dev }, "funding": [ { @@ -9485,7 +8390,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-11-28T06:44:49+00:00" }, { @@ -9507,29 +8411,6 @@ }, "require-dev": { "phpunit/phpunit": "^9.3" -======= - "time": "2020-11-30T08:35:22+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" ->>>>>>> dev }, "type": "library", "extra": { @@ -9561,11 +8442,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" -======= - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3" ->>>>>>> dev }, "funding": [ { @@ -9573,11 +8450,7 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-09-28T05:57:25+00:00" -======= - "time": "2020-11-30T08:25:21+00:00" ->>>>>>> dev }, { "name": "phpunit/php-invoker", @@ -9631,7 +8504,6 @@ "process" ], "support": { -<<<<<<< HEAD "issues": "https://github.com/sebastianbergmann/php-invoker/issues", "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" }, @@ -9662,32 +8534,6 @@ }, "require-dev": { "phpunit/phpunit": "^9.3" -======= - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" - }, - "time": "2015-06-21T13:50:34+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "2.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" ->>>>>>> dev }, "type": "library", "extra": { @@ -9717,13 +8563,8 @@ "template" ], "support": { -<<<<<<< HEAD "issues": "https://github.com/sebastianbergmann/php-text-template/issues", "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" -======= - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" ->>>>>>> dev }, "funding": [ { @@ -9731,7 +8572,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T05:33:50+00:00" }, { @@ -9750,27 +8590,6 @@ }, "require": { "php": ">=7.3" -======= - "time": "2020-11-30T08:20:02+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "3.1.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "472b687829041c24b25f475e14c2f38a09edf1c2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2", - "reference": "472b687829041c24b25f475e14c2f38a09edf1c2", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.1" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -9803,13 +8622,8 @@ "timer" ], "support": { -<<<<<<< HEAD "issues": "https://github.com/sebastianbergmann/php-timer/issues", "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" -======= - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.2" ->>>>>>> dev }, "funding": [ { @@ -9817,7 +8631,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:16:10+00:00" }, { @@ -9832,23 +8645,6 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6535e637961f0829832621dc1b7308c2d24a799e", "reference": "6535e637961f0829832621dc1b7308c2d24a799e", -======= - "abandoned": true, - "time": "2020-11-30T08:38:46+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "8.5.12", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f40cf5be80a7d177494592ad1b2db3f64ea1dee3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f40cf5be80a7d177494592ad1b2db3f64ea1dee3", - "reference": "f40cf5be80a7d177494592ad1b2db3f64ea1dee3", ->>>>>>> dev "shasum": "" }, "require": { @@ -9859,7 +8655,6 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", -<<<<<<< HEAD "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.1", "phar-io/version": "^3.0.2", @@ -9881,26 +8676,6 @@ "sebastian/resource-operations": "^3.0.3", "sebastian/type": "^2.3", "sebastian/version": "^3.0.2" -======= - "myclabs/deep-copy": "^1.10.0", - "phar-io/manifest": "^2.0.1", - "phar-io/version": "^3.0.2", - "php": ">=7.2", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^7.0.12", - "phpunit/php-file-iterator": "^2.0.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1.2", - "sebastian/comparator": "^3.0.2", - "sebastian/diff": "^3.0.2", - "sebastian/environment": "^4.2.3", - "sebastian/exporter": "^3.1.2", - "sebastian/global-state": "^3.0.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0.1", - "sebastian/type": "^1.1.3", - "sebastian/version": "^2.0.1" ->>>>>>> dev }, "require-dev": { "ext-pdo": "*", @@ -9947,11 +8722,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.4" -======= - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.12" ->>>>>>> dev }, "funding": [ { @@ -9963,7 +8734,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-12-01T04:58:47+00:00" }, { @@ -9978,22 +8748,6 @@ "type": "zip", "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", -======= - "time": "2020-11-30T12:23:30+00:00" - }, - { - "name": "scrivo/highlight.php", - "version": "v9.18.1.5", - "source": { - "type": "git", - "url": "https://github.com/scrivo/highlight.php.git", - "reference": "fa75a865928a4a5d49e5e77faca6bd2f2410baaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/fa75a865928a4a5d49e5e77faca6bd2f2410baaf", - "reference": "fa75a865928a4a5d49e5e77faca6bd2f2410baaf", ->>>>>>> dev "shasum": "" }, "require": { @@ -10092,7 +8846,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:08:54+00:00" }, { @@ -10114,39 +8867,6 @@ }, "require-dev": { "phpunit/phpunit": "^9.3" -======= - "support": { - "issues": "https://github.com/scrivo/highlight.php/issues", - "source": "https://github.com/scrivo/highlight.php" - }, - "funding": [ - { - "url": "https://github.com/allejo", - "type": "github" - } - ], - "time": "2020-11-22T06:07:40+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "shasum": "" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" ->>>>>>> dev }, "type": "library", "extra": { @@ -10173,11 +8893,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" -======= - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" ->>>>>>> dev }, "funding": [ { @@ -10185,7 +8901,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-09-28T05:30:19+00:00" }, { @@ -10209,31 +8924,6 @@ }, "require-dev": { "phpunit/phpunit": "^9.3" -======= - "time": "2020-11-30T08:15:22+00:00" - }, - { - "name": "sebastian/comparator", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^8.5" ->>>>>>> dev }, "type": "library", "extra": { @@ -10277,11 +8967,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" -======= - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" ->>>>>>> dev }, "funding": [ { @@ -10289,7 +8975,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T15:49:45+00:00" }, { @@ -10365,26 +9050,6 @@ }, "require": { "php": ">=7.3" -======= - "time": "2020-11-30T08:04:30+00:00" - }, - { - "name": "sebastian/diff", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "shasum": "" - }, - "require": { - "php": ">=7.1" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3", @@ -10425,11 +9090,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" -======= - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" ->>>>>>> dev }, "funding": [ { @@ -10437,7 +9098,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:10:38+00:00" }, { @@ -10456,26 +9116,6 @@ }, "require": { "php": ">=7.3" -======= - "time": "2020-11-30T07:59:04+00:00" - }, - { - "name": "sebastian/environment", - "version": "4.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "shasum": "" - }, - "require": { - "php": ">=7.1" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -10513,11 +9153,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" -======= - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" ->>>>>>> dev }, "funding": [ { @@ -10525,7 +9161,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-09-28T05:52:38+00:00" }, { @@ -10545,27 +9180,6 @@ "require": { "php": ">=7.3", "sebastian/recursion-context": "^4.0" -======= - "time": "2020-11-30T07:53:42+00:00" - }, - { - "name": "sebastian/exporter", - "version": "3.1.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", - "shasum": "" - }, - "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" ->>>>>>> dev }, "require-dev": { "ext-mbstring": "*", @@ -10616,11 +9230,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3" -======= - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3" ->>>>>>> dev }, "funding": [ { @@ -10628,7 +9238,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-09-28T05:24:23+00:00" }, { @@ -10649,28 +9258,6 @@ "php": ">=7.3", "sebastian/object-reflector": "^2.0", "sebastian/recursion-context": "^4.0" -======= - "time": "2020-11-30T07:47:53+00:00" - }, - { - "name": "sebastian/global-state", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/474fb9edb7ab891665d3bfc6317f42a0a150454b", - "reference": "474fb9edb7ab891665d3bfc6317f42a0a150454b", - "shasum": "" - }, - "require": { - "php": ">=7.2", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" ->>>>>>> dev }, "require-dev": { "ext-dom": "*", @@ -10707,11 +9294,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2" -======= - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" ->>>>>>> dev }, "funding": [ { @@ -10719,7 +9302,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T15:55:19+00:00" }, { @@ -10797,28 +9379,6 @@ "php": ">=7.3", "sebastian/object-reflector": "^2.0", "sebastian/recursion-context": "^4.0" -======= - "time": "2020-11-30T07:43:24+00:00" - }, - { - "name": "sebastian/object-enumerator", - "version": "3.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "shasum": "" - }, - "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -10848,11 +9408,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" -======= - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" ->>>>>>> dev }, "funding": [ { @@ -10860,7 +9416,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:12:34+00:00" }, { @@ -10879,26 +9434,6 @@ }, "require": { "php": ">=7.3" -======= - "time": "2020-11-30T07:40:27+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "1.1.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "shasum": "" - }, - "require": { - "php": ">=7.0" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -10928,11 +9463,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" -======= - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" ->>>>>>> dev }, "funding": [ { @@ -10940,7 +9471,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:14:26+00:00" }, { @@ -10959,26 +9489,6 @@ }, "require": { "php": ">=7.3" -======= - "time": "2020-11-30T07:37:18+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", - "shasum": "" - }, - "require": { - "php": ">=7.0" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -11016,11 +9526,7 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" -======= - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" ->>>>>>> dev }, "funding": [ { @@ -11028,7 +9534,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:17:30+00:00" }, { @@ -11050,26 +9555,6 @@ }, "require-dev": { "phpunit/phpunit": "^9.0" -======= - "time": "2020-11-30T07:34:24+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "2.0.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "shasum": "" - }, - "require": { - "php": ">=7.1" ->>>>>>> dev }, "type": "library", "extra": { @@ -11096,11 +9581,7 @@ "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { "issues": "https://github.com/sebastianbergmann/resource-operations/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" -======= - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" ->>>>>>> dev }, "funding": [ { @@ -11108,7 +9589,6 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-09-28T06:45:17+00:00" }, { @@ -11127,26 +9607,6 @@ }, "require": { "php": ">=7.3" -======= - "time": "2020-11-30T07:30:19+00:00" - }, - { - "name": "sebastian/type", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/type.git", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "reference": "0150cfbc4495ed2df3872fb31b26781e4e077eb4", - "shasum": "" - }, - "require": { - "php": ">=7.2" ->>>>>>> dev }, "require-dev": { "phpunit/phpunit": "^9.3" @@ -11177,11 +9637,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/type/tree/2.3.1" -======= - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" ->>>>>>> dev }, "funding": [ { @@ -11189,11 +9645,7 @@ "type": "github" } ], -<<<<<<< HEAD "time": "2020-10-26T13:18:59+00:00" -======= - "time": "2020-11-30T07:25:11+00:00" ->>>>>>> dev }, { "name": "sebastian/version", @@ -11238,7 +9690,6 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", -<<<<<<< HEAD "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" }, "funding": [ @@ -11248,11 +9699,6 @@ } ], "time": "2020-09-28T06:39:44+00:00" -======= - "source": "https://github.com/sebastianbergmann/version/tree/master" - }, - "time": "2016-10-03T07:35:21+00:00" ->>>>>>> dev }, { "name": "theseer/tokenizer", @@ -11295,8 +9741,6 @@ "support": { "issues": "https://github.com/theseer/tokenizer/issues", "source": "https://github.com/theseer/tokenizer/tree/master" -<<<<<<< HEAD -======= }, "funding": [ { @@ -11305,43 +9749,6 @@ } ], "time": "2020-07-12T23:59:07+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.9.1", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389", - "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389", - "shasum": "" ->>>>>>> dev - }, - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], -<<<<<<< HEAD - "time": "2020-07-12T23:59:07+00:00" -======= - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "support": { - "issues": "https://github.com/webmozart/assert/issues", - "source": "https://github.com/webmozart/assert/tree/master" - }, - "time": "2020-07-08T17:02:28+00:00" ->>>>>>> dev } ], "aliases": [], diff --git a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 index b2ef446..d9e7e54 100644 --- a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 +++ b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 @@ -1 +1 @@ -1606834072i:1606834072; \ No newline at end of file +1606918511i:1606918511; \ No newline at end of file diff --git a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c index 6a235f7..d56e3b7 100644 --- a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c +++ b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c @@ -1 +1 @@ -1606834072i:1; \ No newline at end of file +1606918511i:2; \ No newline at end of file