diff --git a/Web/Presenters/templates/Gifts/Confirm.xml b/Web/Presenters/templates/Gifts/Confirm.xml index d1b7c444..175f513f 100644 --- a/Web/Presenters/templates/Gifts/Confirm.xml +++ b/Web/Presenters/templates/Gifts/Confirm.xml @@ -1,15 +1,15 @@ {extends "../@layout.xml"} {block title} - Подарить подарок + {_send_gift} {/block} {block header} {$user->getCanonicalName()} » - Выбор подарка » - Коллекции » + {_gift_select} » + {_collections} » {$cat->getName(tr("__lang"))} » - Подтверждение + {_confirm} {/block} {block content} @@ -17,13 +17,13 @@ Подарок
- +

- +
diff --git a/Web/Presenters/templates/Gifts/Menu.xml b/Web/Presenters/templates/Gifts/Menu.xml index 2ca74486..d2126099 100644 --- a/Web/Presenters/templates/Gifts/Menu.xml +++ b/Web/Presenters/templates/Gifts/Menu.xml @@ -1,13 +1,13 @@ {extends "../@listView.xml"} {block title} - Выбрать подарок + {_gift_select} {/block} {block header} {$user->getCanonicalName()} » - Выбор подарка » - Коллекции + {_gift_select} » + {_collections} {/block} {* BEGIN ELEMENTS DESCRIPTION *} diff --git a/Web/Presenters/templates/Gifts/Pick.xml b/Web/Presenters/templates/Gifts/Pick.xml index 9e705796..c2240d2b 100644 --- a/Web/Presenters/templates/Gifts/Pick.xml +++ b/Web/Presenters/templates/Gifts/Pick.xml @@ -1,32 +1,32 @@ {extends "../@layout.xml"} {block title} - Выбрать подарок + {_gift_select} {/block} {block header} {$user->getCanonicalName()} » - Выбор подарка » - Коллекции » + {_gift_select} » + {_collections} » {$cat->getName(tr("__lang"))} {/block} {block content}
- Подарок + {_gift} {if $gift->isFree()} - бесплатный + {_free_gift} {else} - {$gift->getPrice()} голосов + {tr('coins', $gift->getPrice())} {/if} {if $gift->getUsagesLeft($thisUser) !== INF} - осталось {$gift->getUsagesLeft($thisUser)} штук + {tr("gifts_left", $gift->getUsagesLeft($thisUser))} {/if} 
diff --git a/Web/Presenters/templates/Gifts/UserGifts.xml b/Web/Presenters/templates/Gifts/UserGifts.xml index 4fb20851..da73e1fb 100644 --- a/Web/Presenters/templates/Gifts/UserGifts.xml +++ b/Web/Presenters/templates/Gifts/UserGifts.xml @@ -1,12 +1,12 @@ {extends "../@listView.xml"} {block title} - Подарки {$user->getFirstName()} + {tr("users_gifts", $user->getFirstName())} {/block} {block header} {$user->getCanonicalName()} » - Подарки + {_gifts} {/block} {* BEGIN ELEMENTS DESCRIPTION *} @@ -16,18 +16,18 @@ {/block} {block preview} - Подарок + {_gift} {/block} {block name} - Подарок + {_gift} {/block} {block description} - + - + diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index 63bf7377..97b82f38 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -84,7 +84,7 @@ {/if} - Подарить подарок + {_send_gift} {var subStatus = $user->getSubscriptionStatus($thisUser)} {if $subStatus === 0} @@ -170,7 +170,7 @@ {$hideInfo ? 'Подарок' : ($giftDescriptor->caption ?? 'Подарок')} + alt="{$hideInfo ? tr('gift') : ($giftDescriptor->caption ?? tr('gift'))}" /> diff --git a/composer.lock b/composer.lock index 3d130755..1158a4a5 100644 --- a/composer.lock +++ b/composer.lock @@ -27,6 +27,7 @@ "require-dev": { "phpunit/phpunit": "^4.8" }, + "default-branch": true, "type": "library", "autoload": { "files": [ @@ -46,6 +47,9 @@ ], "description": "Detect and return all emoji found in a string", "homepage": "https://github.com/aaronpk/emoji-detector-php", + "support": { + "source": "https://github.com/AlmaArmas/emoji-detector-php/tree/0.2.3" + }, "time": "2020-06-26T09:10:17+00:00" }, { @@ -54,12 +58,12 @@ "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "2512f595e0f4c5235e99ef97603a8db902b3cc5f" + "reference": "996eaf43310edf1d908bc0030a18b37b8cf6eefd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/2512f595e0f4c5235e99ef97603a8db902b3cc5f", - "reference": "2512f595e0f4c5235e99ef97603a8db902b3cc5f", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/996eaf43310edf1d908bc0030a18b37b8cf6eefd", + "reference": "996eaf43310edf1d908bc0030a18b37b8cf6eefd", "shasum": "" }, "require": { @@ -101,7 +105,7 @@ "issues": "https://github.com/ezyang/htmlpurifier/issues", "source": "https://github.com/ezyang/htmlpurifier/tree/master" }, - "time": "2020-10-01T00:19:10+00:00" + "time": "2021-09-07T18:16:55+00:00" }, { "name": "guzzlehttp/guzzle", @@ -168,6 +172,10 @@ "rest", "web service" ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/6.5" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -198,12 +206,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "60d379c243457e073cff02bc323a2a86cb355631" + "reference": "136a635e2b4a49b9d79e9c8fee267ffb257fdba0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631", - "reference": "60d379c243457e073cff02bc323a2a86cb355631", + "url": "https://api.github.com/repos/guzzle/promises/zipball/136a635e2b4a49b9d79e9c8fee267ffb257fdba0", + "reference": "136a635e2b4a49b9d79e9c8fee267ffb257fdba0", "shasum": "" }, "require": { @@ -212,10 +220,11 @@ "require-dev": { "symfony/phpunit-bridge": "^4.4 || ^5.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -231,17 +240,50 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", "keywords": [ "promise" ], - "time": "2020-09-30T07:37:28+00:00" + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.0" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-07T13:05:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -249,12 +291,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3", - "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -291,13 +333,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -312,7 +375,25 @@ "uri", "url" ], - "time": "2020-09-30T07:37:11+00:00" + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.x" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-05T13:56:00+00:00" }, { "name": "james-heinrich/getid3", @@ -320,12 +401,12 @@ "source": { "type": "git", "url": "https://github.com/JamesHeinrich/getID3.git", - "reference": "79c467acde0db96edcd3ab9c0b8d4b68039f8f20" + "reference": "a440175a329a83dbfad991e67b5e5f3a1ff51bd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/79c467acde0db96edcd3ab9c0b8d4b68039f8f20", - "reference": "79c467acde0db96edcd3ab9c0b8d4b68039f8f20", + "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/a440175a329a83dbfad991e67b5e5f3a1ff51bd9", + "reference": "a440175a329a83dbfad991e67b5e5f3a1ff51bd9", "shasum": "" }, "require": { @@ -351,6 +432,7 @@ "ext-xml": "XML extension is required for graphic modules to analyze the XML metadata.", "ext-zlib": "Zlib extension is required for archive modules and compressed metadata." }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -375,7 +457,11 @@ "php", "tags" ], - "time": "2020-10-03T14:52:30+00:00" + "support": { + "issues": "https://github.com/JamesHeinrich/getID3/issues", + "source": "https://github.com/JamesHeinrich/getID3/tree/master" + }, + "time": "2021-10-07T12:08:13+00:00" }, { "name": "komeiji-satori/curl", @@ -395,6 +481,7 @@ "ext-curl": "*", "php": ">=5.6" }, + "default-branch": true, "type": "library", "autoload": { "files": [ @@ -450,6 +537,7 @@ "squizlabs/php_codesniffer": "3.*", "symfony/yaml": "2.4.*" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -478,62 +566,26 @@ "plaintext", "textile" ], + "support": { + "irc": "irc://irc.freenode.net/textile", + "issues": "https://github.com/textile/php-textile/issues", + "source": "https://github.com/textile/php-textile", + "wiki": "https://github.com/textile/php-textile/wiki" + }, "time": "2020-10-01T18:21:03+00:00" }, - { - "name": "paragonie/random_compat", - "version": "v9.99.99.x-dev", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "0947f25b883d4172df340a0d95f1b7cdabc5368a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0947f25b883d4172df340a0d95f1b7cdabc5368a", - "reference": "0947f25b883d4172df340a0d95f1b7cdabc5368a", - "shasum": "" - }, - "require": { - "php": "^7" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*", - "vimeo/psalm": "^1" - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" - ], - "time": "2018-08-07T13:07:48+00:00" - }, { "name": "psr/cache", - "version": "dev-master", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "b9aa2cd4dd36cec02779bee07ee9dab8bd2d07d7" + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/b9aa2cd4dd36cec02779bee07ee9dab8bd2d07d7", - "reference": "b9aa2cd4dd36cec02779bee07ee9dab8bd2d07d7", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", "shasum": "" }, "require": { @@ -569,7 +621,7 @@ "support": { "source": "https://github.com/php-fig/cache/tree/master" }, - "time": "2019-10-04T14:04:41+00:00" + "time": "2016-08-06T20:24:11+00:00" }, { "name": "psr/http-message", @@ -588,6 +640,7 @@ "require": { "php": ">=5.3.0" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { @@ -674,27 +727,27 @@ "source": { "type": "git", "url": "https://github.com/rybakit/msgpack.php.git", - "reference": "6c8b5c119e6dd81a81a526777270e9144f9abdd4" + "reference": "66ca2c3948d72068ca0c8b9a4f599f822a7fe2c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rybakit/msgpack.php/zipball/6c8b5c119e6dd81a81a526777270e9144f9abdd4", - "reference": "6c8b5c119e6dd81a81a526777270e9144f9abdd4", + "url": "https://api.github.com/repos/rybakit/msgpack.php/zipball/66ca2c3948d72068ca0c8b9a4f599f822a7fe2c3", + "reference": "66ca2c3948d72068ca0c8b9a4f599f822a7fe2c3", "shasum": "" }, "require": { - "php": "^7.1.1" + "php": "^7.1.1|^8" }, "require-dev": { - "ext-decimal": "*", "ext-gmp": "*", "friendsofphp/php-cs-fixer": "^2.14", - "phpunit/phpunit": "^7.1|^8.0" + "phpunit/phpunit": "^7.1|^8|^9" }, "suggest": { "ext-decimal": "For converting overflowed integers to Decimal objects", "ext-gmp": "For converting overflowed integers to GMP objects" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -728,7 +781,7 @@ "type": "github" } ], - "time": "2020-05-02T23:50:29+00:00" + "time": "2021-07-08T19:01:22+00:00" }, { "name": "scssphp/scssphp", @@ -736,12 +789,12 @@ "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "ef764826670a6a56161eee63996101b0ad9eecfc" + "reference": "fd4fc9edc49f5a4465e11e03b7d6198404adbc22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ef764826670a6a56161eee63996101b0ad9eecfc", - "reference": "ef764826670a6a56161eee63996101b0ad9eecfc", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/fd4fc9edc49f5a4465e11e03b7d6198404adbc22", + "reference": "fd4fc9edc49f5a4465e11e03b7d6198404adbc22", "shasum": "" }, "require": { @@ -755,6 +808,7 @@ "sass/sass-spec": "*", "squizlabs/php_codesniffer": "~3.5", "symfony/phpunit-bridge": "^5.1", + "thoughtbot/bourbon": "^7.0", "twbs/bootstrap": "~5.0", "twbs/bootstrap4": "4.6.0", "zurb/foundation": "~6.5" @@ -799,35 +853,35 @@ "issues": "https://github.com/scssphp/scssphp/issues", "source": "https://github.com/scssphp/scssphp/tree/master" }, - "time": "2021-09-15T23:25:40+00:00" + "time": "2021-10-02T12:51:54+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "045643b91eaa34c4c37150ac477765c13552af33" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/045643b91eaa34c4c37150ac477765c13552af33", - "reference": "045643b91eaa34c4c37150ac477765c13552af33", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { - "php": ">=5.3.3", + "php": ">=7.1", "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php70": "^1.10", "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -870,6 +924,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/main" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -884,32 +941,33 @@ "type": "tidelift" } ], - "time": "2020-08-04T21:02:56+00:00" + "time": "2021-09-14T14:02:44+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", - "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-intl": "For best performance" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -951,6 +1009,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -965,106 +1026,30 @@ "type": "tidelift" } ], - "time": "2020-07-14T12:35:20+00:00" - }, - { - "name": "symfony/polyfill-php70", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", - "shasum": "" - }, - "require": { - "paragonie/random_compat": "~1.0|~2.0|~9.99", - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.18-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php70\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "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-07-14T12:35:20+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-php72", - "version": "dev-master", + "version": "dev-main", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "dc6ef203f50ab65e7de9663826d2fd2d3c1e90e2" + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/dc6ef203f50ab65e7de9663826d2fd2d3c1e90e2", - "reference": "dc6ef203f50ab65e7de9663826d2fd2d3c1e90e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, + "default-branch": true, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1101,6 +1086,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1115,7 +1103,7 @@ "type": "tidelift" } ], - "time": "2020-10-01T14:10:30+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "wapmorgan/binary-stream", @@ -1137,6 +1125,7 @@ "require-dev": { "phpunit/phpunit": "~4.8.35" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1166,12 +1155,12 @@ "source": { "type": "git", "url": "https://github.com/WhichBrowser/Parser-PHP.git", - "reference": "880b9fa797401d14b28956442944c3daa70240ff" + "reference": "bcf642a1891032de16a5ab976fd352753dd7f9a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WhichBrowser/Parser-PHP/zipball/880b9fa797401d14b28956442944c3daa70240ff", - "reference": "880b9fa797401d14b28956442944c3daa70240ff", + "url": "https://api.github.com/repos/WhichBrowser/Parser-PHP/zipball/bcf642a1891032de16a5ab976fd352753dd7f9a0", + "reference": "bcf642a1891032de16a5ab976fd352753dd7f9a0", "shasum": "" }, "require": { @@ -1179,16 +1168,18 @@ "psr/cache": "^1.0" }, "require-dev": { + "cache/array-adapter": "^1.1", "icomefromthenet/reverse-regex": "0.0.6.3", - "phpunit/php-code-coverage": "^2.2 || ^3.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "2.5.*", - "symfony/yaml": "~2.8 || ~3.4 || ~4.2 || ~5.0" + "php-coveralls/php-coveralls": "^2.0", + "phpunit/php-code-coverage": "^5.0 || ^7.0", + "phpunit/phpunit": "^6.0 || ^8.0", + "squizlabs/php_codesniffer": "^3.5", + "symfony/yaml": "~3.4 || ~4.0" }, "suggest": { "cache/array-adapter": "Allows testing of the caching functionality" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1217,7 +1208,11 @@ "ua", "useragent" ], - "time": "2020-08-20T09:08:05+00:00" + "support": { + "issues": "https://github.com/WhichBrowser/Parser-PHP/issues", + "source": "https://github.com/WhichBrowser/Parser-PHP/tree/v2.1.2" + }, + "time": "2021-05-10T10:18:11+00:00" }, { "name": "zadarma/user-api-v1", @@ -1225,18 +1220,19 @@ "source": { "type": "git", "url": "https://github.com/zadarma/user-api-v1.git", - "reference": "0cc0fa0d3609d346720b051818632236017784a1" + "reference": "23badf5232bfc0a7707fd9fa9857d805e8b8e2d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zadarma/user-api-v1/zipball/0cc0fa0d3609d346720b051818632236017784a1", - "reference": "0cc0fa0d3609d346720b051818632236017784a1", + "url": "https://api.github.com/repos/zadarma/user-api-v1/zipball/23badf5232bfc0a7707fd9fa9857d805e8b8e2d1", + "reference": "23badf5232bfc0a7707fd9fa9857d805e8b8e2d1", "shasum": "" }, "require": { "ext-curl": "*", "php": ">=5.5.0" }, + "default-branch": true, "type": "library", "autoload": { "psr-4": { @@ -1262,7 +1258,11 @@ "sip", "zadarma" ], - "time": "2020-06-29T12:24:42+00:00" + "support": { + "issues": "https://github.com/zadarma/user-api-v1/issues", + "source": "https://github.com/zadarma/user-api-v1/tree/v1.1.7" + }, + "time": "2021-05-31T13:19:30+00:00" } ], "packages-dev": [], @@ -1284,5 +1284,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.0.0" }
Даритель: {_sender}: {$x->sender->getFullName()} @@ -35,7 +35,7 @@
Комментарий: {_comment}: {$x->caption}