diff --git a/composer.json b/composer.json index c250e3d..0a3c8c8 100644 --- a/composer.json +++ b/composer.json @@ -1,30 +1,37 @@ { "name": "mirzaev/accounts", "type": "library", - "description": "Менеджер аккаунтов", + "description": "Simple accounts manager", + "readme": "README.md", "keywords": [ "accounts" ], - "homepage": "https://git.hood.su/mirzaev/accounts", + "homepage": "https://git.mirzaev.sexy/mirzaev/accounts", "license": "WTFPL", "authors": [ { - "name": "Arsen Mirzaev", - "email": "red@hood.su", - "homepage": "https://hood.su/sex", + "name": "Arsen Mirzaev Tatyano-Muradovich", + "email": "arsen@mirzaev.sexy", + "homepage": "https://mirzaev.sexy", "role": "Programmer" } ], "support": { - "docs": "https://git.hood.su/mirzaev/accounts/manual", - "issues": "https://git.hood.su/mirzaev/accounts/issues", - "chat": "https://vk.me/darkweb228" + "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.0", + "php": "~8.1", "ext-dom": "20031129", - "ext-libxml": "~8.0", - "guzzlehttp/guzzle": "~7.2" + "ext-libxml": "^7.4", + "guzzlehttp/guzzle": "^7.2" }, "require-dev": { "phpdocumentor/phpdocumentor": ">=2.9", diff --git a/composer.lock b/composer.lock index 2bc3f58..a045ec0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "23c3ffec0f7ab8375317cd34400df0c6", + "content-hash": "de2419b87b5ffa047a5c2a2961a37852", "packages": [ { "name": "guzzlehttp/guzzle", @@ -710,6 +710,134 @@ "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.4" @@ -819,16 +947,16 @@ }, { "name": "league/flysystem", - "version": "1.1.4", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32" + "reference": "18634df356bfd4119fe3d6156bdb990c414c14ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32", - "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/18634df356bfd4119fe3d6156bdb990c414c14ea", + "reference": "18634df356bfd4119fe3d6156bdb990c414c14ea", "shasum": "" }, "require": { @@ -840,33 +968,19 @@ "league/flysystem-sftp": "<1.0.6" }, "require-dev": { - "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" + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^8.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { "psr-4": { - "League\\Flysystem\\": "src/" + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } }, "notification-url": "https://packagist.org/downloads/", @@ -875,101 +989,46 @@ ], "authors": [ { - "name": "Frank de Jonge", - "email": "info@frenky.net" - } - ], - "description": "Filesystem abstraction: Many filesystems, one API.", - "keywords": [ - "Cloud Files", - "WebDAV", - "abstraction", - "aws", - "cloud", - "copy.com", - "dropbox", - "file systems", - "files", - "filesystem", - "filesystems", - "ftp", - "rackspace", - "remote", - "s3", - "sftp", - "storage" - ], - "support": { - "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.1.4" - }, - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], - "time": "2021-06-23T21:56:05+00:00" - }, - { - "name": "league/mime-type-detection", - "version": "1.7.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", - "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", - "shasum": "" - }, - "require": { - "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.18", - "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\MimeTypeDetection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Frank de Jonge", - "email": "info@frankdejonge.nl" - } - ], - "description": "Mime-type detection for Flysystem", - "support": { - "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0" - }, - "funding": [ - { - "url": "https://github.com/frankdejonge", - "type": "github" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" }, { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "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", "type": "tidelift" } ], - "time": "2021-01-18T20:58:21+00:00" + "time": "2020-05-25T17:44:05+00:00" }, { - "name": "league/pipeline", - "version": "1.0.0", + "name": "erusev/parsedown", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/thephpleague/pipeline.git", @@ -1094,203 +1153,48 @@ "shasum": "" }, "require": { - "league/tactician": "^1.0", - "league/tactician-container": "^2.0", - "league/tactician-logger": "^0.10.0", - "php": ">=7.2", - "symfony/config": "^3.4|^4.4|^5.0", - "symfony/dependency-injection": "^3.4|^4.4|^5.0", - "symfony/http-kernel": "^3.4|^4.4|^5.0", - "symfony/yaml": "^3.4|^4.4|^5.0" + "phpoption/phpoption": ">=0.9,<2.0-dev" }, - "require-dev": { - "matthiasnoback/symfony-config-test": "^4.2.1", - "matthiasnoback/symfony-dependency-injection-test": "^4.2.1", - "mockery/mockery": "~1.0", - "phpunit/phpunit": "~8.5", - "symfony/console": "^3.4|^4.4|^5.0", - "symfony/framework-bundle": "^3.4.31|^4.4|^5.0", - "symfony/security-bundle": "^3.4|^4.4|^5.0", - "symfony/security-core": "^3.4|^4.4|^5.0", - "symfony/validator": "^3.4|^4.4|^5.0" - }, - "suggest": { - "league/tactician-doctrine": "For doctrine transaction middleware", - "symfony/console": "For debugging command-to-handler routing using the tactician:debug console command", - "symfony/security": "For command security middleware", - "symfony/validator": "For command validator middleware" - }, - "type": "symfony-bundle", + "type": "library", "extra": { "branch-alias": { "dev-master": "1.0-dev" } }, "autoload": { - "psr-4": { - "League\\Tactician\\Bundle\\": "src/" + "psr-0": { + "JMS\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Rafael Dohms", - "homepage": "http://doh.ms" - }, - { - "name": "Richard Tuin", - "homepage": "http://www.rtuin.nl/" - }, - { - "name": "Xander Smalbil", - "email": "xander@videofunk.nl" - }, - { - "name": "Ross Tuck", - "email": "me@rosstuck.com" - } - ], - "description": "Bundle to integrate Tactician with Symfony projects", - "keywords": [ - "bundle", - "symfony", - "tactician" - ], - "support": { - "issues": "https://github.com/thephpleague/tactician-bundle/issues", - "source": "https://github.com/thephpleague/tactician-bundle/tree/v1.3.0" - }, - "time": "2021-01-31T17:06:29+00:00" + "description": "A library for easily creating recursive-descent parsers.", + "time": "2012-11-18T18:08:43+00:00" }, { - "name": "league/tactician-container", - "version": "2.0.0", + "name": "jms/serializer", + "version": "1.7.1", "source": { "type": "git", - "url": "https://github.com/thephpleague/tactician-container.git", - "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0" + "url": "https://github.com/schmittjoh/serializer.git", + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/tactician-container/zipball/d1a5d884e072b8cafbff802d07766076eb2ffcb0", - "reference": "d1a5d884e072b8cafbff802d07766076eb2ffcb0", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/4fad8bbbe76e05de3b79ffa3db027058ed3813ff", + "reference": "4fad8bbbe76e05de3b79ffa3db027058ed3813ff", "shasum": "" }, "require": { - "league/tactician": "^1.0", - "php": ">=5.5", - "psr/container": "^1.0" - }, - "require-dev": { - "league/container": "~2.3", - "phpunit/phpunit": "~4.3", - "squizlabs/php_codesniffer": "~2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Tactician\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nigel Greenway", - "homepage": "http://futurepixels.co.uk" - } - ], - "description": "Tactician integration for any container implementing PSR-11", - "keywords": [ - "container", - "container-interop", - "di", - "interoperable", - "league", - "tactician" - ], - "support": { - "issues": "https://github.com/thephpleague/tactician-container/issues", - "source": "https://github.com/thephpleague/tactician-container/tree/master" - }, - "time": "2017-04-13T06:27:12+00:00" - }, - { - "name": "league/tactician-logger", - "version": "v0.10.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/tactician-logger.git", - "reference": "3ff9ee04e4cbec100af827f829ed4c7ff7c08442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/tactician-logger/zipball/3ff9ee04e4cbec100af827f829ed4c7ff7c08442", - "reference": "3ff9ee04e4cbec100af827f829ed4c7ff7c08442", - "shasum": "" - }, - "require": { - "league/tactician": "^1.0", + "doctrine/annotations": "^1.0", + "doctrine/instantiator": "^1.0.3", + "jms/metadata": "~1.1", + "jms/parser-lib": "1.*", "php": ">=5.5.0", - "psr/log": "~1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9", - "phpunit/phpunit": "4.*", - "squizlabs/php_codesniffer": "~2.3" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Tactician\\Logger\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ross Tuck" - } - ], - "description": "Adds PSR-3 logging support to the Tactician command bus", - "homepage": "https://github.com/thephpleague/tactician-logger", - "keywords": [ - "log", - "logging", - "tactician" - ], - "support": { - "issues": "https://github.com/thephpleague/tactician-logger/issues", - "source": "https://github.com/thephpleague/tactician-logger/tree/master" - }, - "time": "2016-08-23T05:50:38+00:00" - }, - { - "name": "league/uri", - "version": "6.4.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/uri.git", - "reference": "09da64118eaf4c5d52f9923a1e6a5be1da52fd9a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/09da64118eaf4c5d52f9923a1e6a5be1da52fd9a", - "reference": "09da64118eaf4c5d52f9923a1e6a5be1da52fd9a", - "shasum": "" - }, - "require": { - "ext-json": "*", - "league/uri-interfaces": "^2.1", - "php": ">=7.2", - "psr/http-message": "^1.0" + "phpcollection/phpcollection": "~0.1", + "phpoption/phpoption": "^1.1" }, "conflict": { "league/uri-schemes": "^1.0" @@ -1785,13 +1689,61 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "0.4-dev" } }, "autoload": { - "psr-4": { - "Flyfinder\\": [ - "src/" + "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/" ] } }, @@ -1865,7 +1817,7 @@ }, { "name": "phpdocumentor/phpdocumentor", - "version": "v3.1.0", + "version": "v2.9.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/phpDocumentor.git", @@ -1873,72 +1825,37 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor/zipball/7015b11cf0733aaa94a059328bb8d948991630e1", - "reference": "7015b11cf0733aaa94a059328bb8d948991630e1", + "url": "https://api.github.com/repos/phpDocumentor/phpDocumentor/zipball/2e4f981a55ebe6f5db592d7da892d13d5b3c7816", + "reference": "2e4f981a55ebe6f5db592d7da892d13d5b3c7816", "shasum": "" }, "require": { - "doctrine/event-manager": "^1.1", - "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": "*" + "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" }, "require-dev": { "fzaninotto/faker": "^1.9", @@ -1981,24 +1898,20 @@ "documentation", "phpdoc" ], - "support": { - "issues": "https://github.com/phpDocumentor/phpDocumentor/issues", - "source": "https://github.com/phpDocumentor/phpDocumentor/tree/v3.1.0" - }, - "time": "2021-07-07T18:11:22+00:00" + "time": "2020-01-12T19:44:16+00:00" }, { "name": "phpdocumentor/reflection", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/Reflection.git", - "reference": "1b70ad9839e288f98f8d162f88754598f207fcae" + "reference": "140db6834feec47ebebc195463771c7377c73010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/1b70ad9839e288f98f8d162f88754598f207fcae", - "reference": "1b70ad9839e288f98f8d162f88754598f207fcae", + "url": "https://api.github.com/repos/phpDocumentor/Reflection/zipball/793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d", + "reference": "793bfd92d9a0fc96ae9608fb3e947c3f59fb3a0d", "shasum": "" }, "require": { @@ -2037,11 +1950,7 @@ "reflection", "static analysis" ], - "support": { - "issues": "https://github.com/phpDocumentor/Reflection/issues", - "source": "https://github.com/phpDocumentor/Reflection/tree/5.0.0" - }, - "time": "2021-07-01T17:51:41+00:00" + "time": "2016-05-21T08:42:32+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2574,30 +2483,82 @@ "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-10-26T13:16:10+00:00" + "time": "2020-09-28T06:00:25+00:00" }, { - "name": "phpunit/phpunit", - "version": "9.5.7", + "name": "phpunit/php-token-stream", + "version": "4.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5" + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d0dc8b6999c937616df4fb046792004b33fd31c5", - "reference": "d0dc8b6999c937616df4fb046792004b33fd31c5", + "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" + }, + { + "name": "phpunit/phpunit", + "version": "9.2.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "191768ccd5c85513b4068bdbe99bb6390c7d54fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c6a9e4312e209e659f1fce3ce88dd197c2448f6", + "reference": "1c6a9e4312e209e659f1fce3ce88dd197c2448f6", "shasum": "" }, "require": { @@ -2608,27 +2569,26 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.1", - "phar-io/version": "^3.0.2", - "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2.3", - "phpunit/php-file-iterator": "^3.0.5", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3.4", - "sebastian/version": "^3.0.2" + "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" }, "require-dev": { "ext-pdo": "*", @@ -2673,10 +2633,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.7" - }, "funding": [ { "url": "https://phpunit.de/donate.html", @@ -2687,7 +2643,7 @@ "type": "github" } ], - "time": "2021-07-19T06:14:47+00:00" + "time": "2020-07-13T17:55:55+00:00" }, { "name": "psr/cache", @@ -4778,28 +4734,11 @@ ], "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v5.3.4" - }, - "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": "2021-07-23T15:54:19+00:00" + "time": "2018-11-11T11:18:13+00:00" }, { - "name": "symfony/flex", - "version": "v1.13.3", + "name": "symfony/stopwatch", + "version": "v2.8.52", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", @@ -4807,8 +4746,8 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/2597d0dda8042c43eed44a9cd07236b897e427d7", - "reference": "2597d0dda8042c43eed44a9cd07236b897e427d7", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/752586c80af8a85aeb74d1ae8202411c68836663", + "reference": "752586c80af8a85aeb74d1ae8202411c68836663", "shasum": "" }, "require": { @@ -4834,145 +4773,6 @@ "Symfony\\Flex\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien.potencier@gmail.com" - } - ], - "description": "Composer plugin for Symfony", - "support": { - "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v1.13.3" - }, - "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": "2021-05-19T07:19:15+00:00" - }, - { - "name": "symfony/framework-bundle", - "version": "v5.3.4", - "source": { - "type": "git", - "url": "https://github.com/symfony/framework-bundle.git", - "reference": "2c5ed14a5992a2d04dfdb238a5f9589bab0a68d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/2c5ed14a5992a2d04dfdb238a5f9589bab0a68d8", - "reference": "2c5ed14a5992a2d04dfdb238a5f9589bab0a68d8", - "shasum": "" - }, - "require": { - "ext-xml": "*", - "php": ">=7.2.5", - "symfony/cache": "^5.2", - "symfony/config": "^5.3", - "symfony/dependency-injection": "^5.3", - "symfony/deprecation-contracts": "^2.1", - "symfony/error-handler": "^4.4.1|^5.0.1", - "symfony/event-dispatcher": "^5.1", - "symfony/filesystem": "^4.4|^5.0", - "symfony/finder": "^4.4|^5.0", - "symfony/http-foundation": "^5.3", - "symfony/http-kernel": "^5.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/routing": "^5.3" - }, - "conflict": { - "doctrine/persistence": "<1.3", - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", - "phpunit/phpunit": "<5.4.3", - "symfony/asset": "<5.3", - "symfony/browser-kit": "<4.4", - "symfony/console": "<5.2.5", - "symfony/dom-crawler": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/form": "<5.2", - "symfony/http-client": "<4.4", - "symfony/lock": "<4.4", - "symfony/mailer": "<5.2", - "symfony/messenger": "<4.4", - "symfony/mime": "<4.4", - "symfony/property-access": "<5.3", - "symfony/property-info": "<4.4", - "symfony/security-core": "<5.3", - "symfony/security-csrf": "<5.3", - "symfony/serializer": "<5.2", - "symfony/stopwatch": "<4.4", - "symfony/translation": "<5.3", - "symfony/twig-bridge": "<4.4", - "symfony/twig-bundle": "<4.4", - "symfony/validator": "<5.2", - "symfony/web-profiler-bundle": "<4.4", - "symfony/workflow": "<5.2" - }, - "require-dev": { - "doctrine/annotations": "^1.10.4", - "doctrine/cache": "^1.0|^2.0", - "doctrine/persistence": "^1.3|^2.0", - "paragonie/sodium_compat": "^1.8", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/asset": "^5.3", - "symfony/browser-kit": "^4.4|^5.0", - "symfony/console": "^5.2", - "symfony/css-selector": "^4.4|^5.0", - "symfony/dom-crawler": "^4.4|^5.0", - "symfony/dotenv": "^5.1", - "symfony/expression-language": "^4.4|^5.0", - "symfony/form": "^5.2", - "symfony/http-client": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/mailer": "^5.2", - "symfony/messenger": "^5.2", - "symfony/mime": "^4.4|^5.0", - "symfony/notifier": "^5.3", - "symfony/phpunit-bridge": "^5.3", - "symfony/polyfill-intl-icu": "~1.0", - "symfony/process": "^4.4|^5.0", - "symfony/property-info": "^4.4|^5.0", - "symfony/rate-limiter": "^5.2", - "symfony/security-bundle": "^5.3", - "symfony/serializer": "^5.2", - "symfony/stopwatch": "^4.4|^5.0", - "symfony/string": "^5.0", - "symfony/translation": "^5.3", - "symfony/twig-bundle": "^4.4|^5.0", - "symfony/validator": "^5.2", - "symfony/web-link": "^4.4|^5.0", - "symfony/workflow": "^5.2", - "symfony/yaml": "^4.4|^5.0", - "twig/twig": "^2.10|^3.0" - }, - "suggest": { - "ext-apcu": "For best performance of the system caches", - "symfony/console": "For using the console commands", - "symfony/form": "For using forms", - "symfony/property-info": "For using the property_info service", - "symfony/serializer": "For using the serializer service", - "symfony/validator": "For using validation", - "symfony/web-link": "For using web links, features such as preloading, prefetching or prerendering", - "symfony/yaml": "For using the debug:config and lint:yaml commands" - }, - "type": "symfony-bundle", "autoload": { "psr-4": { "Symfony\\Bundle\\FrameworkBundle\\": "" @@ -5383,8 +5183,12 @@ "require": { "php": ">=7.1" }, - "suggest": { - "ext-ctype": "For best performance" + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<3.9.1" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "type": "library", "extra": { @@ -5421,33 +5225,15 @@ "description": "Symfony polyfill for ctype functions", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "ctype", - "polyfill", - "portable" + "assert", + "check", + "validate" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" - }, - "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": "2021-02-19T12:13:01+00:00" + "time": "2020-07-08T17:02:28+00:00" }, { - "name": "symfony/polyfill-intl-grapheme", - "version": "v1.23.1", + "name": "zendframework/zend-cache", + "version": "2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", diff --git a/mirzaev/accounts/system/account.1.php b/mirzaev/accounts/system/account.1.php new file mode 100644 index 0000000..34a1133 --- /dev/null +++ b/mirzaev/accounts/system/account.1.php @@ -0,0 +1,161 @@ + + */ +abstract class account +{ + /** + * @var guzzle $browser Браузер + */ + protected guzzle $browser; + + /** + * @var bool $ssl SSL-протокол + */ + protected bool $ssl = true; + + /** + * Конструктор + * + * @var int $id Идентификатор + * @var string $path Корневой каталог аккаунтов + */ + public function __construct( + protected int $id, + protected string $path = __DIR__ . DIRECTORY_SEPARATOR . 'accounts' + ) { + // Инициализация + $this->path($path . DIRECTORY_SEPARATOR . $id); + $this->browser(); + } + + /** + * Деструктор + * + * @todo Разработать + */ + public function __destruct() + { + // Деаутентификация + // $this->deauth(); + } + + /** + * Инициализация браузера + */ + protected function browser(): guzzle + { + return isset($this->path, $this->ssl) ? $this->browser = new guzzle([ + 'verify' => $this->ssl, + 'cookies' => (new FileCookieJar($this->path . DIRECTORY_SEPARATOR . 'cookie.txt')) + ]) : throw new Exception('Не удалось записать браузер'); + } + + /** + * Инициализация директории пользователя + * + * @param string $path Путь к директории + */ + protected function path(string $path): string + { + // Инициализация директории + if (file_exists($this->path = $path) || mkdir($this->path, 0775, true)) { + return $this->path; + } + + throw new Exception('Не удалось записать путь к директории'); + } + + /** + * Запись свойства + * + * @param string $name Название + * @param mixed $value Значение + */ + public function __set(string $name, mixed $value): void + { + match ($name) { + 'id' => match (false) { + isset($this->id) => $this->id = $value, + default => throw new Exception('Запрещено перезаписывать идентификатор') + }, + 'browser' => match (false) { + isset($this->browser) => $this->browser = $value, + default => throw new Exception('Запрещено перезаписывать браузер') + }, + 'path' => match (false) { + isset($this->path) => $this->path($value), + default => throw new Exception('Запрещено перезаписывать путь к директории') + }, + 'ssl' => $this->ssl = $value, + default => throw new Exception('Не найдено: ' . $name, 404) + }; + } + + /** + * Чтение свойства + * + * @param string $name Название + */ + public function __get(string $name): mixed + { + return match ($name) { + 'id' => $this->id, + 'browser' => $this->browser, + 'path' => $this->path, + 'ssl' => $this->ssl, + default => throw new Exception('Не найдено: ' . $name, 404) + }; + } + + /** + * Проверка инициализации + * + * @param mixed $name Название + */ + public function __isset(string $name): bool + { + return match ($name) { + 'id' => isset($this->id), + 'browser' => isset($this->browser), + 'path' => isset($this->path), + 'ssl' => isset($this->ssl), + default => false + }; + } + + /** + * Удаление свойства + * + * @param mixed $name Название + */ + public function __unset(string $name): void + { + match ($name) { + 'id' => throw new Exception('Запрещено деинициализировать идентификатор'), + 'browser' => function () { + unset($this->browser); + }, + 'path' => function () { + unset($this->path); + }, + 'ssl' => function () { + unset($this->ssl); + }, + default => null + }; + } +} diff --git a/mirzaev/accounts/system/account.php b/mirzaev/accounts/system/account.php index 739ae6d..c8264d6 100644 --- a/mirzaev/accounts/system/account.php +++ b/mirzaev/accounts/system/account.php @@ -4,13 +4,14 @@ declare(strict_types=1); namespace mirzaev\accounts; +// Браузер use GuzzleHttp\Client as browser; /** * Аккаунт * * @package mirzaev\accounts - * @author Arsen Mirzaev Tatyano-Muradovich + * @author Arsen Mirzaev Tatyano-Muradovich */ class account { @@ -29,7 +30,6 @@ class account */ protected string $path; - /** * Конструктор * diff --git a/mirzaev/accounts/system/auth/basic.php b/mirzaev/accounts/system/auth/basic.php index da077d4..3f5e5d5 100644 --- a/mirzaev/accounts/system/auth/basic.php +++ b/mirzaev/accounts/system/auth/basic.php @@ -5,7 +5,7 @@ declare(strict_types=1); namespace mirzaev\accounts\auth; /** - * Базовая авторизация + * Базовая аутентификация */ interface basic {