From 1393ee1b9d77281c0e6c2093277c0a248846f983 Mon Sep 17 00:00:00 2001 From: Wilmer Arambula Date: Sat, 24 Oct 2020 15:38:12 -0300 Subject: [PATCH] Switch to composer-plugin. --- composer.json | 26 + composer.lock | 2788 +++++++++++------ config/Component/Access.php | 22 - config/Component/Aliases.php | 4 +- config/Component/Assets.php | 17 +- config/Component/Auth.php | 5 +- config/Component/Cache.php | 5 +- config/Component/Db.php | 5 +- config/Component/EventProvider.php | 6 +- config/Component/Fields.php | 14 +- config/Component/LogTargetFile.php | 11 +- config/Component/Mailer.php | 44 +- config/Component/MiddlewareDispatcher.php | 14 + config/Component/Migration.php | 31 +- config/Component/Parameters.php | 11 +- config/Component/Router.php | 14 +- config/Component/SwiftSmtpTransport.php | 27 +- config/Component/Theme.php | 11 +- config/Component/WebView.php | 5 +- config/Component/WebViewConsole.php | 6 +- config/Component/YiiWeb.php | 27 +- config/Console.php | 25 - config/ConsoleLocal.php | 23 + config/EventsLocal.php | 6 + config/Params.php | 195 -- config/ParamsConsole.php | 62 +- config/ParamsLocal.php | 124 + config/Routes.php | 22 - config/RoutesLocal.php | 16 + config/Web.php | 39 - config/WebLocal.php | 37 + public/index.php | 7 +- .../database}/yiitest.sq3 | 0 src/Module/Rbac/Config/Routes.php | 41 - src/Module/Rbac/Config/RoutesLocal.php | 35 + src/Module/User/Config/Routes.php | 86 - src/Module/User/Config/RoutesLocal.php | 80 + src/Service/MailerService.php | 2 +- src/Theme/AdminOneBulma/Config/Params.php | 47 - .../AdminOneBulma/Config/ParamsLocal.php | 41 + .../AdminOneBulma/resources/layout/_head.php | 2 +- .../AdminOneBulma/resources/layout/_menu.php | 8 +- .../AdminOneBulma/resources/layout/main.php | 2 +- tests/Functional.suite.yml | 2 +- 44 files changed, 2318 insertions(+), 1677 deletions(-) delete mode 100644 config/Component/Access.php delete mode 100644 config/Console.php create mode 100644 config/ConsoleLocal.php create mode 100644 config/EventsLocal.php delete mode 100644 config/Params.php create mode 100644 config/ParamsLocal.php delete mode 100644 config/Routes.php create mode 100644 config/RoutesLocal.php delete mode 100644 config/Web.php create mode 100644 config/WebLocal.php rename {config/Database => resources/database}/yiitest.sq3 (100%) delete mode 100644 src/Module/Rbac/Config/Routes.php create mode 100644 src/Module/Rbac/Config/RoutesLocal.php delete mode 100644 src/Module/User/Config/Routes.php create mode 100644 src/Module/User/Config/RoutesLocal.php delete mode 100644 src/Theme/AdminOneBulma/Config/Params.php create mode 100644 src/Theme/AdminOneBulma/Config/ParamsLocal.php diff --git a/composer.json b/composer.json index 60d12d5..5a9a43c 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,7 @@ "yiisoft/cache": "^3.0@dev", "yiisoft/cache-file": "^3.0@dev", "yiisoft/csrf": "^3.0@dev", + "yiisoft/composer-config-plugin": "^1.0@dev", "yiisoft/data-response": "^3.0@dev", "yiisoft/db-sqlite": "^3.0@dev", "yiisoft/di": "^3.0@dev", @@ -65,6 +66,31 @@ "extra": { "branch-alias": { "dev-master": "1.0.x-dev" + }, + "config-plugin-output-dir": "runtime/build/config", + "config-plugin": { + "params-console-local": [ + "config/ParamsConsole.php" + ], + "params-local": [ + "$params-console-local", + "config/ParamsLocal.php", + "src/Theme/AdminOneBulma/Config/ParamsLocal.php" + ], + "web-local": [ + "config/WebLocal.php" + ], + "console-local": [ + "config/ConsoleLocal.php" + ], + "events-local": [ + "config/EventsLocal.php" + ], + "routes-local": [ + "config/RoutesLocal.php", + "src/Module/Rbac/Config/RoutesLocal.php", + "src/Module/User/Config/RoutesLocal.php" + ] } }, "config": { diff --git a/composer.lock b/composer.lock index 76ca425..1f7ac8b 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": "21337b8262183e01ec185bd3bc7f0b55", + "content-hash": "f219c1e521821304f93861f6ba81717d", "packages": [ { "name": "alexkart/curl-builder", @@ -53,36 +53,38 @@ "time": "2019-09-30T08:22:14+00:00" }, { - "name": "doctrine/lexer", - "version": "1.2.1", + "name": "composer/ca-bundle", + "version": "1.2.8", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + "url": "https://github.com/composer/ca-bundle.git", + "reference": "8a7ecad675253e4654ea05505233285377405215" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", - "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215", + "reference": "8a7ecad675253e4654ea05505233285377405215", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "ext-openssl": "*", + "ext-pcre": "*", + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan": "^0.11.8", - "phpunit/phpunit": "^8.2" + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", + "psr/log": "^1.0", + "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "Composer\\CaBundle\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -91,83 +93,91 @@ ], "authors": [ { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" } ], - "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", + "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.", "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" + "cabundle", + "cacert", + "certificate", + "ssl", + "tls" ], "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/ca-bundle/issues", + "source": "https://github.com/composer/ca-bundle/tree/1.2.8" }, "funding": [ { - "url": "https://www.doctrine-project.org/sponsorship.html", + "url": "https://packagist.com", "type": "custom" }, { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" + "url": "https://github.com/composer", + "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "url": "https://tidelift.com/funding/github/packagist/composer/composer", "type": "tidelift" } ], - "time": "2020-05-25T17:44:05+00:00" + "time": "2020-08-23T12:54:47+00:00" }, { - "name": "egulias/email-validator", - "version": "2.1.22", + "name": "composer/composer", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/egulias/EmailValidator.git", - "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5" + "url": "https://github.com/composer/composer.git", + "reference": "378b34c5e33c71d194f33e1b73a62ba22148ff13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5", - "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5", + "url": "https://api.github.com/repos/composer/composer/zipball/378b34c5e33c71d194f33e1b73a62ba22148ff13", + "reference": "378b34c5e33c71d194f33e1b73a62ba22148ff13", "shasum": "" }, "require": { - "doctrine/lexer": "^1.0.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.10" + "composer/ca-bundle": "^1.0", + "composer/semver": "^3.0", + "composer/spdx-licenses": "^1.2", + "composer/xdebug-handler": "^1.1", + "justinrainbow/json-schema": "^5.2.10", + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1.0", + "react/promise": "^1.2 || ^2.7", + "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.0", + "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", + "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", + "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0", + "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0" }, "require-dev": { - "dominicsayers/isemail": "^3.0.7", - "phpunit/phpunit": "^4.8.36|^7.5.15", - "satooshi/php-coveralls": "^1.0.1" + "phpspec/prophecy": "^1.10", + "symfony/phpunit-bridge": "^4.2 || ^5.0" }, "suggest": { - "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" }, + "bin": [ + "bin/composer" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { "psr-4": { - "Egulias\\EmailValidator\\": "src" + "Composer\\": "src/Composer" } }, "notification-url": "https://packagist.org/downloads/", @@ -176,59 +186,75 @@ ], "authors": [ { - "name": "Eduardo Gulias Davis" + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "https://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" } ], - "description": "A library for validating emails against several RFCs", - "homepage": "https://github.com/egulias/EmailValidator", + "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", + "homepage": "https://getcomposer.org/", "keywords": [ - "email", - "emailvalidation", - "emailvalidator", - "validation", - "validator" + "autoload", + "dependency", + "package" ], "support": { - "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/2.1.22" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/composer/issues", + "source": "https://github.com/composer/composer/tree/2.0.0" }, - "time": "2020-09-26T15:48:38+00:00" + "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-10-24T09:16:19+00:00" }, { - "name": "foxy/foxy", - "version": "v1.1.0", + "name": "composer/semver", + "version": "3.2.2", "source": { "type": "git", - "url": "https://github.com/fxpio/foxy.git", - "reference": "fa541677948a1a765a8120653603659249c60f0f" + "url": "https://github.com/composer/semver.git", + "reference": "4089fddb67bcf6bf860d91b979e95be303835002" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fxpio/foxy/zipball/fa541677948a1a765a8120653603659249c60f0f", - "reference": "fa541677948a1a765a8120653603659249c60f0f", + "url": "https://api.github.com/repos/composer/semver/zipball/4089fddb67bcf6bf860d91b979e95be303835002", + "reference": "4089fddb67bcf6bf860d91b979e95be303835002", "shasum": "" }, "require": { - "composer-plugin-api": "^1.1|^2.0", - "php": ">=5.3.3" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "composer/composer": "^1.5.0|^2.0.0@dev" + "phpstan/phpstan": "^0.12.19", + "symfony/phpunit-bridge": "^4.2 || ^5" }, - "type": "composer-plugin", + "type": "library", "extra": { - "class": "Foxy\\Foxy", "branch-alias": { - "dev-master": "1.1-dev" + "dev-main": "3.x-dev" } }, "autoload": { "psr-4": { - "Foxy\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Composer\\Semver\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -236,80 +262,79 @@ ], "authors": [ { - "name": "François Pluchino", - "email": "francois.pluchino@gmail.com" + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" } ], - "description": "Fast, reliable, and secure NPM/Yarn bridge for Composer", - "homepage": "https://github.com/fxpio/foxy", + "description": "Semver library that offers utilities, version constraint parsing and validation.", "keywords": [ - "Bridge", - "asset", - "composer", - "dependency manager", - "nodejs", - "npm", - "package", - "yarn" + "semantic", + "semver", + "validation", + "versioning" ], "support": { - "issues": "https://github.com/fxpio/foxy/issues", - "source": "https://github.com/fxpio/foxy/tree/v1.1.0" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.2.2" }, "funding": [ { - "url": "https://paypal.me/francoispluchino", + "url": "https://packagist.com", "type": "custom" }, { - "url": "https://github.com/francoispluchino", + "url": "https://github.com/composer", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" } ], - "time": "2020-06-06T20:12:54+00:00" + "time": "2020-10-14T08:51:15+00:00" }, { - "name": "guzzlehttp/psr7", - "version": "1.7.0", + "name": "composer/spdx-licenses", + "version": "1.5.4", "source": { "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" + "url": "https://github.com/composer/spdx-licenses.git", + "reference": "6946f785871e2314c60b4524851f3702ea4f2223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/6946f785871e2314c60b4524851f3702ea4f2223", + "reference": "6946f785871e2314c60b4524851f3702ea4f2223", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0", - "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" - }, - "suggest": { - "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] + "Composer\\Spdx\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -317,77 +342,848 @@ ], "authors": [ { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" }, { - "name": "Tobias Schultze", - "homepage": "https://github.com/Tobion" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" } ], - "description": "PSR-7 message implementation that also provides common utility methods", + "description": "SPDX licenses list and validation library.", "keywords": [ - "http", - "message", - "psr-7", - "request", - "response", - "stream", - "uri", - "url" + "license", + "spdx", + "validator" ], "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.7.0" + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/spdx-licenses/issues", + "source": "https://github.com/composer/spdx-licenses/tree/1.5.4" }, - "time": "2020-09-30T07:37:11+00:00" + "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-07-15T15:35:07+00:00" }, { - "name": "intervention/image", - "version": "2.5.1", + "name": "composer/xdebug-handler", + "version": "1.4.4", "source": { "type": "git", - "url": "https://github.com/Intervention/image.git", - "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e" + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", - "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", - "shasum": "" + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6e076a124f7ee146f2487554a94b6a19a74887ba", + "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/1.4.4" + }, + "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-10-24T12:39:10+00:00" + }, + { + "name": "doctrine/lexer", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042", + "reference": "e864bbf5904cb8f5bb334f99209b48018522f042", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + } + }, + "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": "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" + ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/1.2.1" + }, + "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": "2020-05-25T17:44:05+00:00" + }, + { + "name": "egulias/email-validator", + "version": "2.1.22", + "source": { + "type": "git", + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5", + "reference": "68e418ec08fbfc6f58f6fd2eea70ca8efc8cc7d5", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^1.0.1", + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.10" + }, + "require-dev": { + "dominicsayers/isemail": "^3.0.7", + "phpunit/phpunit": "^4.8.36|^7.5.15", + "satooshi/php-coveralls": "^1.0.1" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Egulias\\EmailValidator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gulias Davis" + } + ], + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", + "keywords": [ + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" + ], + "support": { + "issues": "https://github.com/egulias/EmailValidator/issues", + "source": "https://github.com/egulias/EmailValidator/tree/2.1.22" + }, + "time": "2020-09-26T15:48:38+00:00" + }, + { + "name": "foxy/foxy", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/fxpio/foxy.git", + "reference": "fa541677948a1a765a8120653603659249c60f0f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fxpio/foxy/zipball/fa541677948a1a765a8120653603659249c60f0f", + "reference": "fa541677948a1a765a8120653603659249c60f0f", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1|^2.0", + "php": ">=5.3.3" + }, + "require-dev": { + "composer/composer": "^1.5.0|^2.0.0@dev" + }, + "type": "composer-plugin", + "extra": { + "class": "Foxy\\Foxy", + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Foxy\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Pluchino", + "email": "francois.pluchino@gmail.com" + } + ], + "description": "Fast, reliable, and secure NPM/Yarn bridge for Composer", + "homepage": "https://github.com/fxpio/foxy", + "keywords": [ + "Bridge", + "asset", + "composer", + "dependency manager", + "nodejs", + "npm", + "package", + "yarn" + ], + "support": { + "issues": "https://github.com/fxpio/foxy/issues", + "source": "https://github.com/fxpio/foxy/tree/v1.1.0" + }, + "funding": [ + { + "url": "https://paypal.me/francoispluchino", + "type": "custom" + }, + { + "url": "https://github.com/francoispluchino", + "type": "github" + } + ], + "time": "2020-06-06T20:12:54+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", + "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Schultze", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.7.0" + }, + "time": "2020-09-30T07:37:11+00:00" + }, + { + "name": "intervention/image", + "version": "2.5.1", + "source": { + "type": "git", + "url": "https://github.com/Intervention/image.git", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Intervention/image/zipball/abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "reference": "abbf18d5ab8367f96b3205ca3c89fb2fa598c69e", + "shasum": "" + }, + "require": { + "ext-fileinfo": "*", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.4.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.2", + "phpunit/phpunit": "^4.8 || ^5.7" + }, + "suggest": { + "ext-gd": "to use GD library based image processing.", + "ext-imagick": "to use Imagick based image processing.", + "intervention/imagecache": "Caching extension for the Intervention Image library" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + }, + "laravel": { + "providers": [ + "Intervention\\Image\\ImageServiceProvider" + ], + "aliases": { + "Image": "Intervention\\Image\\Facades\\Image" + } + } + }, + "autoload": { + "psr-4": { + "Intervention\\Image\\": "src/Intervention/Image" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Vogel", + "email": "oliver@olivervogel.com", + "homepage": "http://olivervogel.com/" + } + ], + "description": "Image handling and manipulation library with support for Laravel integration", + "homepage": "http://image.intervention.io/", + "keywords": [ + "gd", + "image", + "imagick", + "laravel", + "thumbnail", + "watermark" + ], + "support": { + "issues": "https://github.com/Intervention/image/issues", + "source": "https://github.com/Intervention/image/tree/master" + }, + "time": "2019-11-02T09:15:47+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "5.2.10", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", + "reference": "2ba9c8c862ecd5510ed16c6340aa9f6eadb4f31b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/5.2.10" + }, + "time": "2020-05-27T16:41:55+00:00" + }, + { + "name": "lasserafn/php-initial-avatar-generator", + "version": "4.1.2", + "source": { + "type": "git", + "url": "https://github.com/LasseRafn/php-initial-avatar-generator.git", + "reference": "1d2d7363ea22d10915b95f2df31ea4f4aa384211" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LasseRafn/php-initial-avatar-generator/zipball/1d2d7363ea22d10915b95f2df31ea4f4aa384211", + "reference": "1d2d7363ea22d10915b95f2df31ea4f4aa384211", + "shasum": "" + }, + "require": { + "ext-json": "*", + "intervention/image": "^2.3", + "lasserafn/php-initials": "^3.0", + "lasserafn/php-string-script-language": "^0.1.0", + "meyfa/php-svg": "^0.9.0", + "overtrue/pinyin": "^4.0", + "php": "^7.0|^7.1|^7.2|^7.3|^7.4" + }, + "require-dev": { + "doctrine/instantiator": "1.0.*", + "phpunit/phpunit": "^6.5", + "satooshi/php-coveralls": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "LasseRafn\\InitialAvatarGenerator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lasse Rafn", + "email": "lasserafn@gmail.com" + } + ], + "description": "A package to generate avatars with initials for PHP", + "keywords": [ + "Initials", + "avatar", + "image", + "svg" + ], + "support": { + "issues": "https://github.com/LasseRafn/php-initial-avatar-generator/issues", + "source": "https://github.com/LasseRafn/php-initial-avatar-generator/tree/master" + }, + "funding": [ + { + "url": "https://opencollective.com/ui-avatars", + "type": "open_collective" + } + ], + "time": "2020-08-29T09:16:25+00:00" + }, + { + "name": "lasserafn/php-initials", + "version": "3.0", + "source": { + "type": "git", + "url": "https://github.com/LasseRafn/php-initials.git", + "reference": "551ef049aa83748d6fb5ce98ce5fe36f9f3eef94" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LasseRafn/php-initials/zipball/551ef049aa83748d6fb5ce98ce5fe36f9f3eef94", + "reference": "551ef049aa83748d6fb5ce98ce5fe36f9f3eef94", + "shasum": "" + }, + "require": { + "php": "^5.6|^7.0|^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^5.7", + "satooshi/php-coveralls": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "LasseRafn\\Initials\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lasse Rafn", + "email": "lasserafn@gmail.com" + } + ], + "description": "A package to generate initials in PHP", + "keywords": [ + "Initials", + "php" + ], + "support": { + "issues": "https://github.com/LasseRafn/php-initials/issues", + "source": "https://github.com/LasseRafn/php-initials/tree/master" + }, + "time": "2020-02-17T13:12:01+00:00" + }, + { + "name": "lasserafn/php-string-script-language", + "version": "0.1", + "source": { + "type": "git", + "url": "https://github.com/LasseRafn/php-string-script-language.git", + "reference": "afde8404f211af21f7ec8b453eb84ce70bbd3692" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LasseRafn/php-string-script-language/zipball/afde8404f211af21f7ec8b453eb84ce70bbd3692", + "reference": "afde8404f211af21f7ec8b453eb84ce70bbd3692", + "shasum": "" + }, + "require": { + "php": "^5.6|^7.0|^7.1" + }, + "require-dev": { + "doctrine/instantiator": "1.0.5", + "phpunit/phpunit": "^5.6", + "phpunit/phpunit-mock-objects": "3.2.4", + "satooshi/php-coveralls": "^1.0", + "sebastian/exporter": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "LasseRafn\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Lasse Rafn", + "email": "lasserafn@gmail.com" + } + ], + "description": "Detect language/encoding of a string in PHP", + "keywords": [ + "language", + "php", + "string" + ], + "support": { + "issues": "https://github.com/LasseRafn/php-string-script-language/issues", + "source": "https://github.com/LasseRafn/php-string-script-language/tree/master" + }, + "time": "2017-10-02T18:34:33+00:00" + }, + { + "name": "meyfa/php-svg", + "version": "v0.9.1", + "source": { + "type": "git", + "url": "https://github.com/meyfa/php-svg.git", + "reference": "34401edef1f724898f468f71b85505fbcc8351bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/meyfa/php-svg/zipball/34401edef1f724898f468f71b85505fbcc8351bb", + "reference": "34401edef1f724898f468f71b85505fbcc8351bb", + "shasum": "" + }, + "require": { + "ext-gd": "*", + "ext-simplexml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "meyfa/phpunit-assert-gd": "^1.1", + "phpunit/phpunit": "^4.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "SVG\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabian Meyer", + "homepage": "http://meyfa.net" + } + ], + "description": "Read, edit, write, and render SVG files with PHP", + "homepage": "https://github.com/meyfa/php-svg", + "keywords": [ + "svg" + ], + "support": { + "issues": "https://github.com/meyfa/php-svg/issues", + "source": "https://github.com/meyfa/php-svg/tree/v0.9.1" + }, + "time": "2019-07-30T18:41:25+00:00" + }, + { + "name": "nikic/fast-route", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/FastRoute.git", + "reference": "181d480e08d9476e61381e04a71b34dc0432e812" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812", + "reference": "181d480e08d9476e61381e04a71b34dc0432e812", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|~5.7" + }, + "type": "library", + "autoload": { + "psr-4": { + "FastRoute\\": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov", + "email": "nikic@php.net" + } + ], + "description": "Fast request router for PHP", + "keywords": [ + "router", + "routing" + ], + "support": { + "issues": "https://github.com/nikic/FastRoute/issues", + "source": "https://github.com/nikic/FastRoute/tree/master" + }, + "time": "2018-02-13T20:26:39+00:00" + }, + { + "name": "nyholm/psr7", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/Nyholm/psr7.git", + "reference": "21b71a31eab5c0c2caf967b9c0fd97020254ed75" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nyholm/psr7/zipball/21b71a31eab5c0c2caf967b9c0fd97020254ed75", + "reference": "21b71a31eab5c0c2caf967b9c0fd97020254ed75", + "shasum": "" }, "require": { - "ext-fileinfo": "*", - "guzzlehttp/psr7": "~1.1", - "php": ">=5.4.0" + "php": ">=7.1", + "php-http/message-factory": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0" }, - "require-dev": { - "mockery/mockery": "~0.9.2", - "phpunit/phpunit": "^4.8 || ^5.7" + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" }, - "suggest": { - "ext-gd": "to use GD library based image processing.", - "ext-imagick": "to use Imagick based image processing.", - "intervention/imagecache": "Caching extension for the Intervention Image library" + "require-dev": { + "http-interop/http-factory-tests": "dev-master", + "php-http/psr7-integration-tests": "^1.0", + "phpunit/phpunit": "^7.5", + "symfony/error-handler": "^4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4-dev" - }, - "laravel": { - "providers": [ - "Intervention\\Image\\ImageServiceProvider" - ], - "aliases": { - "Image": "Intervention\\Image\\Facades\\Image" - } + "dev-master": "1.0-dev" } }, "autoload": { "psr-4": { - "Intervention\\Image\\": "src/Intervention/Image" + "Nyholm\\Psr7\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -396,60 +1192,71 @@ ], "authors": [ { - "name": "Oliver Vogel", - "email": "oliver@olivervogel.com", - "homepage": "http://olivervogel.com/" + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + }, + { + "name": "Martijn van der Ven", + "email": "martijn@vanderven.se" } ], - "description": "Image handling and manipulation library with support for Laravel integration", - "homepage": "http://image.intervention.io/", + "description": "A fast PHP7 implementation of PSR-7", + "homepage": "http://tnyholm.se", "keywords": [ - "gd", - "image", - "imagick", - "laravel", - "thumbnail", - "watermark" + "psr-17", + "psr-7" ], "support": { - "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/master" + "issues": "https://github.com/Nyholm/psr7/issues", + "source": "https://github.com/Nyholm/psr7/tree/1.3.1" }, - "time": "2019-11-02T09:15:47+00:00" + "funding": [ + { + "url": "https://github.com/Zegnat", + "type": "github" + }, + { + "url": "https://github.com/nyholm", + "type": "github" + } + ], + "time": "2020-06-13T15:59:10+00:00" }, { - "name": "lasserafn/php-initial-avatar-generator", - "version": "4.1.2", + "name": "opis/closure", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/LasseRafn/php-initial-avatar-generator.git", - "reference": "1d2d7363ea22d10915b95f2df31ea4f4aa384211" + "url": "https://github.com/opis/closure.git", + "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LasseRafn/php-initial-avatar-generator/zipball/1d2d7363ea22d10915b95f2df31ea4f4aa384211", - "reference": "1d2d7363ea22d10915b95f2df31ea4f4aa384211", + "url": "https://api.github.com/repos/opis/closure/zipball/c547f8262a5fa9ff507bd06cc394067b83a75085", + "reference": "c547f8262a5fa9ff507bd06cc394067b83a75085", "shasum": "" }, "require": { - "ext-json": "*", - "intervention/image": "^2.3", - "lasserafn/php-initials": "^3.0", - "lasserafn/php-string-script-language": "^0.1.0", - "meyfa/php-svg": "^0.9.0", - "overtrue/pinyin": "^4.0", - "php": "^7.0|^7.1|^7.2|^7.3|^7.4" + "php": "^5.4 || ^7.0 || ^8.0" }, "require-dev": { - "doctrine/instantiator": "1.0.*", - "phpunit/phpunit": "^6.5", - "satooshi/php-coveralls": "^1.0" + "jeremeamia/superclosure": "^2.0", + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" }, + "default-branch": true, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.6.x-dev" + } + }, "autoload": { "psr-4": { - "LasseRafn\\InitialAvatarGenerator\\": "src/" - } + "Opis\\Closure\\": "src/" + }, + "files": [ + "functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -457,55 +1264,72 @@ ], "authors": [ { - "name": "Lasse Rafn", - "email": "lasserafn@gmail.com" + "name": "Marius Sarca", + "email": "marius.sarca@gmail.com" + }, + { + "name": "Sorin Sarca", + "email": "sarca_sorin@hotmail.com" } ], - "description": "A package to generate avatars with initials for PHP", + "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", + "homepage": "https://opis.io/closure", "keywords": [ - "Initials", - "avatar", - "image", - "svg" + "anonymous functions", + "closure", + "function", + "serializable", + "serialization", + "serialize" ], "support": { - "issues": "https://github.com/LasseRafn/php-initial-avatar-generator/issues", - "source": "https://github.com/LasseRafn/php-initial-avatar-generator/tree/master" + "issues": "https://github.com/opis/closure/issues", + "source": "https://github.com/opis/closure/tree/3.6.0" }, - "funding": [ - { - "url": "https://opencollective.com/ui-avatars", - "type": "open_collective" - } - ], - "time": "2020-08-29T09:16:25+00:00" + "time": "2020-10-11T21:42:15+00:00" }, { - "name": "lasserafn/php-initials", - "version": "3.0", + "name": "overtrue/pinyin", + "version": "4.0.6", "source": { "type": "git", - "url": "https://github.com/LasseRafn/php-initials.git", - "reference": "551ef049aa83748d6fb5ce98ce5fe36f9f3eef94" + "url": "https://github.com/overtrue/pinyin.git", + "reference": "9836dae1783bcf5934508a2abe32eca9ea5ee15d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LasseRafn/php-initials/zipball/551ef049aa83748d6fb5ce98ce5fe36f9f3eef94", - "reference": "551ef049aa83748d6fb5ce98ce5fe36f9f3eef94", + "url": "https://api.github.com/repos/overtrue/pinyin/zipball/9836dae1783bcf5934508a2abe32eca9ea5ee15d", + "reference": "9836dae1783bcf5934508a2abe32eca9ea5ee15d", "shasum": "" }, "require": { - "php": "^5.6|^7.0|^7.1" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^5.7", - "satooshi/php-coveralls": "^1.0" + "brainmaestro/composer-git-hooks": "^2.7", + "friendsofphp/php-cs-fixer": "^2.16", + "phpunit/phpunit": "~8.0" }, "type": "library", + "extra": { + "hooks": { + "pre-commit": [ + "composer test", + "composer fix-style" + ], + "pre-push": [ + "composer test", + "composer check-style" + ] + } + }, "autoload": { "psr-4": { - "LasseRafn\\Initials\\": "src/" - } + "Overtrue\\Pinyin\\": "src/" + }, + "files": [ + "src/const.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -513,100 +1337,107 @@ ], "authors": [ { - "name": "Lasse Rafn", - "email": "lasserafn@gmail.com" + "name": "overtrue", + "email": "anzhengchao@gmail.com", + "homepage": "http://github.com/overtrue" } ], - "description": "A package to generate initials in PHP", + "description": "Chinese to pinyin translator.", + "homepage": "https://github.com/overtrue/pinyin", "keywords": [ - "Initials", - "php" + "Chinese", + "Pinyin", + "cn2pinyin" ], "support": { - "issues": "https://github.com/LasseRafn/php-initials/issues", - "source": "https://github.com/LasseRafn/php-initials/tree/master" + "issues": "https://github.com/overtrue/pinyin/issues", + "source": "https://github.com/overtrue/pinyin/tree/master" }, - "time": "2020-02-17T13:12:01+00:00" + "funding": [ + { + "url": "https://www.patreon.com/overtrue", + "type": "patreon" + } + ], + "time": "2020-04-13T08:53:30+00:00" }, { - "name": "lasserafn/php-string-script-language", - "version": "0.1", + "name": "paragonie/random_compat", + "version": "v9.99.100", "source": { "type": "git", - "url": "https://github.com/LasseRafn/php-string-script-language.git", - "reference": "afde8404f211af21f7ec8b453eb84ce70bbd3692" + "url": "https://github.com/paragonie/random_compat.git", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LasseRafn/php-string-script-language/zipball/afde8404f211af21f7ec8b453eb84ce70bbd3692", - "reference": "afde8404f211af21f7ec8b453eb84ce70bbd3692", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", "shasum": "" }, "require": { - "php": "^5.6|^7.0|^7.1" + "php": ">= 7" }, "require-dev": { - "doctrine/instantiator": "1.0.5", - "phpunit/phpunit": "^5.6", - "phpunit/phpunit-mock-objects": "3.2.4", - "satooshi/php-coveralls": "^1.0", - "sebastian/exporter": "^1.2" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, - "type": "library", - "autoload": { - "psr-4": { - "LasseRafn\\": "src/" - } + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, + "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Lasse Rafn", - "email": "lasserafn@gmail.com" + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" } ], - "description": "Detect language/encoding of a string in PHP", + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ - "language", - "php", - "string" + "csprng", + "polyfill", + "pseudorandom", + "random" ], "support": { - "issues": "https://github.com/LasseRafn/php-string-script-language/issues", - "source": "https://github.com/LasseRafn/php-string-script-language/tree/master" + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" }, - "time": "2017-10-02T18:34:33+00:00" + "time": "2020-10-15T08:29:30+00:00" }, { - "name": "meyfa/php-svg", - "version": "v0.9.1", + "name": "php-http/message-factory", + "version": "v1.0.2", "source": { "type": "git", - "url": "https://github.com/meyfa/php-svg.git", - "reference": "34401edef1f724898f468f71b85505fbcc8351bb" + "url": "https://github.com/php-http/message-factory.git", + "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/meyfa/php-svg/zipball/34401edef1f724898f468f71b85505fbcc8351bb", - "reference": "34401edef1f724898f468f71b85505fbcc8351bb", + "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", "shasum": "" }, "require": { - "ext-gd": "*", - "ext-simplexml": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "meyfa/phpunit-assert-gd": "^1.1", - "phpunit/phpunit": "^4.8" + "php": ">=5.4", + "psr/http-message": "^1.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { "psr-4": { - "SVG\\": "src/" + "Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -615,110 +1446,104 @@ ], "authors": [ { - "name": "Fabian Meyer", - "homepage": "http://meyfa.net" + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com" } ], - "description": "Read, edit, write, and render SVG files with PHP", - "homepage": "https://github.com/meyfa/php-svg", + "description": "Factory interfaces for PSR-7 HTTP Message", + "homepage": "http://php-http.org", "keywords": [ - "svg" + "factory", + "http", + "message", + "stream", + "uri" ], "support": { - "issues": "https://github.com/meyfa/php-svg/issues", - "source": "https://github.com/meyfa/php-svg/tree/v0.9.1" + "issues": "https://github.com/php-http/message-factory/issues", + "source": "https://github.com/php-http/message-factory/tree/master" }, - "time": "2019-07-30T18:41:25+00:00" + "time": "2015-12-19T14:08:53+00:00" }, { - "name": "nikic/fast-route", - "version": "v1.3.0", + "name": "psr/container", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/nikic/FastRoute.git", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812" + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", "shasum": "" }, "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35|~5.7" + "php": ">=5.3.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { - "FastRoute\\": "src/" - }, - "files": [ - "src/functions.php" - ] + "Psr\\Container\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Nikita Popov", - "email": "nikic@php.net" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Fast request router for PHP", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "router", - "routing" + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], "support": { - "issues": "https://github.com/nikic/FastRoute/issues", - "source": "https://github.com/nikic/FastRoute/tree/master" + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/master" }, - "time": "2018-02-13T20:26:39+00:00" + "time": "2017-02-14T16:28:37+00:00" }, { - "name": "nyholm/psr7", - "version": "1.3.1", + "name": "psr/event-dispatcher", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/Nyholm/psr7.git", - "reference": "21b71a31eab5c0c2caf967b9c0fd97020254ed75" + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Nyholm/psr7/zipball/21b71a31eab5c0c2caf967b9c0fd97020254ed75", - "reference": "21b71a31eab5c0c2caf967b9c0fd97020254ed75", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", "shasum": "" }, "require": { - "php": ">=7.1", - "php-http/message-factory": "^1.0", - "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": { - "http-interop/http-factory-tests": "dev-master", - "php-http/psr7-integration-tests": "^1.0", - "phpunit/phpunit": "^7.5", - "symfony/error-handler": "^4.4" + "php": ">=7.2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Nyholm\\Psr7\\": "src/" + "Psr\\EventDispatcher\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -727,78 +1552,50 @@ ], "authors": [ { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com" - }, - { - "name": "Martijn van der Ven", - "email": "martijn@vanderven.se" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "A fast PHP7 implementation of PSR-7", - "homepage": "http://tnyholm.se", + "description": "Standard interfaces for event handling.", "keywords": [ - "psr-17", - "psr-7" + "events", + "psr", + "psr-14" ], "support": { - "issues": "https://github.com/Nyholm/psr7/issues", - "source": "https://github.com/Nyholm/psr7/tree/1.3.1" + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" }, - "funding": [ - { - "url": "https://github.com/Zegnat", - "type": "github" - }, - { - "url": "https://github.com/nyholm", - "type": "github" - } - ], - "time": "2020-06-13T15:59:10+00:00" + "time": "2019-01-08T18:20:26+00:00" }, { - "name": "overtrue/pinyin", - "version": "4.0.6", + "name": "psr/http-factory", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/overtrue/pinyin.git", - "reference": "9836dae1783bcf5934508a2abe32eca9ea5ee15d" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/pinyin/zipball/9836dae1783bcf5934508a2abe32eca9ea5ee15d", - "reference": "9836dae1783bcf5934508a2abe32eca9ea5ee15d", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "require-dev": { - "brainmaestro/composer-git-hooks": "^2.7", - "friendsofphp/php-cs-fixer": "^2.16", - "phpunit/phpunit": "~8.0" + "php": ">=7.0.0", + "psr/http-message": "^1.0" }, "type": "library", "extra": { - "hooks": { - "pre-commit": [ - "composer test", - "composer fix-style" - ], - "pre-push": [ - "composer test", - "composer check-style" - ] + "branch-alias": { + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Overtrue\\Pinyin\\": "src/" - }, - "files": [ - "src/const.php" - ] + "Psr\\Http\\Message\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -806,107 +1603,106 @@ ], "authors": [ { - "name": "overtrue", - "email": "anzhengchao@gmail.com", - "homepage": "http://github.com/overtrue" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Chinese to pinyin translator.", - "homepage": "https://github.com/overtrue/pinyin", + "description": "Common interfaces for PSR-7 HTTP message factories", "keywords": [ - "Chinese", - "Pinyin", - "cn2pinyin" + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" ], "support": { - "issues": "https://github.com/overtrue/pinyin/issues", - "source": "https://github.com/overtrue/pinyin/tree/master" + "source": "https://github.com/php-fig/http-factory/tree/master" }, - "funding": [ - { - "url": "https://www.patreon.com/overtrue", - "type": "patreon" - } - ], - "time": "2020-04-13T08:53:30+00:00" + "time": "2019-04-30T12:38:16+00:00" }, { - "name": "paragonie/random_compat", - "version": "v9.99.100", + "name": "psr/http-message", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { - "php": ">= 7" + "php": ">=5.3.0" }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*", - "vimeo/psalm": "^1" + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } }, - "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" ], "support": { - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/random_compat/issues", - "source": "https://github.com/paragonie/random_compat" + "source": "https://github.com/php-fig/http-message/tree/master" }, - "time": "2020-10-15T08:29:30+00:00" + "time": "2016-08-06T14:39:51+00:00" }, { - "name": "php-http/message-factory", - "version": "v1.0.2", + "name": "psr/http-server-handler", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/php-http/message-factory.git", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1" + "url": "https://github.com/php-fig/http-server-handler.git", + "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message-factory/zipball/a478cb11f66a6ac48d8954216cfed9aa06a501a1", - "reference": "a478cb11f66a6ac48d8954216cfed9aa06a501a1", + "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7", + "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7", "shasum": "" }, "require": { - "php": ">=5.4", + "php": ">=7.0", "psr/http-message": "^1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Http\\Message\\": "src/" + "Psr\\Http\\Server\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -915,41 +1711,46 @@ ], "authors": [ { - "name": "Márk Sági-Kazár", - "email": "mark.sagikazar@gmail.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Factory interfaces for PSR-7 HTTP Message", - "homepage": "http://php-http.org", + "description": "Common interface for HTTP server-side request handler", "keywords": [ - "factory", + "handler", "http", - "message", - "stream", - "uri" + "http-interop", + "psr", + "psr-15", + "psr-7", + "request", + "response", + "server" ], "support": { - "issues": "https://github.com/php-http/message-factory/issues", - "source": "https://github.com/php-http/message-factory/tree/master" + "issues": "https://github.com/php-fig/http-server-handler/issues", + "source": "https://github.com/php-fig/http-server-handler/tree/master" }, - "time": "2015-12-19T14:08:53+00:00" + "time": "2018-10-30T16:46:14+00:00" }, { - "name": "psr/container", - "version": "1.0.0", + "name": "psr/http-server-middleware", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "url": "https://github.com/php-fig/http-server-middleware.git", + "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5", + "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.0", + "psr/http-message": "^1.0", + "psr/http-server-handler": "^1.0" }, "type": "library", "extra": { @@ -959,7 +1760,7 @@ }, "autoload": { "psr-4": { - "Psr\\Container\\": "src/" + "Psr\\Http\\Server\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -972,47 +1773,49 @@ "homepage": "http://www.php-fig.org/" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "Common interface for HTTP server-side middleware", "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" + "http", + "http-interop", + "middleware", + "psr", + "psr-15", + "psr-7", + "request", + "response" ], "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "issues": "https://github.com/php-fig/http-server-middleware/issues", + "source": "https://github.com/php-fig/http-server-middleware/tree/master" }, - "time": "2017-02-14T16:28:37+00:00" + "time": "2018-10-30T17:12:04+00:00" }, { - "name": "psr/event-dispatcher", - "version": "1.0.0", + "name": "psr/log", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/php-fig/event-dispatcher.git", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + "url": "https://github.com/php-fig/log.git", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", - "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\EventDispatcher\\": "src/" + "Psr\\Log\\": "Psr/Log/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1025,35 +1828,34 @@ "homepage": "http://www.php-fig.org/" } ], - "description": "Standard interfaces for event handling.", + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", "keywords": [ - "events", + "log", "psr", - "psr-14" + "psr-3" ], "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + "source": "https://github.com/php-fig/log/tree/1.1.3" }, - "time": "2019-01-08T18:20:26+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { - "name": "psr/http-factory", + "name": "psr/simple-cache", "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "php": ">=5.3.0" }, "type": "library", "extra": { @@ -1063,7 +1865,7 @@ }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "Psr\\SimpleCache\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1076,49 +1878,91 @@ "homepage": "http://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "Common interfaces for simple caching", "keywords": [ - "factory", - "http", - "message", + "cache", + "caching", "psr", - "psr-17", - "psr-7", - "request", - "response" + "psr-16", + "simple-cache" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/simple-cache/tree/master" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2017-10-23T01:57:42+00:00" }, { - "name": "psr/http-message", - "version": "1.0.1", + "name": "ralouphie/getallheaders", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" } + ], + "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "react/promise", + "version": "v2.8.0", + "source": { + "type": "git", + "url": "https://github.com/reactphp/promise.git", + "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4", + "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4", + "shasum": "" }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36" + }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" - } + "React\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1126,52 +1970,48 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com" } ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", + "description": "A lightweight implementation of CommonJS Promises/A for PHP", "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" + "promise", + "promises" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v2.8.0" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2020-05-12T15:16:56+00:00" }, { - "name": "psr/http-server-handler", - "version": "1.0.1", + "name": "riimu/kit-phpencoder", + "version": "v2.4.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-server-handler.git", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7" + "url": "https://github.com/Riimu/Kit-PHPEncoder.git", + "reference": "7e876d25019c3f6c23321ab5ac1a55c72fcd0933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/aff2f80e33b7f026ec96bb42f63242dc50ffcae7", - "reference": "aff2f80e33b7f026ec96bb42f63242dc50ffcae7", + "url": "https://api.github.com/repos/Riimu/Kit-PHPEncoder/zipball/7e876d25019c3f6c23321ab5ac1a55c72fcd0933", + "reference": "7e876d25019c3f6c23321ab5ac1a55c72fcd0933", "shasum": "" }, "require": { - "php": ">=7.0", - "psr/http-message": "^1.0" + "php": ">=5.6.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^7.2 || ^6.5 || ^5.7" + }, + "suggest": { + "ext-gmp": "To convert GMP numbers into PHP code" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Http\\Server\\": "src/" + "Riimu\\Kit\\PHPEncoder\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1180,56 +2020,53 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Riikka Kalliomäki", + "email": "riikka.kalliomaki@gmail.com", + "homepage": "http://riimu.net" } ], - "description": "Common interface for HTTP server-side request handler", + "description": "Highly customizable alternative to var_export for PHP code generation", + "homepage": "http://kit.riimu.net", "keywords": [ - "handler", - "http", - "http-interop", - "psr", - "psr-15", - "psr-7", - "request", - "response", - "server" + "code", + "encoder", + "export", + "generator", + "variable" ], "support": { - "issues": "https://github.com/php-fig/http-server-handler/issues", - "source": "https://github.com/php-fig/http-server-handler/tree/master" + "issues": "https://github.com/Riimu/Kit-PHPEncoder/issues", + "source": "https://github.com/Riimu/Kit-PHPEncoder/tree/master" }, - "time": "2018-10-30T16:46:14+00:00" + "time": "2018-07-03T12:46:23+00:00" }, { - "name": "psr/http-server-middleware", - "version": "1.0.1", + "name": "seld/jsonlint", + "version": "1.8.2", "source": { "type": "git", - "url": "https://github.com/php-fig/http-server-middleware.git", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5" + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/2296f45510945530b9dceb8bcedb5cb84d40c5f5", - "reference": "2296f45510945530b9dceb8bcedb5cb84d40c5f5", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/590cfec960b77fd55e39b7d9246659e95dd6d337", + "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337", "shasum": "" }, "require": { - "php": ">=7.0", - "psr/http-message": "^1.0", - "psr/http-server-handler": "^1.0" + "php": "^5.3 || ^7.0 || ^8.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", "autoload": { "psr-4": { - "Psr\\Http\\Server\\": "src/" + "Seld\\JsonLint\\": "src/Seld/JsonLint/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1238,53 +2075,60 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" } ], - "description": "Common interface for HTTP server-side middleware", + "description": "JSON Linter", "keywords": [ - "http", - "http-interop", - "middleware", - "psr", - "psr-15", - "psr-7", - "request", - "response" + "json", + "linter", + "parser", + "validator" ], "support": { - "issues": "https://github.com/php-fig/http-server-middleware/issues", - "source": "https://github.com/php-fig/http-server-middleware/tree/master" + "issues": "https://github.com/Seldaek/jsonlint/issues", + "source": "https://github.com/Seldaek/jsonlint/tree/master" }, - "time": "2018-10-30T17:12:04+00:00" + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", + "type": "tidelift" + } + ], + "time": "2020-08-25T06:56:57+00:00" }, { - "name": "psr/log", - "version": "1.1.3", + "name": "seld/phar-utils", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" + "url": "https://github.com/Seldaek/phar-utils.git", + "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", + "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/8674b1d84ffb47cc59a101f5d5a3b61e87d23796", + "reference": "8674b1d84ffb47cc59a101f5d5a3b61e87d23796", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Seld\\PharUtils\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1293,49 +2137,59 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "PHAR file format utilities, for when PHP phars you up", "keywords": [ - "log", - "psr", - "psr-3" + "phar" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" + "issues": "https://github.com/Seldaek/phar-utils/issues", + "source": "https://github.com/Seldaek/phar-utils/tree/master" }, - "time": "2020-03-23T09:12:05+00:00" + "time": "2020-07-07T18:42:57+00:00" }, { - "name": "psr/simple-cache", - "version": "1.0.1", + "name": "swiftmailer/swiftmailer", + "version": "v6.2.3", "source": { "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + "url": "https://github.com/swiftmailer/swiftmailer.git", + "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/149cfdf118b169f7840bbe3ef0d4bc795d1780c9", + "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9", "shasum": "" }, "require": { - "php": ">=5.3.0" + "egulias/email-validator": "~2.0", + "php": ">=7.0.0", + "symfony/polyfill-iconv": "^1.0", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" + }, + "require-dev": { + "mockery/mockery": "~0.9.1", + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + }, + "suggest": { + "ext-intl": "Needed to support internationalized email addresses", + "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "6.2-dev" } }, "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } + "files": [ + "lib/swift_required.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1343,48 +2197,85 @@ ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Chris Corbyn" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], - "description": "Common interfaces for simple caching", + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "https://swiftmailer.symfony.com", "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" + "email", + "mail", + "mailer" ], "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" + "issues": "https://github.com/swiftmailer/swiftmailer/issues", + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.3" }, - "time": "2017-10-23T01:57:42+00:00" + "time": "2019-11-12T09:31:26+00:00" }, { - "name": "ralouphie/getallheaders", - "version": "3.0.3", + "name": "symfony/console", + "version": "v5.1.7", "source": { "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" + "url": "https://github.com/symfony/console.git", + "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", + "url": "https://api.github.com/repos/symfony/console/zipball/ae789a8a2ad189ce7e8216942cdb9b77319f5eb8", + "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.2.5", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1|^2", + "symfony/string": "^5.1" + }, + "conflict": { + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", + "symfony/lock": "<4.4", + "symfony/process": "<4.4" + }, + "provide": { + "psr/log-implementation": "1.0" }, "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" + "psr/log": "~1.0", + "symfony/config": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/event-dispatcher": "^4.4|^5.0", + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^4.4|^5.0", + "symfony/var-dumper": "^4.4|^5.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, "autoload": { - "files": [ - "src/getallheaders.php" + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1393,56 +2284,70 @@ ], "authors": [ { - "name": "Ralph Khattar", - "email": "ralph.khattar@gmail.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A polyfill for getallheaders.", + "description": "Symfony Console Component", + "homepage": "https://symfony.com", "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" + "source": "https://github.com/symfony/console/tree/v5.1.7" }, - "time": "2019-03-08T08:55:37+00:00" + "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-10-07T15:23:00+00:00" }, { - "name": "swiftmailer/swiftmailer", - "version": "v6.2.3", + "name": "symfony/event-dispatcher-contracts", + "version": "v2.2.0", "source": { "type": "git", - "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/149cfdf118b169f7840bbe3ef0d4bc795d1780c9", - "reference": "149cfdf118b169f7840bbe3ef0d4bc795d1780c9", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2", + "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2", "shasum": "" }, "require": { - "egulias/email-validator": "~2.0", - "php": ">=7.0.0", - "symfony/polyfill-iconv": "^1.0", - "symfony/polyfill-intl-idn": "^1.10", - "symfony/polyfill-mbstring": "^1.0" - }, - "require-dev": { - "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8" + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" }, "suggest": { - "ext-intl": "Needed to support internationalized email addresses", - "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed" + "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.2-dev" + "dev-master": "2.2-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { - "files": [ - "lib/swift_required.php" - ] + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1450,72 +2355,60 @@ ], "authors": [ { - "name": "Chris Corbyn" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Swiftmailer, free feature-rich PHP mailer", - "homepage": "https://swiftmailer.symfony.com", + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", "keywords": [ - "email", - "mail", - "mailer" + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" ], "support": { - "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.3" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" }, - "time": "2019-11-12T09:31:26+00:00" + "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" }, { - "name": "symfony/console", + "name": "symfony/filesystem", "version": "v5.1.7", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8" + "url": "https://github.com/symfony/filesystem.git", + "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ae789a8a2ad189ce7e8216942cdb9b77319f5eb8", - "reference": "ae789a8a2ad189ce7e8216942cdb9b77319f5eb8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/1a8697545a8d87b9f2f6b1d32414199cc5e20aae", + "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", - "symfony/polyfill-php80": "^1.15", - "symfony/service-contracts": "^1.1|^2", - "symfony/string": "^5.1" - }, - "conflict": { - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" - }, - "provide": { - "psr/log-implementation": "1.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^4.4|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/event-dispatcher": "^4.4|^5.0", - "symfony/lock": "^4.4|^5.0", - "symfony/process": "^4.4|^5.0", - "symfony/var-dumper": "^4.4|^5.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { @@ -1525,7 +2418,7 @@ }, "autoload": { "psr-4": { - "Symfony\\Component\\Console\\": "" + "Symfony\\Component\\Filesystem\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1545,10 +2438,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Console Component", + "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v5.1.7" + "source": "https://github.com/symfony/filesystem/tree/v5.1.7" }, "funding": [ { @@ -1564,43 +2457,38 @@ "type": "tidelift" } ], - "time": "2020-10-07T15:23:00+00:00" + "time": "2020-09-27T14:02:37+00:00" }, { - "name": "symfony/event-dispatcher-contracts", - "version": "v2.2.0", + "name": "symfony/finder", + "version": "v5.1.7", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2" + "url": "https://github.com/symfony/finder.git", + "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2", + "url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8", + "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/event-dispatcher": "^1" - }, - "suggest": { - "symfony/event-dispatcher-implementation": "" + "php": ">=7.2.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" + "dev-master": "5.1-dev" } }, "autoload": { "psr-4": { - "Symfony\\Contracts\\EventDispatcher\\": "" - } + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1608,26 +2496,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Generic abstractions related to dispatching event", + "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" + "source": "https://github.com/symfony/finder/tree/v5.1.7" }, "funding": [ { @@ -1643,7 +2523,7 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2020-09-02T16:23:27+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2455,6 +3335,73 @@ ], "time": "2020-10-23T09:01:57+00:00" }, + { + "name": "symfony/process", + "version": "v5.1.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/d3a2e64866169586502f0cd9cab69135ad12cee9", + "reference": "d3a2e64866169586502f0cd9cab69135ad12cee9", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.15" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/5.1" + }, + "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-02T16:23:27+00:00" + }, { "name": "symfony/service-contracts", "version": "v2.2.0", @@ -3156,66 +4103,141 @@ "time": "2020-10-21T23:46:03+00:00" }, { - "name": "yiisoft/cache-file", + "name": "yiisoft/cache-file", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/yiisoft/cache-file.git", + "reference": "60d7d0f407037212630c6579e2adb3efad660724" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/yiisoft/cache-file/zipball/60d7d0f407037212630c6579e2adb3efad660724", + "reference": "60d7d0f407037212630c6579e2adb3efad660724", + "shasum": "" + }, + "require": { + "php": "^7.4|^8.0", + "psr/simple-cache": "~1.0.0", + "yiisoft/serializer": "dev-master" + }, + "require-dev": { + "infection/infection": "^0.18.0", + "php-mock/php-mock-phpunit": "^2.4", + "phpunit/phpunit": "^9.3", + "vimeo/psalm": "^4.0", + "yiisoft/aliases": "^1.0" + }, + "default-branch": true, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + }, + "config-plugin": { + "common": "config/common.php", + "params": "config/params.php" + } + }, + "autoload": { + "psr-4": { + "Yiisoft\\Cache\\File\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Yii Caching Library - File Handler", + "homepage": "http://www.yiiframework.com/", + "keywords": [ + "cache", + "file", + "framework", + "psr-16", + "yii" + ], + "support": { + "forum": "http://www.yiiframework.com/forum/", + "irc": "irc://irc.freenode.net/yii", + "issues": "https://github.com/yiisoft/cache-file/issues?state=open", + "source": "https://github.com/yiisoft/cache-file", + "wiki": "http://www.yiiframework.com/wiki/" + }, + "funding": [ + { + "url": "https://github.com/yiisoft", + "type": "github" + }, + { + "url": "https://opencollective.com/yiisoft", + "type": "open_collective" + } + ], + "time": "2020-10-21T23:30:23+00:00" + }, + { + "name": "yiisoft/composer-config-plugin", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/yiisoft/cache-file.git", - "reference": "60d7d0f407037212630c6579e2adb3efad660724" + "url": "https://github.com/yiisoft/composer-config-plugin.git", + "reference": "d007da353dc38b5bc43e4c5955c3686c984b38a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/cache-file/zipball/60d7d0f407037212630c6579e2adb3efad660724", - "reference": "60d7d0f407037212630c6579e2adb3efad660724", + "url": "https://api.github.com/repos/yiisoft/composer-config-plugin/zipball/d007da353dc38b5bc43e4c5955c3686c984b38a4", + "reference": "d007da353dc38b5bc43e4c5955c3686c984b38a4", "shasum": "" }, "require": { + "composer-plugin-api": "^1.0|^2.0", + "composer/composer": "~1.0|~2.0@dev", + "ext-json": "*", + "opis/closure": "3.6.x-dev@dev", "php": "^7.4|^8.0", - "psr/simple-cache": "~1.0.0", - "yiisoft/serializer": "dev-master" + "riimu/kit-phpencoder": "^2.4", + "yiisoft/arrays": "3.0.x-dev", + "yiisoft/files": "^3.0@dev" }, "require-dev": { - "infection/infection": "^0.18.0", - "php-mock/php-mock-phpunit": "^2.4", - "phpunit/phpunit": "^9.3", - "vimeo/psalm": "^4.0", - "yiisoft/aliases": "^1.0" + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "symfony/yaml": "^2.0 || ^3.0 || ^4.0 for YAML files support", + "vlucas/phpdotenv": "^2.0 for `.env` files support" }, "default-branch": true, - "type": "library", + "type": "composer-plugin", "extra": { + "class": "Yiisoft\\Composer\\Config\\ComposerEventHandler", "branch-alias": { - "dev-master": "3.0.x-dev" - }, - "config-plugin": { - "common": "config/common.php", - "params": "config/params.php" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Yiisoft\\Cache\\File\\": "src" + "Yiisoft\\Composer\\Config\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], - "description": "Yii Caching Library - File Handler", - "homepage": "http://www.yiiframework.com/", + "description": "Composer plugin for config assembling", + "homepage": "https://github.com/yiisoft/composer-config-plugin", "keywords": [ - "cache", - "file", - "framework", - "psr-16", - "yii" + "assembling", + "composer", + "config", + "plugin" ], "support": { - "forum": "http://www.yiiframework.com/forum/", + "forum": "https://www.yiiframework.com/forum/", "irc": "irc://irc.freenode.net/yii", - "issues": "https://github.com/yiisoft/cache-file/issues?state=open", - "source": "https://github.com/yiisoft/cache-file", - "wiki": "http://www.yiiframework.com/wiki/" + "issues": "https://github.com/yiisoft/composer-config-plugin/issues?state=open", + "source": "https://github.com/yiisoft/composer-config-plugin", + "wiki": "https://www.yiiframework.com/wiki/" }, "funding": [ { @@ -3227,7 +4249,7 @@ "type": "open_collective" } ], - "time": "2020-10-21T23:30:23+00:00" + "time": "2020-10-20T14:15:34+00:00" }, { "name": "yiisoft/cookies", @@ -3669,12 +4691,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/di.git", - "reference": "283caf26fcc370cc7053252963d9b7befe23a028" + "reference": "41a1a8a32aef66df09521690c3538b36008b7dc7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/di/zipball/283caf26fcc370cc7053252963d9b7befe23a028", - "reference": "283caf26fcc370cc7053252963d9b7befe23a028", + "url": "https://api.github.com/repos/yiisoft/di/zipball/41a1a8a32aef66df09521690c3538b36008b7dc7", + "reference": "41a1a8a32aef66df09521690c3538b36008b7dc7", "shasum": "" }, "require": { @@ -3742,7 +4764,7 @@ "type": "open_collective" } ], - "time": "2020-10-21T23:33:37+00:00" + "time": "2020-10-24T15:45:08+00:00" }, { "name": "yiisoft/event-dispatcher", @@ -3818,12 +4840,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/factory.git", - "reference": "ce801957127099de5a706b2e933dc3913dedb6a5" + "reference": "6eec84303d25a2b7f36e2604a44058e6fef5df7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/factory/zipball/ce801957127099de5a706b2e933dc3913dedb6a5", - "reference": "ce801957127099de5a706b2e933dc3913dedb6a5", + "url": "https://api.github.com/repos/yiisoft/factory/zipball/6eec84303d25a2b7f36e2604a44058e6fef5df7e", + "reference": "6eec84303d25a2b7f36e2604a44058e6fef5df7e", "shasum": "" }, "require": { @@ -3876,7 +4898,7 @@ "type": "open_collective" } ], - "time": "2020-10-24T10:51:42+00:00" + "time": "2020-10-24T15:42:25+00:00" }, { "name": "yiisoft/files", @@ -6647,30 +7669,29 @@ }, { "name": "codeception/module-phpbrowser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/Codeception/module-phpbrowser.git", - "reference": "c1962657504a2a476b8dbd1f1ee05e0c912e5645" + "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/c1962657504a2a476b8dbd1f1ee05e0c912e5645", - "reference": "c1962657504a2a476b8dbd1f1ee05e0c912e5645", + "url": "https://api.github.com/repos/Codeception/module-phpbrowser/zipball/770a6be4160a5c0c08d100dd51bff35f6056bbf1", + "reference": "770a6be4160a5c0c08d100dd51bff35f6056bbf1", "shasum": "" }, "require": { - "codeception/codeception": "*@dev", - "codeception/lib-innerbrowser": "^1.3.2", - "guzzlehttp/guzzle": "^6.3.0|^7.0.0", - "php": ">=5.6.0 <8.0" + "codeception/codeception": "^4.0", + "codeception/lib-innerbrowser": "^1.3", + "guzzlehttp/guzzle": "^6.3|^7.0", + "php": ">=5.6.0 <9.0" }, "conflict": { "codeception/codeception": "<4.0" }, "require-dev": { - "codeception/module-rest": "dev-master | ^1.0", - "codeception/util-robohelpers": "dev-master" + "codeception/module-rest": "^1.0" }, "suggest": { "codeception/phpbuiltinserver": "Start and stop PHP built-in web server for your tests" @@ -6702,9 +7723,9 @@ ], "support": { "issues": "https://github.com/Codeception/module-phpbrowser/issues", - "source": "https://github.com/Codeception/module-phpbrowser/tree/master" + "source": "https://github.com/Codeception/module-phpbrowser/tree/1.0.2" }, - "time": "2020-07-05T15:29:32+00:00" + "time": "2020-10-24T15:29:28+00:00" }, { "name": "codeception/phpunit-wrapper", @@ -6861,150 +7882,6 @@ ], "time": "2020-08-25T05:50:16+00:00" }, - { - "name": "composer/semver", - "version": "3.2.2", - "source": { - "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "4089fddb67bcf6bf860d91b979e95be303835002" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/4089fddb67bcf6bf860d91b979e95be303835002", - "reference": "4089fddb67bcf6bf860d91b979e95be303835002", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0" - }, - "require-dev": { - "phpstan/phpstan": "^0.12.19", - "symfony/phpunit-bridge": "^4.2 || ^5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Composer\\Semver\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - }, - { - "name": "Rob Bast", - "email": "rob.bast@gmail.com", - "homepage": "http://robbast.nl" - } - ], - "description": "Semver library that offers utilities, version constraint parsing and validation.", - "keywords": [ - "semantic", - "semver", - "validation", - "versioning" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.2" - }, - "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-10-14T08:51:15+00:00" - }, - { - "name": "composer/xdebug-handler", - "version": "1.4.4", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6e076a124f7ee146f2487554a94b6a19a74887ba", - "reference": "6e076a124f7ee146f2487554a94b6a19a74887ba", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/1.4.4" - }, - "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-10-24T12:39:10+00:00" - }, { "name": "dnoegel/php-xdg-base-dir", "version": "v0.1.1", @@ -10061,72 +10938,6 @@ ], "time": "2020-09-18T14:27:32+00:00" }, - { - "name": "symfony/finder", - "version": "v5.1.7", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8", - "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8", - "shasum": "" - }, - "require": { - "php": ">=7.2.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v5.1.7" - }, - "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-02T16:23:27+00:00" - }, { "name": "symfony/yaml", "version": "v5.1.7", @@ -10526,6 +11337,7 @@ "yiisoft/cache": 20, "yiisoft/cache-file": 20, "yiisoft/csrf": 20, + "yiisoft/composer-config-plugin": 20, "yiisoft/data-response": 20, "yiisoft/db-sqlite": 20, "yiisoft/di": 20, diff --git a/config/Component/Access.php b/config/Component/Access.php deleted file mode 100644 index 6c3eda6..0000000 --- a/config/Component/Access.php +++ /dev/null @@ -1,22 +0,0 @@ - [ - '__class' => Storage::class, - '__construct()' => [ - 'directory' => $params['aliases']['@root'] . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'rbac' - ] - ], - RuleFactoryInterface::class => ClassNameRuleFactory::class, - AccessCheckerInterface::class => Manager::class, -]; diff --git a/config/Component/Aliases.php b/config/Component/Aliases.php index 8db3f26..0d63a37 100644 --- a/config/Component/Aliases.php +++ b/config/Component/Aliases.php @@ -7,12 +7,10 @@ use Yii\Params; use Yiisoft\Aliases\Aliases; -$params = new Params(); - return [ /** component aliases */ Aliases::class => [ '__class' => Aliases::class, - '__construct()' => [$params->getAliases()] + '__construct()' => [$params['aliases']] ], ]; diff --git a/config/Component/Assets.php b/config/Component/Assets.php index 4aa9779..2c831be 100644 --- a/config/Component/Assets.php +++ b/config/Component/Assets.php @@ -4,7 +4,6 @@ namespace Yii\Component; -use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; use Yiisoft\Aliases\Aliases; use Yiisoft\Assets\AssetConverter; @@ -31,12 +30,12 @@ ] ], - AssetManager::class => static function (ContainerInterface $container) { - $assetManager = new AssetManager($container->get(LoggerInterface::class)); - - $assetManager->setConverter($container->get(AssetConverterInterface::class)); - $assetManager->setPublisher($container->get(AssetPublisherInterface::class)); - - return $assetManager; - } + AssetManager::class => [ + '__class' => AssetManager::class, + '__construct()' => [ + Reference::to(LoggerInterface::class) + ], + 'setConverter()' => [Reference::to(AssetConverterInterface::class)], + 'setPublisher()' => [Reference::to(AssetPublisherInterface::class)], + ] ]; diff --git a/config/Component/Auth.php b/config/Component/Auth.php index c9541b1..dd53077 100644 --- a/config/Component/Auth.php +++ b/config/Component/Auth.php @@ -4,17 +4,14 @@ namespace Yii\Component; -use Yii\Params; use Yiisoft\Auth\AuthenticationMethodInterface; use Yiisoft\Yii\Web\User\UserAuth; -$params = new Params(); - return [ /** component auth */ UserAuth::class => [ '__class' => UserAuth::class, - 'withAuthUrl()' => [$params->getLoginUrl()] + 'withAuthUrl()' => [$params['loginUrl']] ], AuthenticationMethodInterface::class => UserAuth::class, diff --git a/config/Component/Cache.php b/config/Component/Cache.php index e8c75f4..ca998c3 100644 --- a/config/Component/Cache.php +++ b/config/Component/Cache.php @@ -4,20 +4,17 @@ namespace Yii\Component; -use Yii\Params; use Yiisoft\Cache\Cache; use Yiisoft\Cache\CacheInterface; use Yiisoft\Cache\File\FileCache; use Yiisoft\Factory\Definitions\Reference; -$params = new Params(); - return [ /** component cache */ FileCache::class => [ '__class' => FileCache::class, '__construct()' => [ - $params->getCachePath() + $params['cachePath'] ] ], diff --git a/config/Component/Db.php b/config/Component/Db.php index 7d3d0fc..0fa91da 100644 --- a/config/Component/Db.php +++ b/config/Component/Db.php @@ -5,15 +5,12 @@ namespace Yii\Component; use Psr\Log\LoggerInterface; -use Yii\Params; use Yiisoft\Cache\CacheInterface; use Yiisoft\Db\Connection\ConnectionInterface; use Yiisoft\Db\Sqlite\Connection; use Yiisoft\Factory\Definitions\Reference; use Yiisoft\Profiler\Profiler; -$params = new Params(); - return [ /** component db */ ConnectionInterface::class => [ @@ -22,7 +19,7 @@ Reference::to(CacheInterface::class), Reference::to(LoggerInterface::class), Reference::to(Profiler::class), - $params->getSqliteDsn() + $params['sqliteDsn'] ] ] ]; diff --git a/config/Component/EventProvider.php b/config/Component/EventProvider.php index 595e800..1d29ce1 100644 --- a/config/Component/EventProvider.php +++ b/config/Component/EventProvider.php @@ -6,7 +6,7 @@ use Psr\Container\ContainerInterface; use Psr\Container\ContainerExceptionInterface; -use Yii\Params; +use Yiisoft\Composer\Config\Builder; use Yii\Exception\InvalidEventConfigurationFormatException; use Yii\Exception\InvalidListenerConfigurationException; use Yiisoft\EventDispatcher\Provider\ListenerCollection; @@ -25,9 +25,7 @@ final class EventProvider { public function buildConfig(ContainerInterface $container): Provider { - $params = new Params(); - - $eventListeners = $params->getEventListeners(); + $eventListeners = Builder::require('events'); $injector = new Injector($container); $listenerCollection = new ListenerCollection(); diff --git a/config/Component/Fields.php b/config/Component/Fields.php index 02311fc..5e84284 100644 --- a/config/Component/Fields.php +++ b/config/Component/Fields.php @@ -4,11 +4,17 @@ namespace Yii\Component; -use Yii\Params; use Yiisoft\Form\Widget\Field; -$params = new Params(); - return [ - Field::class => fn() => Field::widget($params->getFieldconfig()) + /** component widget field */ + Field::class => static function () { + $fieldConfig = [ + 'labelOptions()' => [['label' => '']], + 'inputOptions()' => [['class' => 'field input']], + 'errorOptions()' => [['class' => 'has-text-left has-text-danger is-italic']] + ]; + + return Field::Widget($fieldConfig); + } ]; diff --git a/config/Component/LogTargetFile.php b/config/Component/LogTargetFile.php index af44c0d..1dfd780 100644 --- a/config/Component/LogTargetFile.php +++ b/config/Component/LogTargetFile.php @@ -5,22 +5,19 @@ namespace Yii\Component; use Psr\Log\LoggerInterface; -use Yii\Params; use Yiisoft\Factory\Definitions\Reference; use Yiisoft\Log\Logger; use Yiisoft\Log\Target\File\FileRotator; use Yiisoft\Log\Target\File\FileRotatorInterface; use Yiisoft\Log\Target\File\FileTarget; -$params = new Params(); - return [ /** component logger - target file */ FileRotatorInterface::class => [ '__class' => FileRotator::class, '__construct()' => [ - $params->getFileRotatorMaxFileSize(), - $params->getFileRotatorMaxFiles(), + $params['fileRotatorMaxFileSize'], + $params['fileRotatorMaxFiles'], null, null ] @@ -29,10 +26,10 @@ FileTarget::class => [ '__class' => FileTarget::class, '__construct()' => [ - $params->getLogFile(), + $params['logFile'], Reference::to(FileRotatorInterface::class) ], - 'setLevels()' => [$params->getLogLevels()] + 'setLevels()' => [$params['logLevels']] ], LoggerInterface::class => [ diff --git a/config/Component/Mailer.php b/config/Component/Mailer.php index 2f05e37..f23fb4a 100644 --- a/config/Component/Mailer.php +++ b/config/Component/Mailer.php @@ -9,7 +9,6 @@ use Psr\Container\ContainerInterface; use Psr\EventDispatcher\EventDispatcherInterface; use Psr\Log\LoggerInterface; -use Yii\Params; use Yiisoft\Factory\Definitions\Reference; use Yiisoft\Mailer\Composer; use Yiisoft\Mailer\FileMailer; @@ -21,15 +20,13 @@ use Yiisoft\Mailer\SwiftMailer\Message; use Yiisoft\View\WebView; -$params = new Params(); - return [ /** component mailer */ Composer::class => [ '__class' => Composer::class, '__construct()' => [ Reference::to(WebView::class), - $params->getComposerView() + $params['composerView'] ] ], @@ -42,6 +39,16 @@ MessageFactoryInterface::class => MessageFactory::class, + Logger::class => [ + '__class' => Logger::class, + '__construct()' => [Reference::to(LoggerInterface::class)] + ], + + Swift_Plugins_LoggerPlugin::class => [ + '__class' => Swift_Plugins_LoggerPlugin::class, + '__construct()' => [Reference::to(Logger::class)] + ], + Mailer::class => [ '__class' => Mailer::class, '__construct()' => [ @@ -49,8 +56,9 @@ Reference::to(Composer::class), Reference::to(EventDispatcherInterface::class), Reference::to(LoggerInterface::class), - Reference::to(Swift_Transport::class) - ] + Reference::to(Swift_SmtpTransport::class) + ], + 'registerPlugin()' => [Reference::to(Swift_Plugins_LoggerPlugin::class)] ], FileMailer::class => [ @@ -60,31 +68,17 @@ Reference::to(Composer::class), Reference::to(EventDispatcherInterface::class), Reference::to(LoggerInterface::class), - $params->getFileMailerStorage() + $params['fileMailerStorage'] ] ], MailerInterface::class => static function (ContainerInterface $container) use ($params) { - if ($params->writeToFiles()) { + $writeToFiles = true; + + if ($writeToFiles) { return $container->get(FileMailer::class); } - $mailer = new Mailer( - $container->get(MessageFactoryInterface::class), - $container->get(Composer::class), - $container->get(EventDispatcherInterface::class), - $container->get(LoggerInterface::class), - $container->get(Swift_SmtpTransport::class) - ); - - $mailer->registerPlugin( - new Swift_Plugins_LoggerPlugin( - new Logger( - $container->get(LoggerInterface::class), - ) - ) - ); - - return $mailer; + return $container->get(Mailer::class); } ]; diff --git a/config/Component/MiddlewareDispatcher.php b/config/Component/MiddlewareDispatcher.php index 3fe2570..be3a0ca 100644 --- a/config/Component/MiddlewareDispatcher.php +++ b/config/Component/MiddlewareDispatcher.php @@ -4,12 +4,26 @@ namespace Yii\Component; +use Psr\Container\ContainerInterface; +use Yiisoft\Csrf\CsrfMiddleware; use Yiisoft\Middleware\Dispatcher\MiddlewareStack; use Yiisoft\Middleware\Dispatcher\MiddlewareStackInterface; use Yiisoft\Middleware\Dispatcher\MiddlewareFactoryInterface; use Yiisoft\Middleware\Dispatcher\MiddlewareFactory; +use Yiisoft\Router\Middleware\Router; +use Yiisoft\Session\SessionMiddleware; +use Yiisoft\Yii\Web\ErrorHandler\ErrorCatcher; +use Yiisoft\Yii\Web\MiddlewareDispatcher; return [ + /** component middleware dispatcher */ MiddlewareStackInterface::class => MiddlewareStack::class, + MiddlewareFactoryInterface::class => MiddlewareFactory::class, + + MiddlewareDispatcher::class => static fn (ContainerInterface $container) => (new MiddlewareDispatcher($container)) + ->addMiddleware($container->get(Router::class)) + ->addMiddleware($container->get(SessionMiddleware::class)) + ->addMiddleware($container->get(CsrfMiddleware::class)) + ->addMiddleware($container->get(ErrorCatcher::class)), ]; diff --git a/config/Component/Migration.php b/config/Component/Migration.php index 0089e9c..cd43dfa 100644 --- a/config/Component/Migration.php +++ b/config/Component/Migration.php @@ -4,23 +4,28 @@ namespace Yii\Component; -use Yii\ParamsConsole; +use Psr\Container\ContainerInterface; use Yiisoft\Db\Connection\ConnectionInterface; -use Yiisoft\Factory\Definitions\Reference; use Yiisoft\Yii\Db\Migration\Helper\ConsoleHelper; use Yiisoft\Yii\Db\Migration\Service\MigrationService; -$params = new ParamsConsole(); - return [ /** component migration */ - MigrationService::class => [ - '__class' => MigrationService::class, - '__construct()' => [ - Reference::to(ConnectionInterface::class), - Reference::to(ConsoleHelper::class) - ], - 'createNamespace()' => [$params->getMigrationCreateNameSpace()], - 'updateNamespace()' => [$params->getMigrationUpdateNameSpace()], - ] + MigrationService::class => static function (ContainerInterface $container) { + $migrationCreateNameSpace = 'Yii\\Migration'; + $migrationUpdateNameSpace = [ + 'App\\Module\\User\\Migration', + 'App\\Module\\Rbac\\Migration' + ]; + + $migration = new MigrationService( + $container->get(ConnectionInterface::class), + $container->get(ConsoleHelper::class) + ); + + $migration->createNamespace($migrationCreateNameSpace); + $migration->updateNamespace($migrationUpdateNameSpace); + + return $migration; + } ]; diff --git a/config/Component/Parameters.php b/config/Component/Parameters.php index 5173318..51d862e 100644 --- a/config/Component/Parameters.php +++ b/config/Component/Parameters.php @@ -5,22 +5,13 @@ namespace Yii\Component; use App\Service\ParameterService; -use App\Module\User\Config\Params as UserParams; -use App\Theme\AdminOneBulma\Config\Params as ThemeParams; -use Yii\Params; - -$params = new Params(); -$themeParams = new ThemeParams(); return [ /** component parameters */ ParameterService::class => [ '__class' => ParameterService::class, '__construct()' => [ - array_merge_recursive( - $params->getApplicationConfig(), - $themeParams->getParams() - ) + $params['appConfig'] ] ] ]; diff --git a/config/Component/Router.php b/config/Component/Router.php index d62e256..d541694 100644 --- a/config/Component/Router.php +++ b/config/Component/Router.php @@ -6,12 +6,10 @@ use App\Module\User\Config\Routes as UserRoutes; use App\Module\Rbac\Config\Routes as RbacRoutes; -use Psr\Container\ContainerInterface; use Yii\Routes; +use Yiisoft\Composer\Config\Builder; use Yiisoft\DataResponse\Middleware\FormatDataResponse; use Yiisoft\Router\Group; -use Yiisoft\Router\Dispatcher; -use Yiisoft\Router\DispatcherInterface; use Yiisoft\Router\RouteCollection; use Yiisoft\Router\RouteCollectorInterface; use Yiisoft\Router\RouteCollectionInterface; @@ -29,15 +27,9 @@ RouteCollectorInterface::class => Group::create(), RouteCollectionInterface::class => static function (RouteCollectorInterface $collector) { - $routes = new Routes(); - $userRoutes = new UserRoutes(); - $rbacRoutes = new RbacRoutes(); - $collector->addGroup( - Group::create( - null, - array_merge($routes->getRoutes(), $userRoutes->getRoutes(), $rbacRoutes->getRoutes()) - )->addMiddleware(FormatDataResponse::class) + Group::create(null, require Builder::path('routes-local')) + ->addMiddleware(FormatDataResponse::class) ); return new RouteCollection($collector); diff --git a/config/Component/SwiftSmtpTransport.php b/config/Component/SwiftSmtpTransport.php index f52a0b1..3f1357e 100644 --- a/config/Component/SwiftSmtpTransport.php +++ b/config/Component/SwiftSmtpTransport.php @@ -5,24 +5,17 @@ namespace Yii\Component; use Swift_SmtpTransport; -use Psr\Container\ContainerInterface; -use Yii\Params; - -$params = new Params(); -$config = $params->getMailerConfig(); return [ /** component swift mailer */ - Swift_SmtpTransport::class => static function (ContainerInterface $container) use ($config) { - $swiftSmtpTransport = new Swift_SmtpTransport( - $config['host'], - $config['port'], - $config['encryption'] - ); - - $swiftSmtpTransport->setUsername($config['username']); - $swiftSmtpTransport->setPassword($config['username']); - - return $swiftSmtpTransport; - } + Swift_SmtpTransport::class => [ + '__class' => Swift_SmtpTransport::class, + '__construct()' => [ + $params['mailerConfig']['host'], + $params['mailerConfig']['port'], + $params['mailerConfig']['encryption'] + ], + 'setUsername()' => [$params['mailerConfig']['username']], + 'setPassword()' => [$params['mailerConfig']['username']] + ] ]; diff --git a/config/Component/Theme.php b/config/Component/Theme.php index f7736a5..9cec977 100644 --- a/config/Component/Theme.php +++ b/config/Component/Theme.php @@ -9,14 +9,15 @@ use Yiisoft\Aliases\Aliases; use Yiisoft\View\Theme; -$params = new Params(); - return [ - Theme::class => static function (ContainerInterface $container) use ($params) { + /** component theme */ + Theme::class => static function (ContainerInterface $container) { $aliases = $container->get(Aliases::class); - $pathMap = []; + $map = ['@layout' => '@AdminOneLayout']; + $pathMap = [ + ]; - foreach ($params->getThemePathMap() as $key => $value) { + foreach ($map as $key => $value) { $pathMap = [ $aliases->get($key) => $aliases->get($value) ]; diff --git a/config/Component/WebView.php b/config/Component/WebView.php index d5538b8..7327201 100644 --- a/config/Component/WebView.php +++ b/config/Component/WebView.php @@ -7,7 +7,6 @@ use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; use Psr\EventDispatcher\EventDispatcherInterface; -use Yii\Params; use Yiisoft\Aliases\Aliases; use Yiisoft\View\Theme; use Yiisoft\View\WebView; @@ -17,13 +16,11 @@ WebView::class => static function (ContainerInterface $container) use ($params) { $aliases = $container->get(Aliases::class); - $webView = new WebView( + return new WebView( $aliases->get('@views'), $container->get(Theme::class), $container->get(EventDispatcherInterface::class), $container->get(LoggerInterface::class) ); - - return $webView; } ]; diff --git a/config/Component/WebViewConsole.php b/config/Component/WebViewConsole.php index 4153713..718d59e 100644 --- a/config/Component/WebViewConsole.php +++ b/config/Component/WebViewConsole.php @@ -4,22 +4,18 @@ namespace Yii\Component; -use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; use Psr\EventDispatcher\EventDispatcherInterface; -use Yii\ParamsConsole; use Yiisoft\Factory\Definitions\Reference; use Yiisoft\View\Theme; use Yiisoft\View\WebView; -$params = new ParamsConsole(); - return [ /** component view */ WebView::class => [ '__class' => WebView::class, '__construct()' => [ - $params->getViewPath(), + $params['viewPath'], Reference::to(Theme::class), Reference::to(EventDispatcherInterface::class), Reference::to(LoggerInterface::class) diff --git a/config/Component/YiiWeb.php b/config/Component/YiiWeb.php index 3577b7b..051df79 100644 --- a/config/Component/YiiWeb.php +++ b/config/Component/YiiWeb.php @@ -4,38 +4,15 @@ namespace Yii\Component; -use Psr\Container\ContainerInterface; -use Yii\Params; -use Yiisoft\Csrf\CsrfMiddleware; -use Yiisoft\Router\MiddlewareFactory; -use Yiisoft\Router\MiddlewareFactoryInterface; -use Yiisoft\Router\MiddlewareStack; -use Yiisoft\Router\MiddlewareStackInterface; -use Yiisoft\Router\Middleware\Router; -use Yiisoft\Session\SessionMiddleware; -use Yiisoft\Yii\Web\MiddlewareDispatcher; -use Yiisoft\Yii\Web\ErrorHandler\ErrorCatcher; use Yiisoft\Yii\Web\ErrorHandler\HtmlRenderer; use Yiisoft\Yii\Web\ErrorHandler\ThrowableRendererInterface; -$params = new Params(); - return [ - /** component middleware dispatcher - error exception yii-web */ - MiddlewareStackInterface::class => MiddlewareStack::class, - - MiddlewareFactoryInterface::class => MiddlewareFactory::class, - - MiddlewareDispatcher::class => static fn (ContainerInterface $container) => (new MiddlewareDispatcher($container)) - ->addMiddleware($container->get(Router::class)) - ->addMiddleware($container->get(SessionMiddleware::class)) - ->addMiddleware($container->get(CsrfMiddleware::class)) - ->addMiddleware($container->get(ErrorCatcher::class)), - + /** component error exception yii-web */ ThrowableRendererInterface::class => HtmlRenderer::class, HtmlRenderer::class => [ '__class' => HtmlRenderer::class, - '__construct()' => [$params->getHtmlRendererConfig()] + '__construct()' => [$params['htmlRendererConfig']] ], ]; diff --git a/config/Console.php b/config/Console.php deleted file mode 100644 index 86a72a1..0000000 --- a/config/Console.php +++ /dev/null @@ -1,25 +0,0 @@ - dirname(__DIR__), - '@assets' => '@root/public/assets', - '@assetsUrl' => '/assets', - '@mail' => '@root/resources/mail', - '@npm' => '@root/node_modules', - '@resources' => '@root/resources', - '@runtime' => '@root/runtime', - '@vendor' => '@root/vendor', - '@layout' => '@root/resources/views/layout', - '@views' => '@root/resources/views', - - /** config theme adminonebulma */ - '@AdminOneLayout' => '@root/src/Theme/AdminOneBulma/resources/layout', - - /** config yii-db-migration */ - '@yiisoft/yii/db/migration' => '@vendor/yiisoft/yii-db-migration', - - /** config module-user */ - '@user' => '@root/src/Module/User', - - /** config module-user */ - '@rbac' => '@root/src/Module/Rbac', - ]; - } - - public function getApplicationConfig(): array - { - return [ - 'app' => [ - 'charset' => 'UTF-8', - 'emailFrom' => 'tester@example.com', - 'language' => 'en', - 'logo' => '/images/yii-logo.jpg', - 'mailer' => [ - 'from' => 'tester@example.com' - ], - - /** config widget nav */ - 'nav' => [ - /** - * Example menu config simple link, dropdown menu. - *[ - * 'label' => 'Home', - * 'url' => ['site/index'] - *], - *[ - * 'label' => 'Dropdown', - * 'items' => [ - * ['label' => 'Level 1 - Dropdown B', 'url' => '#'], - * ['label' => 'Level 2 - Dropdown A', 'url' => '#'], - * '
  • ', - * '
  • Dropdown Header
    • ', - * ['label' => 'Level 3 - Dropdown B', 'url' => '#'], - * ['label' => 'Level 4 - Dropdown A', 'url' => '#'], - * ], - *], - */ - 'guest' => [ - ['label' => 'About', 'url' => '/about'], - ['label' => 'Contact', 'url' => '/contact'] - ], - 'logged' => [], - ], - - /** config widget navBar */ - 'navBar' => [ - 'config' => [ - 'brandLabel()' => ['My Project'], - 'brandImage()' => ['/images/yii-logo.jpg'], - 'itemsOptions()' => [['class' => 'navbar-end']], - 'options()' => [['class' => 'is-black', 'data-sticky' => '', 'data-sticky-shadow' => '']] ], - ], - - 'name' => 'My Project', - ], - ]; - } - - public function getCachePath(): string - { - return dirname(__DIR__) . '/runtime/cache'; - } - - public function getComposerView(): string - { - return dirname(__DIR__) . '/resources/mail'; - } - - public function getSqliteDsn(): string - { - return 'sqlite:' . __DIR__ . '/Database/yiitest.sq3'; - } - - public function getEventListeners(): array - { - return []; - } - - public function getFieldconfig() - { - return [ - 'labelOptions()' => [['label' => '']], - 'inputOptions()' => [['class' => 'field input']], - 'errorOptions()' => [['class' => 'has-text-left has-text-danger is-italic']] - ]; - } - - public function getFileMailerStorage(): string - { - return dirname(__DIR__) . '/runtime/mail'; - } - - public function getFileRotatorMaxFiles(): int - { - return 5; - } - - public function getFileRotatorMaxFileSize(): int - { - return 10; - } - - public function getHtmlRendererConfig(): array - { - return [ - 'default' => [ - 'callStackItem', - 'error', - 'exception', - 'previousException' - ], - 'path' => dirname(__DIR__) . '/vendor/yiisoft/yii-web/src/ErrorHandler/templates', - ]; - } - - public function getLogFile(): string - { - return dirname(__DIR__) . '/runtime/logs/app.log'; - } - - public function getLoginUrl(): string - { - return '/auth/login'; - } - - public function getLogLevels(): array - { - return [ - LogLevel::EMERGENCY, - LogLevel::ERROR, - LogLevel::WARNING, - LogLevel::INFO, - LogLevel::DEBUG - ]; - } - - public function getMailerConfig(): array - { - return [ - 'host' => 'smtp.example.com', - 'port' => 25, - 'encryption' => null, - 'username' => '', - 'password' => '' - ]; - } - - public function getThemePathMap(): array - { - return [ - '@layout' => '@AdminOneLayout', - ]; - } - - public function writeToFiles(): bool - { - return true; - } -} diff --git a/config/ParamsConsole.php b/config/ParamsConsole.php index e180d01..f508084 100644 --- a/config/ParamsConsole.php +++ b/config/ParamsConsole.php @@ -13,50 +13,18 @@ use Yiisoft\Yii\Db\Migration\Command\RedoCommand; use Yiisoft\Yii\Db\Migration\Command\UpdateCommand; -final class ParamsConsole -{ - /** - * Define console command customs console symphony. - * - * ```php - * [ - * 'command' => App\Command::class - * ] - * ``` - * - * @return array - */ - public function getConsoleCommands(): array - { - return [ - 'hello' => HelloCommand::class, - - /** yii-db-migration commands */ - 'generate/create' => CreateCommand::class, - 'database/list' => ListTablesCommand::class, - 'migrate/down' => DownCommand::class, - 'migrate/history' => HistoryCommand::class, - 'migrate/new' => NewCommand::class, - 'migrate/redo' => RedoCommand::class, - 'migrate/up' => UpdateCommand::class - ]; - } - - public function getMigrationCreateNameSpace(): string - { - return 'Yii\\Migration'; - } - - public function getMigrationUpdateNameSpace(): array - { - return [ - 'App\\Module\\User\\Migration', - 'App\\Module\\Rbac\\Migration' - ]; - } - - public function getViewPath(): string - { - return dirname(__DIR__) . '/resources/views'; - } -} +return [ + 'consoleCommands' => [ + 'hello' => HelloCommand::class, + + /** yii-db-migration commands */ + 'generate/create' => CreateCommand::class, + 'database/list' => ListTablesCommand::class, + 'migrate/down' => DownCommand::class, + 'migrate/history' => HistoryCommand::class, + 'migrate/new' => NewCommand::class, + 'migrate/redo' => RedoCommand::class, + 'migrate/up' => UpdateCommand::class + ], + 'viewPath' => dirname(__DIR__) . '/resources/views' +]; diff --git a/config/ParamsLocal.php b/config/ParamsLocal.php new file mode 100644 index 0000000..80db694 --- /dev/null +++ b/config/ParamsLocal.php @@ -0,0 +1,124 @@ + [ + '@root' => dirname(__DIR__), + '@assets' => '@root/public/assets', + '@assetsUrl' => '/assets', + '@mail' => '@root/resources/mail', + '@npm' => '@root/node_modules', + '@resources' => '@root/resources', + '@runtime' => '@root/runtime', + '@vendor' => '@root/vendor', + '@layout' => '@root/resources/views/layout', + '@views' => '@root/resources/views', + + /** config theme adminonebulma */ + '@AdminOneLayout' => '@root/src/Theme/AdminOneBulma/resources/layout', + + /** config yii-db-migration */ + '@yiisoft/yii/db/migration' => '@vendor/yiisoft/yii-db-migration', + + /** config module-user */ + '@user' => '@root/src/Module/User', + + /** config module-user */ + '@rbac' => '@root/src/Module/Rbac' + ], + 'appConfig' => [ + 'charset' => 'UTF-8', + 'emailFrom' => 'tester@example.com', + 'language' => 'en', + 'logo' => '/images/yii-logo.jpg', + 'mailer' => [ + 'from' => 'tester@example.com' + ], + + /** config widget nav */ + 'nav' => [ + /** + * Example menu config simple link, dropdown menu. + *[ + * 'label' => 'Home', + * 'url' => ['site/index'] + *], + *[ + * 'label' => 'Dropdown', + * 'items' => [ + * ['label' => 'Level 1 - Dropdown B', 'url' => '#'], + * ['label' => 'Level 2 - Dropdown A', 'url' => '#'], + * '
  • ', + * '
  • Dropdown Header
    • ', + * ['label' => 'Level 3 - Dropdown B', 'url' => '#'], + * ['label' => 'Level 4 - Dropdown A', 'url' => '#'], + * ], + *], + */ + 'guest' => [ + ['label' => 'About', 'url' => '/about'], + ['label' => 'Contact', 'url' => '/contact'] + ], + 'logged' => [], + ], + + /** config widget navBar */ + 'navBar' => [ + 'config' => [ + 'brandLabel()' => ['My Project'], + 'brandImage()' => ['/images/yii-logo.jpg'], + 'itemsOptions()' => [['class' => 'navbar-end']], + 'options()' => [['class' => 'is-black', 'data-sticky' => '', 'data-sticky-shadow' => '']] ], + ], + + 'name' => 'My Project' + ], + 'cachePath' => dirname(__DIR__) . '/runtime/cache', + 'composerView' => dirname(__DIR__) . '/resources/mail', + 'sqliteDsn' => 'sqlite:' . dirname(__DIR__) . '/resources/database/yiitest.sq3', + 'fieldConfig' => [ + 'labelOptions' => [['label' => '']], + 'inputOptions' => [['class' => 'field input']], + 'errorOptions' => [['class' => 'has-text-left has-text-danger is-italic']] + ], + 'fileMailerStorage' => dirname(__DIR__) . '/runtime/mail', + 'fileRotatorMaxFiles' => 5, + 'fileRotatorMaxFileSize' => 10, + 'htmlRendererConfig' => [ + 'default' => [ + 'callStackItem', + 'error', + 'exception', + 'previousException' + ], + 'path' => dirname(__DIR__) . '/vendor/yiisoft/yii-web/src/ErrorHandler/templates', + ], + 'logFile' => dirname(__DIR__) . '/runtime/logs/app.log', + 'loginUrl' => '/auth/login', + 'logLevels' => [ + LogLevel::EMERGENCY, + LogLevel::ERROR, + LogLevel::WARNING, + LogLevel::INFO, + LogLevel::DEBUG + ], + 'mailerConfig' => [ + 'host' => 'smtp.example.com', + 'port' => 25, + 'encryption' => null, + 'username' => '', + 'password' => '' + ], + 'themePathMap' => [ + '@layout' => '@AdminOneLayout', + ], + 'writeToFiles' => true +]; diff --git a/config/Routes.php b/config/Routes.php deleted file mode 100644 index 945ac56..0000000 --- a/config/Routes.php +++ /dev/null @@ -1,22 +0,0 @@ -name('index'), - Route::get('/about', [AboutAction::class, 'about'])->name('about'), - Route::methods(['GET', 'POST'], '/contact', [ContactAction::class, 'contact'])->name('contact'), - ]; - } -} diff --git a/config/RoutesLocal.php b/config/RoutesLocal.php new file mode 100644 index 0000000..18719e8 --- /dev/null +++ b/config/RoutesLocal.php @@ -0,0 +1,16 @@ +name('index'), + Route::get('/about', [AboutAction::class, 'about'])->name('about'), + Route::methods(['GET', 'POST'], '/contact', [ContactAction::class, 'contact'])->name('contact'), +]; diff --git a/config/Web.php b/config/Web.php deleted file mode 100644 index 0190747..0000000 --- a/config/Web.php +++ /dev/null @@ -1,39 +0,0 @@ -buildConfig()); +$container = new Container( + require Builder::path('web-local') +); $application = $container->get(Application::class); diff --git a/config/Database/yiitest.sq3 b/resources/database/yiitest.sq3 similarity index 100% rename from config/Database/yiitest.sq3 rename to resources/database/yiitest.sq3 diff --git a/src/Module/Rbac/Config/Routes.php b/src/Module/Rbac/Config/Routes.php deleted file mode 100644 index 31b8025..0000000 --- a/src/Module/Rbac/Config/Routes.php +++ /dev/null @@ -1,41 +0,0 @@ -addMiddleware(Authentication::class) - ->name('item/index'), - Route::methods(['GET', 'POST'], '/item/create', [ItemCreateAction::class, 'create']) - ->addMiddleware(Authentication::class) - ->name('item/create'), - Route::methods(['GET', 'POST'], '/item/edit[/{id}]', [ItemEditAction::class, 'edit']) - ->addMiddleware(Authentication::class) - ->name('item/edit'), - Route::methods(['GET', 'POST'], '/item/delete[/{id}]', [ItemDeleteAction::class, 'delete']) - ->addMiddleware(Authentication::class) - ->name('item/delete'), - - /** items api actions */ - Route::get('/items', [ItemsApiAction::class, 'index']) - ->name('items/index') - ->addMiddleware(FormatDataResponseAsJson::class), - ]; - } -} diff --git a/src/Module/Rbac/Config/RoutesLocal.php b/src/Module/Rbac/Config/RoutesLocal.php new file mode 100644 index 0000000..8601975 --- /dev/null +++ b/src/Module/Rbac/Config/RoutesLocal.php @@ -0,0 +1,35 @@ +addMiddleware(Authentication::class) + ->name('item/index'), + Route::methods(['GET', 'POST'], '/item/create', [ItemCreateAction::class, 'create']) + ->addMiddleware(Authentication::class) + ->name('item/create'), + Route::methods(['GET', 'POST'], '/item/edit[/{id}]', [ItemEditAction::class, 'edit']) + ->addMiddleware(Authentication::class) + ->name('item/edit'), + Route::methods(['GET', 'POST'], '/item/delete[/{id}]', [ItemDeleteAction::class, 'delete']) + ->addMiddleware(Authentication::class) + ->name('item/delete'), + + /** items api actions */ + Route::get('/items', [ItemsApiAction::class, 'index']) + ->name('items/index') + ->addMiddleware(FormatDataResponseAsJson::class), +]; diff --git a/src/Module/User/Config/Routes.php b/src/Module/User/Config/Routes.php deleted file mode 100644 index 8c134e7..0000000 --- a/src/Module/User/Config/Routes.php +++ /dev/null @@ -1,86 +0,0 @@ -name('auth/login'), - Route::get('/auth/logout', [LogoutAction::class, 'logout']) - ->name('auth/logout'), - - /** admin actions */ - Route::methods(['GET', 'POST'], '/admin/index', [AdminAction::class, 'index']) - ->addMiddleware(Authentication::class) - ->name('admin/index'), - Route::methods(['GET', 'POST'], '/admin/block[/{id}]', [AdminBlockAction::class, 'block']) - ->addMiddleware(Authentication::class) - ->name('admin/block'), - Route::methods(['GET', 'POST'], '/admin/create', [AdminCreateAction::class, 'create']) - ->addMiddleware(Authentication::class) - ->name('admin/create'), - Route::methods(['GET', 'POST'], '/admin/confirm[/{id}]', [AdminConfirmAction::class, 'confirm']) - ->addMiddleware(Authentication::class) - ->name('admin/confirm'), - Route::methods(['GET', 'POST'], '/admin/delete[/{id}]', [AdminDeleteAction::class, 'delete']) - ->name('admin/delete')->addMiddleware(Authentication::class), - Route::methods(['GET', 'POST'], '/admin/edit[/{id}]', [AdminEditAction::class, 'edit']) - ->addMiddleware(Authentication::class) - ->name('admin/edit'), - Route::methods(['GET', 'POST'], '/admin/info[/{id}]', [AdminInfoAction::class, 'info']) - ->addMiddleware(Authentication::class) - ->name('admin/info'), - Route::methods(['GET', 'POST'], '/admin/reset[/{id}]', [AdminResetPasswordAction::class, 'reset']) - ->addMiddleware(Authentication::class) - ->name('admin/reset'), - - /** api users */ - Route::get('/users', [UserApiAction::class, 'index']) - ->name('users/index') - ->addMiddleware(FormatDataResponseAsJson::class), - - /** recovery actions */ - Route::methods(['GET', 'POST'], '/recovery/request', [RequestAction::class, 'request']) - ->name('recovery/request'), - - Route::methods(['GET', 'POST'], '/recovery/reset[/{id}/{code}]', [ResetAction::class, 'reset']) - ->name('recovery/reset'), - - /** registration actions */ - Route::get('/registration/confirm[/{id}/{code}]', [ConfirmAction::class, 'confirm']) - ->name('registration/confirm'), - - Route::methods(['GET', 'POST'], '/registration/register', [RegisterAction::class, 'register']) - ->name('registration/register'), - - Route::methods(['GET', 'POST'], '/registration/resend', [ResendAction::class, 'resend']) - ->name('registration/resend') - ]; - } -} diff --git a/src/Module/User/Config/RoutesLocal.php b/src/Module/User/Config/RoutesLocal.php new file mode 100644 index 0000000..e2c0e31 --- /dev/null +++ b/src/Module/User/Config/RoutesLocal.php @@ -0,0 +1,80 @@ +name('auth/login'), + Route::get('/auth/logout', [LogoutAction::class, 'logout']) + ->name('auth/logout'), + + /** admin actions */ + Route::methods(['GET', 'POST'], '/admin/index', [AdminAction::class, 'index']) + ->addMiddleware(Authentication::class) + ->name('admin/index'), + Route::methods(['GET', 'POST'], '/admin/block[/{id}]', [AdminBlockAction::class, 'block']) + ->addMiddleware(Authentication::class) + ->name('admin/block'), + Route::methods(['GET', 'POST'], '/admin/create', [AdminCreateAction::class, 'create']) + ->addMiddleware(Authentication::class) + ->name('admin/create'), + Route::methods(['GET', 'POST'], '/admin/confirm[/{id}]', [AdminConfirmAction::class, 'confirm']) + ->addMiddleware(Authentication::class) + ->name('admin/confirm'), + Route::methods(['GET', 'POST'], '/admin/delete[/{id}]', [AdminDeleteAction::class, 'delete']) + ->name('admin/delete')->addMiddleware(Authentication::class), + Route::methods(['GET', 'POST'], '/admin/edit[/{id}]', [AdminEditAction::class, 'edit']) + ->addMiddleware(Authentication::class) + ->name('admin/edit'), + Route::methods(['GET', 'POST'], '/admin/info[/{id}]', [AdminInfoAction::class, 'info']) + ->addMiddleware(Authentication::class) + ->name('admin/info'), + Route::methods(['GET', 'POST'], '/admin/reset[/{id}]', [AdminResetPasswordAction::class, 'reset']) + ->addMiddleware(Authentication::class) + ->name('admin/reset'), + + /** api users */ + Route::get('/users', [UserApiAction::class, 'index']) + ->name('users/index') + ->addMiddleware(FormatDataResponseAsJson::class), + + /** recovery actions */ + Route::methods(['GET', 'POST'], '/recovery/request', [RequestAction::class, 'request']) + ->name('recovery/request'), + + Route::methods(['GET', 'POST'], '/recovery/reset[/{id}/{code}]', [ResetAction::class, 'reset']) + ->name('recovery/reset'), + + /** registration actions */ + Route::get('/registration/confirm[/{id}/{code}]', [ConfirmAction::class, 'confirm']) + ->name('registration/confirm'), + + Route::methods(['GET', 'POST'], '/registration/register', [RegisterAction::class, 'register']) + ->name('registration/register'), + + Route::methods(['GET', 'POST'], '/registration/resend', [ResendAction::class, 'resend']) + ->name('registration/resend') +]; diff --git a/src/Service/MailerService.php b/src/Service/MailerService.php index 7539d02..c72a983 100644 --- a/src/Service/MailerService.php +++ b/src/Service/MailerService.php @@ -49,7 +49,7 @@ public function run( 'params' => $params ] ) - ->setFrom($this->app->get('app.mailer.from')) + ->setFrom($this->app->get('mailer.from')) ->setSubject($subject) ->setTo($to); diff --git a/src/Theme/AdminOneBulma/Config/Params.php b/src/Theme/AdminOneBulma/Config/Params.php deleted file mode 100644 index 13f1881..0000000 --- a/src/Theme/AdminOneBulma/Config/Params.php +++ /dev/null @@ -1,47 +0,0 @@ - - {logo} - -
    - {username} -
    - - HTML; - - return [ - 'app' => [ - 'nav' => [ - 'guest' => [ - ['label' => 'Register', 'url' => '/registration/register'], - ['label' => 'Login', 'url' => '/auth/login'], - ], - 'logged' => [ - [ - 'label' => $htmlLabel, - 'items' => [ - [ - 'label' => 'Logout', - 'url' => '/auth/logout', - 'icon' => 'mdi mdi-logout', - 'iconOptions' => 'icon' - ] - ], - 'options' => ['class' => 'has-dropdown-with-icons has-divider has-user-avatar'], - 'encode' => false - ] - ] - ] - ] - ]; - } -} diff --git a/src/Theme/AdminOneBulma/Config/ParamsLocal.php b/src/Theme/AdminOneBulma/Config/ParamsLocal.php new file mode 100644 index 0000000..70f4971 --- /dev/null +++ b/src/Theme/AdminOneBulma/Config/ParamsLocal.php @@ -0,0 +1,41 @@ + + {logo} + +
    + {username} +
    + +HTML; + +return [ + 'appConfig' => [ + 'nav' => [ + 'guest' => [ + ['label' => 'Register', 'url' => '/registration/register'], + ['label' => 'Login', 'url' => '/auth/login'], + ], + 'logged' => [ + [ + 'label' => $htmlLabel, + 'items' => [ + [ + 'label' => 'Logout', + 'url' => '/auth/logout', + 'icon' => 'mdi mdi-logout', + 'iconOptions' => 'icon' + ] + ], + 'options' => ['class' => 'has-dropdown-with-icons has-divider has-user-avatar'], + 'encode' => false + ] + ] + ] + ] +]; diff --git a/src/Theme/AdminOneBulma/resources/layout/_head.php b/src/Theme/AdminOneBulma/resources/layout/_head.php index 7bb64a5..456e798 100644 --- a/src/Theme/AdminOneBulma/resources/layout/_head.php +++ b/src/Theme/AdminOneBulma/resources/layout/_head.php @@ -11,7 +11,7 @@ */ ?> - get('app.charset') ?>> + get('charset') ?>> > diff --git a/src/Theme/AdminOneBulma/resources/layout/_menu.php b/src/Theme/AdminOneBulma/resources/layout/_menu.php index ccd828b..51f90b2 100644 --- a/src/Theme/AdminOneBulma/resources/layout/_menu.php +++ b/src/Theme/AdminOneBulma/resources/layout/_menu.php @@ -31,7 +31,7 @@ HTML; -$navConfig = $app->get('app.navBar.config'); +$navConfig = $app->get('navBar.config'); if (isset($identity) && $identity->getId() !== null) { $navConfig['brand()'] = [$brand]; @@ -40,8 +40,8 @@ $navConfig['toggleIcon()'] = ['']; $navConfig['toggleOptions()'] = [['class' => 'navbar-item is-hidden-desktop jb-aside-mobile-toggle']]; - if ($app->get('app.nav.logged') !== []) { - $menuItems = $app->get('app.nav.logged'); + if ($app->get('nav.logged') !== []) { + $menuItems = $app->get('nav.logged'); } $label = ''; @@ -57,7 +57,7 @@ } } } else { - $menuItems = $app->get('app.nav.guest'); + $menuItems = $app->get('nav.guest'); } ?> diff --git a/src/Theme/AdminOneBulma/resources/layout/main.php b/src/Theme/AdminOneBulma/resources/layout/main.php index 95a5293..6ef22e8 100644 --- a/src/Theme/AdminOneBulma/resources/layout/main.php +++ b/src/Theme/AdminOneBulma/resources/layout/main.php @@ -40,7 +40,7 @@ $breadCrumbsItems = []; $class = [ - 'lang' => $app->get('app.language') + 'lang' => $app->get('language') ]; $route = $urlMatcher->getCurrentRoute()->getName(); diff --git a/tests/Functional.suite.yml b/tests/Functional.suite.yml index d45d14a..34da55e 100644 --- a/tests/Functional.suite.yml +++ b/tests/Functional.suite.yml @@ -9,7 +9,7 @@ actor: FunctionalTester modules: enabled: - Db: - dsn: 'sqlite:/config/Database/yiitest.sq3' + dsn: 'sqlite:/resources/database/yiitest.sq3' user: '' password: '' cleanup: true