From aa93c4d26395025fa16bb65e8a40332ac352a742 Mon Sep 17 00:00:00 2001 From: mirzaev Date: Fri, 17 Feb 2023 18:36:36 +1000 Subject: [PATCH] =?UTF-8?q?=D1=87=D1=91=20=D0=B7=D0=B0=20=D1=85=D1=83?= =?UTF-8?q?=D0=B9=D0=BD=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 111 +++++----- composer.lock | 591 +++++++++----------------------------------------- 2 files changed, 158 insertions(+), 544 deletions(-) diff --git a/composer.json b/composer.json index bd73246..a206d0b 100644 --- a/composer.json +++ b/composer.json @@ -1,62 +1,55 @@ { - "name": "mirzaev/accounts", - "type": "library", - "description": "Simple accounts manager", - "readme": "README.md", - "keywords": [ - "accounts" - ], - "homepage": "https://git.mirzaev.sexy/mirzaev/accounts", - "license": "WTFPL", - "authors": [ - { - "name": "Arsen Mirzaev Tatyano-Muradovich", - "email": "arsen@mirzaev.sexy", - "homepage": "https://mirzaev.sexy", - "role": "Programmer" - } - ], - "support": { - "email": "arsen@mirzaev.sexy", - "wiki": "https://git.mirzaev.sexy/mirzaev/accounts/wiki", - "issues": "https://git.mirzaev.sexy/mirzaev/accounts/issues" - }, - "funding": [ - { - "type": "funding", - "url": "https://fund.mirzaev.sexy" - } - ], - "require": { -<<<<<<< HEAD - "php": "~8.1", - "ext-dom": "20031129", - "ext-libxml": "~8.1.1", - "guzzlehttp/guzzle": "^7.2" -======= - "php": "~8.2", - "ext-dom": "*", - "ext-libxml": "*", - "guzzlehttp/guzzle": "^7.5" ->>>>>>> 22de47d (Switch to PHP 8.2) - }, - "require-dev": { - "phpdocumentor/phpdocumentor": ">=2.9", - "phpunit/phpunit": "^9" - }, - "autoload": { - "psr-4": { - "mirzaev\\accounts\\": "mirzaev/accounts/system" - } - }, - "autoload-dev": { - "psr-4": { - "mirzaev\\accounts\\tests\\": "mirzaev/accounts/tests" - } - }, - "config": { - "allow-plugins": { - "symfony/flex": true - } + "name": "mirzaev/accounts", + "type": "library", + "description": "Simple accounts manager", + "readme": "README.md", + "keywords": [ + "accounts" + ], + "homepage": "https://git.mirzaev.sexy/mirzaev/accounts", + "license": "WTFPL", + "authors": [ + { + "name": "Arsen Mirzaev Tatyano-Muradovich", + "email": "arsen@mirzaev.sexy", + "homepage": "https://mirzaev.sexy", + "role": "Programmer" } + ], + "support": { + "email": "arsen@mirzaev.sexy", + "wiki": "https://git.mirzaev.sexy/mirzaev/accounts/wiki", + "issues": "https://git.mirzaev.sexy/mirzaev/accounts/issues" + }, + "funding": [ + { + "type": "funding", + "url": "https://fund.mirzaev.sexy" + } + ], + "require": { + "php": "~8.2", + "ext-dom": "*", + "ext-libxml": "*", + "guzzlehttp/guzzle": "^7.5" + }, + "require-dev": { + "phpdocumentor/phpdocumentor": ">=2.9", + "phpunit/phpunit": "^9" + }, + "autoload": { + "psr-4": { + "mirzaev\\accounts\\": "mirzaev/accounts/system" + } + }, + "autoload-dev": { + "psr-4": { + "mirzaev\\accounts\\tests\\": "mirzaev/accounts/tests" + } + }, + "config": { + "allow-plugins": { + "symfony/flex": true + } + } } diff --git a/composer.lock b/composer.lock index 11d080e..d42f510 100644 --- a/composer.lock +++ b/composer.lock @@ -4,11 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], -<<<<<<< HEAD - "content-hash": "de2419b87b5ffa047a5c2a2961a37852", -======= "content-hash": "919a61fd9fe6e480e4c0929a845995db", ->>>>>>> 22de47d (Switch to PHP 8.2) "packages": [ { "name": "guzzlehttp/guzzle", @@ -1001,8 +997,6 @@ "time": "2022-12-30T00:23:10+00:00" }, { -<<<<<<< HEAD -======= "name": "doctrine/lexer", "version": "1.2.3", "source": { @@ -1079,7 +1073,6 @@ "time": "2022-02-28T11:07:21+00:00" }, { ->>>>>>> 22de47d (Switch to PHP 8.2) "name": "jawira/plantuml", "version": "v1.2023.1", "source": { @@ -1173,134 +1166,6 @@ "release", "versions" ], - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2020-08-23T12:54:47+00:00" - }, - { - "name": "container-interop/container-interop", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/container-interop/container-interop.git", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8", - "shasum": "" - }, - "require": { - "psr/container": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Interop\\Container\\": "src/Interop/Container/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GPL-3.0-or-later" - ], - "authors": [ - { - "name": "Jawira Portugal" - } - ], - "description": "Provides PlantUML integration: plantuml executable and plantuml.jar", - "keywords": [ - "diagram", - "plantuml", - "plantuml.jar", - "uml" - ], - "support": { - "issues": "https://github.com/jawira/plantuml/issues", - "source": "https://github.com/jawira/plantuml/tree/v1.59.0" - }, - "time": "2021-07-30T13:00:53+00:00" - }, - { - "name": "jean85/pretty-package-versions", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/Jean85/pretty-package-versions.git", - "reference": "694492c653c518456af2805f04eec445b997ed1f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/694492c653c518456af2805f04eec445b997ed1f", - "reference": "694492c653c518456af2805f04eec445b997ed1f", - "shasum": "" - }, - "require": { - "composer-runtime-api": "^2.0.0", - "php": "^7.1|^8.0" - }, - "require-dev": { - "doctrine/cache": "1.*", - "phpstan/phpstan": "^0.12.20", - "phpunit/phpunit": "^7.5 || ^9.1.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "A library to get pretty versions strings of installed dependencies", - "keywords": [ - "composer", - "package", - "release", - "versions" - ], "support": { "issues": "https://github.com/Jean85/pretty-package-versions/issues", "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5" @@ -1423,19 +1288,33 @@ "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "phpspec/prophecy": "^1.11.1", + "phpunit/phpunit": "^8.5.8" + }, + "suggest": { + "ext-ftp": "Allows you to use FTP server storage", + "ext-openssl": "Allows you to use FTPS server storage", + "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", + "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", + "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", + "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", + "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", + "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", + "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", + "league/flysystem-webdav": "Allows you to use WebDAV storage", + "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", + "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", + "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.1-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "League\\Flysystem\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1444,10 +1323,6 @@ ], "authors": [ { -<<<<<<< HEAD - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" -======= "name": "Frank de Jonge", "email": "info@frenky.net" } @@ -1532,49 +1407,17 @@ { "url": "https://github.com/frankdejonge", "type": "github" ->>>>>>> 22de47d (Switch to PHP 8.2) }, { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", - "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" - ], - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", "type": "tidelift" } ], -<<<<<<< HEAD - "time": "2020-05-25T17:44:05+00:00" -======= "time": "2022-04-17T13:12:02+00:00" ->>>>>>> 22de47d (Switch to PHP 8.2) }, { - "name": "erusev/parsedown", - "version": "1.7.4", + "name": "league/pipeline", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/pipeline.git", @@ -1699,11 +1542,6 @@ "shasum": "" }, "require": { -<<<<<<< HEAD - "phpoption/phpoption": ">=0.9,<2.0-dev" - }, - "type": "library", -======= "league/tactician": "^1.0", "league/tactician-container": "^2.0|^3.0", "league/tactician-logger": "^0.10|^0.11", @@ -1731,25 +1569,20 @@ "symfony/validator": "For command validator middleware" }, "type": "symfony-bundle", ->>>>>>> 22de47d (Switch to PHP 8.2) "extra": { "branch-alias": { "dev-master": "1.0-dev" } }, "autoload": { - "psr-0": { - "JMS\\": "src/" + "psr-4": { + "League\\Tactician\\Bundle\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], -<<<<<<< HEAD - "description": "A library for easily creating recursive-descent parsers.", - "time": "2012-11-18T18:08:43+00:00" -======= "authors": [ { "name": "Rafael Dohms", @@ -1779,32 +1612,22 @@ "source": "https://github.com/thephpleague/tactician-bundle/tree/v1.4.0" }, "time": "2022-06-15T06:56:49+00:00" ->>>>>>> 22de47d (Switch to PHP 8.2) }, { - "name": "jms/serializer", - "version": "1.7.1", + "name": "league/tactician-container", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/schmittjoh/serializer.git", - "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff" + "url": "https://github.com/thephpleague/tactician-container.git", + "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/4fad8bbbe76e05de3b79ffa3db027058ed3813ff", - "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff", + "url": "https://api.github.com/repos/thephpleague/tactician-container/zipball/d1a5d884e072b8cafbff802d07766076eb2ffcb0", + "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0", "shasum": "" }, "require": { -<<<<<<< HEAD - "doctrine/annotations": "^1.0", - "doctrine/instantiator": "^1.0.3", - "jms/metadata": "~1.1", - "jms/parser-lib": "1.*", - "php": ">=5.5.0", - "phpcollection/phpcollection": "~0.1", - "phpoption/phpoption": "^1.1" -======= "league/tactician": "^1.0", "php": ">=5.5", "psr/container": "^1.0" @@ -1916,7 +1739,6 @@ "league/uri-interfaces": "^2.3", "php": "^8.1", "psr/http-message": "^1.0.1" ->>>>>>> 22de47d (Switch to PHP 8.2) }, "conflict": { "league/uri-schemes": "^1.0" @@ -2422,61 +2244,13 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.4-dev" + "dev-master": "1.x-dev" } }, "autoload": { - "psr-0": { - "PhpCollection": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache2" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "General-Purpose Collection Library for PHP", - "keywords": [ - "collection", - "list", - "map", - "sequence", - "set" - ], - "time": "2015-05-17T12:39:23+00:00" - }, - { - "name": "phpdocumentor/fileset", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/Fileset.git", - "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/Fileset/zipball/bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0", - "reference": "bfa78d8fa9763dfce6d0e5d3730c1d8ab25d34b0", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "symfony/finder": "~2.1" - }, - "require-dev": { - "phpunit/phpunit": "~3.7" - }, - "type": "library", - "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/", - "tests/unit/" + "psr-4": { + "Flyfinder\\": [ + "src/" ] } }, @@ -2551,18 +2325,6 @@ }, { "name": "phpdocumentor/phpdocumentor", -<<<<<<< HEAD - "version": "v2.9.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/phpDocumentor.git", - "reference": "7015b11cf0733aaa94a059328bb8d948991630e1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor/zipball/2e4f981a55ebe6f5db592d7da892d13d5b3c7816", - "reference": "2e4f981a55ebe6f5db592d7da892d13d5b3c7816", -======= "version": "v3.1.2", "source": { "type": "git", @@ -2573,36 +2335,71 @@ "type": "zip", "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor/zipball/888fd76678506f9638e955218465bada0048e40a", "reference": "888fd76678506f9638e955218465bada0048e40a", ->>>>>>> 22de47d (Switch to PHP 8.2) "shasum": "" }, "require": { - "cilex/cilex": "~1.0", - "erusev/parsedown": "~1.0", - "jms/serializer": ">=0.12 < 1.8.0", - "monolog/monolog": "~1.6", - "padraic/phar-updater": "^1.0", - "php": ">=5.3.3", - "phpdocumentor/fileset": "~1.0", - "phpdocumentor/graphviz": "~1.0", - "phpdocumentor/reflection": "^3.0", - "phpdocumentor/reflection-docblock": "~2.0", - "symfony/config": "~2.3", - "symfony/console": "~2.3", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.0", - "symfony/stopwatch": "~2.3", - "symfony/validator": "~2.2", - "twig/twig": "~1.3", - "webmozart/assert": "^1.2", - "zendframework/zend-cache": "~2.1", - "zendframework/zend-config": "~2.1", - "zendframework/zend-filter": "~2.1", - "zendframework/zend-i18n": "~2.1", - "zendframework/zend-serializer": "~2.1", - "zendframework/zend-servicemanager": "~2.1", - "zendframework/zend-stdlib": "~2.1", - "zetacomponents/document": ">=1.3.1" + "doctrine/event-manager": "^1.1", + "doctrine/lexer": "^1.2", + "ext-ctype": "*", + "ext-hash": "*", + "ext-iconv": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-simplexml": "*", + "ext-xml": "*", + "jawira/plantuml": "^1.27", + "jean85/pretty-package-versions": "^1.5 || ^2.0.1", + "league/commonmark": "^1.5", + "league/flysystem": "^1.0", + "league/pipeline": "^1.0", + "league/tactician": "^1.0", + "league/tactician-bundle": "^1.2", + "league/uri": "^6.0", + "league/uri-interfaces": "^2.0", + "php": ">=7.2.5||^8.0", + "phpdocumentor/flyfinder": "^1.0", + "phpdocumentor/graphviz": "^2.0", + "phpdocumentor/reflection": "^5.0", + "phpdocumentor/reflection-common": "^2.0", + "phpdocumentor/reflection-docblock": "^5.0", + "phpdocumentor/type-resolver": "^1.0", + "psr/cache": "^1.0", + "psr/log": "^1.1", + "symfony/cache": "^5.0", + "symfony/config": "^5.0", + "symfony/console": "^5.0", + "symfony/contracts": "^2.0", + "symfony/dependency-injection": "^5.0", + "symfony/dom-crawler": "5.2.*", + "symfony/dotenv": "^5.0", + "symfony/event-dispatcher": "^5.0", + "symfony/expression-language": "^5.0", + "symfony/filesystem": "^5.0", + "symfony/finder": "5.3.*", + "symfony/flex": "^1.3.1", + "symfony/framework-bundle": "^5.0", + "symfony/http-foundation": "^5.0.7", + "symfony/http-kernel": "^5.0.8", + "symfony/monolog-bundle": "^3.0", + "symfony/polyfill-intl-idn": "^1.22", + "symfony/process": "5.3.*", + "symfony/routing": "^5.0", + "symfony/stopwatch": "^5.0", + "symfony/string": "5.3.*", + "symfony/yaml": "^5.0", + "twig/twig": "~2.0", + "webmozart/assert": "^1.3" + }, + "conflict": { + "symfony/symfony": "*" + }, + "replace": { + "paragonie/random_compat": "2.*", + "symfony/polyfill-iconv": "*", + "symfony/polyfill-php56": "*", + "symfony/polyfill-php70": "*", + "symfony/polyfill-php71": "*", + "symfony/polyfill-php72": "*" }, "require-dev": { "fzaninotto/faker": "^1.9", @@ -2645,15 +2442,11 @@ "documentation", "phpdoc" ], -<<<<<<< HEAD - "time": "2020-01-12T19:44:16+00:00" -======= "support": { "issues": "https://github.com/phpDocumentor/phpDocumentor/issues", "source": "https://github.com/phpDocumentor/phpDocumentor/tree/v3.1.2" }, "time": "2021-08-31T20:17:41+00:00" ->>>>>>> 22de47d (Switch to PHP 8.2) }, { "name": "phpdocumentor/reflection", @@ -2665,13 +2458,8 @@ }, "dist": { "type": "zip", -<<<<<<< HEAD - "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d", - "reference": "793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d", -======= "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/936e4dde326e6ba42feb46cb7a89688a9425356f", "reference": "936e4dde326e6ba42feb46cb7a89688a9425356f", ->>>>>>> 22de47d (Switch to PHP 8.2) "shasum": "" }, "require": { @@ -2710,15 +2498,11 @@ "reflection", "static analysis" ], -<<<<<<< HEAD - "time": "2016-05-21T08:42:32+00:00" -======= "support": { "issues": "https://github.com/phpDocumentor/Reflection/issues", "source": "https://github.com/phpDocumentor/Reflection/tree/5.2.0" }, "time": "2022-04-02T19:58:37+00:00" ->>>>>>> 22de47d (Switch to PHP 8.2) }, { "name": "phpdocumentor/reflection-common", @@ -3191,77 +2975,21 @@ "keywords": [ "timer" ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-09-28T06:00:25+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "4.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": "^7.3 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "abandoned": true, - "time": "2020-08-04T08:28:15+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", -<<<<<<< HEAD - "version": "9.2.6", -======= "version": "9.6.3", ->>>>>>> 22de47d (Switch to PHP 8.2) "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", @@ -3269,13 +2997,8 @@ }, "dist": { "type": "zip", -<<<<<<< HEAD - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c6a9e4312e209e659f1fce3ce88dd197c2448f6", - "reference": "1c6a9e4312e209e659f1fce3ce88dd197c2448f6", -======= "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e7b1615e3e887d6c719121c6d4a44b0ab9645555", "reference": "e7b1615e3e887d6c719121c6d4a44b0ab9645555", ->>>>>>> 22de47d (Switch to PHP 8.2) "shasum": "" }, "require": { @@ -3286,28 +3009,6 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", -<<<<<<< HEAD - "myclabs/deep-copy": "^1.9.5", - "phar-io/manifest": "^1.0.3", - "phar-io/version": "^2.0.1", - "php": "^7.3", - "phpspec/prophecy": "^1.10.3", - "phpunit/php-code-coverage": "^8.0.2", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-invoker": "^3.0.2", - "phpunit/php-text-template": "^2.0.2", - "phpunit/php-timer": "^5.0.1", - "sebastian/code-unit": "^1.0.5", - "sebastian/comparator": "^4.0.3", - "sebastian/diff": "^4.0.1", - "sebastian/environment": "^5.1.2", - "sebastian/exporter": "^4.0.2", - "sebastian/global-state": "^4.0", - "sebastian/object-enumerator": "^4.0.2", - "sebastian/resource-operations": "^3.0.2", - "sebastian/type": "^2.1.1", - "sebastian/version": "^3.0.1" -======= "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", @@ -3328,7 +3029,6 @@ "sebastian/resource-operations": "^3.0.3", "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" ->>>>>>> 22de47d (Switch to PHP 8.2) }, "suggest": { "ext-soap": "*", @@ -3369,13 +3069,10 @@ "testing", "xunit" ], -<<<<<<< HEAD -======= "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.3" }, ->>>>>>> 22de47d (Switch to PHP 8.2) "funding": [ { "url": "https://phpunit.de/sponsors.html", @@ -3384,47 +3081,7 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" -<<<<<<< HEAD - } - ], - "time": "2020-07-13T17:55:55+00:00" - }, - { - "name": "psr/cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Cache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ -======= }, ->>>>>>> 22de47d (Switch to PHP 8.2) { "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", "type": "tidelift" @@ -4335,7 +3992,6 @@ "type": "github" } ], - "abandoned": true, "time": "2020-09-28T06:45:17+00:00" }, { @@ -5282,22 +4938,6 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", -<<<<<<< HEAD - "time": "2018-11-11T11:18:13+00:00" - }, - { - "name": "symfony/stopwatch", - "version": "v2.8.52", - "source": { - "type": "git", - "url": "https://github.com/symfony/flex.git", - "reference": "2597d0dda8042c43eed44a9cd07236b897e427d7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/752586c80af8a85aeb74d1ae8202411c68836663", - "reference": "752586c80af8a85aeb74d1ae8202411c68836663", -======= "support": { "source": "https://github.com/symfony/finder/tree/v5.3.14" }, @@ -5329,7 +4969,6 @@ "type": "zip", "url": "https://api.github.com/repos/symfony/flex/zipball/c82477240111bfe41a1067c9f0ab91d40bafa5b6", "reference": "c82477240111bfe41a1067c9f0ab91d40bafa5b6", ->>>>>>> 22de47d (Switch to PHP 8.2) "shasum": "" }, "require": { @@ -5352,8 +4991,6 @@ "Symfony\\Flex\\": "src" } }, -<<<<<<< HEAD -======= "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -5493,7 +5130,6 @@ "symfony/yaml": "For using the debug:config and lint:yaml commands" }, "type": "symfony-bundle", ->>>>>>> 22de47d (Switch to PHP 8.2) "autoload": { "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" @@ -5906,20 +5542,11 @@ "require": { "php": ">=7.1" }, -<<<<<<< HEAD - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<3.9.1" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" -======= "provide": { "ext-ctype": "*" }, "suggest": { "ext-ctype": "For best performance" ->>>>>>> 22de47d (Switch to PHP 8.2) }, "type": "library", "extra": { @@ -5956,17 +5583,11 @@ "description": "Symfony polyfill for ctype functions", "homepage": "https://symfony.com", "keywords": [ - "assert", - "check", - "validate" + "compatibility", + "ctype", + "polyfill", + "portable" ], -<<<<<<< HEAD - "time": "2020-07-08T17:02:28+00:00" - }, - { - "name": "zendframework/zend-cache", - "version": "2.8.3", -======= "support": { "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, @@ -5989,7 +5610,6 @@ { "name": "symfony/polyfill-intl-grapheme", "version": "v1.27.0", ->>>>>>> 22de47d (Switch to PHP 8.2) "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -7302,3 +6922,4 @@ "platform-dev": [], "plugin-api-version": "2.3.0" } +