From cb315a9fcf7c1b33aa7a0e3bed94f17bc50e194c Mon Sep 17 00:00:00 2001 From: Arsen Mirzaev Tatyano-Muradovich Date: Wed, 16 Jun 2021 08:24:26 +1000 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BD=D0=B5=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 2 +- composer.lock | 490 +++++++++--------- .../assets/invoices/18234637/invoice.xlsx | Bin 0 -> 8204 bytes .../skillparts/system/config/web.php.example | 4 +- .../system/controllers/InvoiceController.php | 36 ++ .../system/controllers/OrderController.php | 7 +- .../system/models/AccountEdgeOrder.php | 8 + mirzaev/skillparts/system/models/Invoice.php | 13 +- .../system/models/OrderEdgeSupply.php | 8 + .../system/views/invoice/order/pattern.php | 2 +- .../skillparts/system/views/orders/index.php | 143 +++-- .../skillparts/system/views/search/index.php | 7 + .../skillparts/system/web/js/orders_panel.js | 2 +- 13 files changed, 422 insertions(+), 300 deletions(-) create mode 100644 mirzaev/skillparts/system/assets/invoices/18234637/invoice.xlsx create mode 100644 mirzaev/skillparts/system/controllers/InvoiceController.php diff --git a/composer.json b/composer.json index 843e9ed..ef2f72f 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "require": { "php": "^8.0.0", - "twbs/bootstrap": ">=4.5", + "twbs/bootstrap": "4.6.0", "yiisoft/yii2": "2.*", "yiisoft/yii2-bootstrap": ">=2.0.0", "yiisoft/yii2-swiftmailer": ">=2.0.0", diff --git a/composer.lock b/composer.lock index 0e71101..5c8b738 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": "2d649fe15bca353de389fb356d2d7d48", + "content-hash": "695a3f9969bbc0bbc0650efdc2e245af", "packages": [ { "name": "bower-asset/bootstrap", @@ -631,16 +631,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1" + "reference": "dc960a912984efb74d0a90222870c72c87f10c91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1", - "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", + "reference": "dc960a912984efb74d0a90222870c72c87f10c91", "shasum": "" }, "require": { @@ -700,9 +700,9 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.1" + "source": "https://github.com/guzzle/psr7/tree/1.8.2" }, - "time": "2021-03-21T16:25:00+00:00" + "time": "2021-04-26T09:17:50+00:00" }, { "name": "imagine/imagine", @@ -839,16 +839,16 @@ }, { "name": "markbaker/complex", - "version": "2.0.0", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPComplex.git", - "reference": "9999f1432fae467bc93c53f357105b4c31bb994c" + "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/9999f1432fae467bc93c53f357105b4c31bb994c", - "reference": "9999f1432fae467bc93c53f357105b4c31bb994c", + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/6f724d7e04606fd8adaa4e3bb381c3e9db09c946", + "reference": "6f724d7e04606fd8adaa4e3bb381c3e9db09c946", "shasum": "" }, "require": { @@ -857,11 +857,7 @@ "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "phpcompatibility/php-compatibility": "^9.0", - "phpdocumentor/phpdocumentor": "2.*", - "phploc/phploc": "^4.0", - "phpmd/phpmd": "2.*", "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", - "sebastian/phpcpd": "^4.0", "squizlabs/php_codesniffer": "^3.4" }, "type": "library", @@ -932,22 +928,22 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPComplex/issues", - "source": "https://github.com/MarkBaker/PHPComplex/tree/PHP8" + "source": "https://github.com/MarkBaker/PHPComplex/tree/2.0.3" }, - "time": "2020-08-26T10:42:07+00:00" + "time": "2021-06-02T09:44:11+00:00" }, { "name": "markbaker/matrix", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "361c0f545c3172ee26c3d596a0aa03f0cef65e6a" + "reference": "174395a901b5ba0925f1d790fa91bab531074b61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/361c0f545c3172ee26c3d596a0aa03f0cef65e6a", - "reference": "361c0f545c3172ee26c3d596a0aa03f0cef65e6a", + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/174395a901b5ba0925f1d790fa91bab531074b61", + "reference": "174395a901b5ba0925f1d790fa91bab531074b61", "shasum": "" }, "require": { @@ -1006,9 +1002,9 @@ ], "support": { "issues": "https://github.com/MarkBaker/PHPMatrix/issues", - "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.2" + "source": "https://github.com/MarkBaker/PHPMatrix/tree/2.1.3" }, - "time": "2021-01-23T16:37:31+00:00" + "time": "2021-05-25T15:42:17+00:00" }, { "name": "mirzaev/yii2-arangodb", @@ -1661,16 +1657,16 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", - "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", "shasum": "" }, "require": { @@ -1682,7 +1678,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1721,7 +1717,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" }, "funding": [ { @@ -1737,20 +1733,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483" + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483", - "reference": "2d63434d922daf7da8dd863e7907e67ee3031483", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", + "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", "shasum": "" }, "require": { @@ -1764,7 +1760,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1808,7 +1804,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" }, "funding": [ { @@ -1824,20 +1820,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8", + "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8", "shasum": "" }, "require": { @@ -1849,7 +1845,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1892,7 +1888,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" }, "funding": [ { @@ -1908,20 +1904,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", "shasum": "" }, "require": { @@ -1933,7 +1929,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1972,7 +1968,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" }, "funding": [ { @@ -1988,20 +1984,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:27:20+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9" + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", - "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", "shasum": "" }, "require": { @@ -2010,7 +2006,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2048,7 +2044,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" }, "funding": [ { @@ -2064,7 +2060,7 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "triagens/arangodb", @@ -2190,16 +2186,16 @@ }, { "name": "yiisoft/yii2", - "version": "2.0.41.1", + "version": "2.0.42.1", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "2ad0894a2ccbd3912b33de4419ad1ae3df0595c4" + "reference": "976e2e892af4df933831b5e0a05d0acf4b173d98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/2ad0894a2ccbd3912b33de4419ad1ae3df0595c4", - "reference": "2ad0894a2ccbd3912b33de4419ad1ae3df0595c4", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/976e2e892af4df933831b5e0a05d0acf4b173d98", + "reference": "976e2e892af4df933831b5e0a05d0acf4b173d98", "shasum": "" }, "require": { @@ -2307,7 +2303,7 @@ "type": "tidelift" } ], - "time": "2021-03-04T15:45:04+00:00" + "time": "2021-05-06T11:44:35+00:00" }, { "name": "yiisoft/yii2-bootstrap", @@ -2663,16 +2659,16 @@ }, { "name": "codeception/codeception", - "version": "4.1.20", + "version": "4.1.21", "source": { "type": "git", "url": "https://github.com/Codeception/Codeception.git", - "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a" + "reference": "c25f20d842a7e3fa0a8e6abf0828f102c914d419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/Codeception/zipball/d8b16e13e1781dbc3a7ae8292117d520c89a9c5a", - "reference": "d8b16e13e1781dbc3a7ae8292117d520c89a9c5a", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/c25f20d842a7e3fa0a8e6abf0828f102c914d419", + "reference": "c25f20d842a7e3fa0a8e6abf0828f102c914d419", "shasum": "" }, "require": { @@ -2692,11 +2688,11 @@ "symfony/yaml": ">=2.7 <6.0" }, "require-dev": { - "codeception/module-asserts": "*@dev", - "codeception/module-cli": "*@dev", - "codeception/module-db": "*@dev", - "codeception/module-filesystem": "*@dev", - "codeception/module-phpbrowser": "*@dev", + "codeception/module-asserts": "1.*@dev", + "codeception/module-cli": "1.*@dev", + "codeception/module-db": "1.*@dev", + "codeception/module-filesystem": "1.*@dev", + "codeception/module-phpbrowser": "1.*@dev", "codeception/specify": "~0.3", "codeception/util-universalframework": "*@dev", "monolog/monolog": "~1.8", @@ -2746,7 +2742,7 @@ ], "support": { "issues": "https://github.com/Codeception/Codeception/issues", - "source": "https://github.com/Codeception/Codeception/tree/4.1.20" + "source": "https://github.com/Codeception/Codeception/tree/4.1.21" }, "funding": [ { @@ -2754,7 +2750,7 @@ "type": "open_collective" } ], - "time": "2021-04-02T16:41:51+00:00" + "time": "2021-05-28T17:43:39+00:00" }, { "name": "codeception/lib-asserts", @@ -2812,16 +2808,16 @@ }, { "name": "codeception/lib-innerbrowser", - "version": "1.4.2", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/Codeception/lib-innerbrowser.git", - "reference": "4ffb91c18e4cacd073ff2914c07e5ccaf5efe449" + "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/4ffb91c18e4cacd073ff2914c07e5ccaf5efe449", - "reference": "4ffb91c18e4cacd073ff2914c07e5ccaf5efe449", + "url": "https://api.github.com/repos/Codeception/lib-innerbrowser/zipball/4b0d89b37fe454e060a610a85280a87ab4f534f1", + "reference": "4b0d89b37fe454e060a610a85280a87ab4f534f1", "shasum": "" }, "require": { @@ -2866,9 +2862,9 @@ ], "support": { "issues": "https://github.com/Codeception/lib-innerbrowser/issues", - "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.4.2" + "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.5.0" }, - "time": "2021-04-06T05:26:49+00:00" + "time": "2021-04-23T06:18:29+00:00" }, { "name": "codeception/module-asserts", @@ -2981,16 +2977,16 @@ }, { "name": "codeception/module-webdriver", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Codeception/module-webdriver.git", - "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87" + "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/63ea08880a44df809bdfbca08597e1b68cee9f87", - "reference": "63ea08880a44df809bdfbca08597e1b68cee9f87", + "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/ebbe729c630415e8caf6b0087e457906f0c6c0c6", + "reference": "ebbe729c630415e8caf6b0087e457906f0c6c0c6", "shasum": "" }, "require": { @@ -3031,22 +3027,22 @@ ], "support": { "issues": "https://github.com/Codeception/module-webdriver/issues", - "source": "https://github.com/Codeception/module-webdriver/tree/1.2.0" + "source": "https://github.com/Codeception/module-webdriver/tree/1.2.1" }, - "time": "2021-01-17T19:23:20+00:00" + "time": "2021-04-23T17:30:57+00:00" }, { "name": "codeception/module-yii2", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/Codeception/module-yii2.git", - "reference": "7e2eaeb414315271d545e17c330b3aaf08911927" + "reference": "09853feb15ad5e80e472c6881793a22f273a9921" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Codeception/module-yii2/zipball/7e2eaeb414315271d545e17c330b3aaf08911927", - "reference": "7e2eaeb414315271d545e17c330b3aaf08911927", + "url": "https://api.github.com/repos/Codeception/module-yii2/zipball/09853feb15ad5e80e472c6881793a22f273a9921", + "reference": "09853feb15ad5e80e472c6881793a22f273a9921", "shasum": "" }, "require": { @@ -3083,9 +3079,9 @@ ], "support": { "issues": "https://github.com/Codeception/module-yii2/issues", - "source": "https://github.com/Codeception/module-yii2/tree/1.1.2" + "source": "https://github.com/Codeception/module-yii2/tree/1.1.3" }, - "time": "2020-12-21T15:21:56+00:00" + "time": "2021-05-24T20:05:32+00:00" }, { "name": "codeception/phpunit-wrapper", @@ -3459,16 +3455,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.10.4", + "version": "v4.10.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", - "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f", + "reference": "4432ba399e47c66624bc73c8c0f811e5c109576f", "shasum": "" }, "require": { @@ -3509,9 +3505,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5" }, - "time": "2020-12-20T10:01:03+00:00" + "time": "2021-05-03T19:11:20+00:00" }, { "name": "opis/closure", @@ -3691,16 +3687,16 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.10.0", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211" + "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/cd9290b95b7651d495bd69253d6e3ef469a7f211", - "reference": "cd9290b95b7651d495bd69253d6e3ef469a7f211", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/da16e39968f8dd5cfb7d07eef91dc2b731c69880", + "reference": "da16e39968f8dd5cfb7d07eef91dc2b731c69880", "shasum": "" }, "require": { @@ -3728,11 +3724,6 @@ "ext-SimpleXML": "For Firefox profile creation" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.8.x-dev" - } - }, "autoload": { "psr-4": { "Facebook\\WebDriver\\": "lib/" @@ -3756,9 +3747,9 @@ ], "support": { "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.10.0" + "source": "https://github.com/php-webdriver/php-webdriver/tree/1.11.1" }, - "time": "2021-02-25T13:38:09+00:00" + "time": "2021-05-21T15:12:49+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4346,16 +4337,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.4", + "version": "9.5.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c73c6737305e779771147af66c96ca6a7ed8a741" + "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c73c6737305e779771147af66c96ca6a7ed8a741", - "reference": "c73c6737305e779771147af66c96ca6a7ed8a741", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/89ff45ea9d70e35522fb6654a2ebc221158de276", + "reference": "89ff45ea9d70e35522fb6654a2ebc221158de276", "shasum": "" }, "require": { @@ -4385,7 +4376,7 @@ "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^2.3", + "sebastian/type": "^2.3.2", "sebastian/version": "^3.0.2" }, "require-dev": { @@ -4433,7 +4424,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.5" }, "funding": [ { @@ -4445,7 +4436,7 @@ "type": "github" } ], - "time": "2021-03-23T07:16:29+00:00" + "time": "2021-06-05T04:49:07+00:00" }, { "name": "psr/container", @@ -5051,16 +5042,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.2", + "version": "5.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "a90ccbddffa067b51f574dea6eb25d5680839455" + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455", - "reference": "a90ccbddffa067b51f574dea6eb25d5680839455", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49", + "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49", "shasum": "" }, "require": { @@ -5103,7 +5094,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3" }, "funding": [ { @@ -5111,7 +5102,7 @@ "type": "github" } ], - "time": "2020-10-26T15:55:19+00:00" + "time": "2021-06-11T13:31:12+00:00" }, { "name": "sebastian/lines-of-code", @@ -5402,16 +5393,16 @@ }, { "name": "sebastian/type", - "version": "2.3.1", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2" + "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2", - "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914", + "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914", "shasum": "" }, "require": { @@ -5446,7 +5437,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/2.3.1" + "source": "https://github.com/sebastianbergmann/type/tree/2.3.4" }, "funding": [ { @@ -5454,7 +5445,7 @@ "type": "github" } ], - "time": "2020-10-26T13:18:59+00:00" + "time": "2021-06-15T12:49:02+00:00" }, { "name": "sebastian/version", @@ -5511,16 +5502,16 @@ }, { "name": "symfony/browser-kit", - "version": "v5.2.4", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93" + "reference": "379984e25eee9811b0a25a2105e1a2b3b8d9b734" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3ca3a57ce9860318b20a924fec5daf5c6db44d93", - "reference": "3ca3a57ce9860318b20a924fec5daf5c6db44d93", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/379984e25eee9811b0a25a2105e1a2b3b8d9b734", + "reference": "379984e25eee9811b0a25a2105e1a2b3b8d9b734", "shasum": "" }, "require": { @@ -5562,7 +5553,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.2.4" + "source": "https://github.com/symfony/browser-kit/tree/v5.3.0" }, "funding": [ { @@ -5578,24 +5569,25 @@ "type": "tidelift" } ], - "time": "2021-02-22T06:48:33+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/console", - "version": "v5.2.6", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d" + "reference": "058553870f7809087fa80fa734704a21b9bcaeb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d", - "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d", + "url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2", + "reference": "058553870f7809087fa80fa734704a21b9bcaeb2", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.8", "symfony/polyfill-php80": "^1.15", @@ -5659,7 +5651,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.6" + "source": "https://github.com/symfony/console/tree/v5.3.0" }, "funding": [ { @@ -5675,20 +5667,20 @@ "type": "tidelift" } ], - "time": "2021-03-28T09:42:18+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/css-selector", - "version": "v5.2.4", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f" + "reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/f65f217b3314504a1ec99c2d6ef69016bb13490f", - "reference": "f65f217b3314504a1ec99c2d6ef69016bb13490f", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/fcd0b29a7a0b1bb5bfbedc6231583d77fea04814", + "reference": "fcd0b29a7a0b1bb5bfbedc6231583d77fea04814", "shasum": "" }, "require": { @@ -5724,7 +5716,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.2.4" + "source": "https://github.com/symfony/css-selector/tree/v5.3.0" }, "funding": [ { @@ -5740,20 +5732,20 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:01:46+00:00" + "time": "2021-05-26T17:40:38+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665" + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665", - "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", "shasum": "" }, "require": { @@ -5762,7 +5754,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -5791,7 +5783,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" }, "funding": [ { @@ -5807,24 +5799,25 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/dom-crawler", - "version": "v5.2.4", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "400e265163f65aceee7e904ef532e15228de674b" + "reference": "55fff62b19f413f897a752488ade1bc9c8a19cdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/400e265163f65aceee7e904ef532e15228de674b", - "reference": "400e265163f65aceee7e904ef532e15228de674b", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/55fff62b19f413f897a752488ade1bc9c8a19cdd", + "reference": "55fff62b19f413f897a752488ade1bc9c8a19cdd", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php80": "^1.15" @@ -5865,7 +5858,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.2.4" + "source": "https://github.com/symfony/dom-crawler/tree/v5.3.0" }, "funding": [ { @@ -5881,20 +5874,20 @@ "type": "tidelift" } ], - "time": "2021-02-15T18:55:04+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.2.4", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d08d6ec121a425897951900ab692b612a61d6240" + "reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240", - "reference": "d08d6ec121a425897951900ab692b612a61d6240", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/67a5f354afa8e2f231081b3fa11a5912f933c3ce", + "reference": "67a5f354afa8e2f231081b3fa11a5912f933c3ce", "shasum": "" }, "require": { @@ -5950,7 +5943,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.3.0" }, "funding": [ { @@ -5966,20 +5959,20 @@ "type": "tidelift" } ], - "time": "2021-02-18T17:12:37+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2" + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/0ba7d54483095a198fa51781bc608d17e84dffa2", - "reference": "0ba7d54483095a198fa51781bc608d17e84dffa2", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11", + "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11", "shasum": "" }, "require": { @@ -5992,7 +5985,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6029,7 +6022,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0" }, "funding": [ { @@ -6045,20 +6038,20 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-03-23T23:28:01+00:00" }, { "name": "symfony/finder", - "version": "v5.2.4", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "0d639a0943822626290d169965804f79400e6a04" + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04", - "reference": "0d639a0943822626290d169965804f79400e6a04", + "url": "https://api.github.com/repos/symfony/finder/zipball/0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", + "reference": "0ae3f047bed4edff6fd35b26a9a6bfdc92c953c6", "shasum": "" }, "require": { @@ -6090,7 +6083,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.2.4" + "source": "https://github.com/symfony/finder/tree/v5.3.0" }, "funding": [ { @@ -6106,20 +6099,20 @@ "type": "tidelift" } ], - "time": "2021-02-15T18:55:04+00:00" + "time": "2021-05-26T12:52:38+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { @@ -6131,7 +6124,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6169,7 +6162,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" }, "funding": [ { @@ -6185,20 +6178,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab", + "reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab", "shasum": "" }, "require": { @@ -6210,7 +6203,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6250,7 +6243,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0" }, "funding": [ { @@ -6266,20 +6259,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2021-05-27T09:17:38+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2" + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", - "reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", + "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", "shasum": "" }, "require": { @@ -6288,7 +6281,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6329,7 +6322,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" }, "funding": [ { @@ -6345,20 +6338,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.22.1", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91" + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91", - "reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0", + "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0", "shasum": "" }, "require": { @@ -6367,7 +6360,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.22-dev" + "dev-main": "1.23-dev" }, "thanks": { "name": "symfony/polyfill", @@ -6412,7 +6405,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0" }, "funding": [ { @@ -6428,20 +6421,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/process", - "version": "v5.2.4", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f" + "reference": "53e36cb1c160505cdaf1ef201501669c4c317191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f", - "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f", + "url": "https://api.github.com/repos/symfony/process/zipball/53e36cb1c160505cdaf1ef201501669c4c317191", + "reference": "53e36cb1c160505cdaf1ef201501669c4c317191", "shasum": "" }, "require": { @@ -6474,7 +6467,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.2.4" + "source": "https://github.com/symfony/process/tree/v5.3.0" }, "funding": [ { @@ -6490,25 +6483,25 @@ "type": "tidelift" } ], - "time": "2021-01-27T10:15:41+00:00" + "time": "2021-05-26T12:52:38+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1" + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1", - "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.0" + "psr/container": "^1.1" }, "suggest": { "symfony/service-implementation": "" @@ -6516,7 +6509,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2-dev" + "dev-main": "2.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -6553,7 +6546,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/master" + "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" }, "funding": [ { @@ -6569,20 +6562,20 @@ "type": "tidelift" } ], - "time": "2020-09-07T11:33:47+00:00" + "time": "2021-04-01T10:43:52+00:00" }, { "name": "symfony/string", - "version": "v5.2.6", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572" + "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572", - "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572", + "url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b", + "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b", "shasum": "" }, "require": { @@ -6636,7 +6629,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.6" + "source": "https://github.com/symfony/string/tree/v5.3.0" }, "funding": [ { @@ -6652,20 +6645,20 @@ "type": "tidelift" } ], - "time": "2021-03-17T17:12:15+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "symfony/yaml", - "version": "v5.2.5", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "298a08ddda623485208506fcee08817807a251dd" + "reference": "3bbcf262fceb3d8f48175302e6ba0ac96e3a5a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/298a08ddda623485208506fcee08817807a251dd", - "reference": "298a08ddda623485208506fcee08817807a251dd", + "url": "https://api.github.com/repos/symfony/yaml/zipball/3bbcf262fceb3d8f48175302e6ba0ac96e3a5a11", + "reference": "3bbcf262fceb3d8f48175302e6ba0ac96e3a5a11", "shasum": "" }, "require": { @@ -6711,7 +6704,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.2.5" + "source": "https://github.com/symfony/yaml/tree/v5.3.0" }, "funding": [ { @@ -6727,7 +6720,7 @@ "type": "tidelift" } ], - "time": "2021-03-06T07:59:01+00:00" + "time": "2021-05-26T17:43:10+00:00" }, { "name": "theseer/tokenizer", @@ -6839,16 +6832,16 @@ }, { "name": "yiisoft/yii2-debug", - "version": "2.1.16", + "version": "2.1.17", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-debug.git", - "reference": "0d8ce76b2dd036a5fc38b26434e1c672ad8975a9" + "reference": "21a259c27dacedf19ac1e00d4a7180e3043d7859" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/0d8ce76b2dd036a5fc38b26434e1c672ad8975a9", - "reference": "0d8ce76b2dd036a5fc38b26434e1c672ad8975a9", + "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/21a259c27dacedf19ac1e00d4a7180e3043d7859", + "reference": "21a259c27dacedf19ac1e00d4a7180e3043d7859", "shasum": "" }, "require": { @@ -6925,7 +6918,7 @@ "type": "tidelift" } ], - "time": "2020-12-23T16:36:12+00:00" + "time": "2021-05-05T22:02:36+00:00" }, { "name": "yiisoft/yii2-faker", @@ -7011,16 +7004,16 @@ }, { "name": "yiisoft/yii2-gii", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-gii.git", - "reference": "f3bb400b578b0a0ee737d267ebaffdaad7b32dee" + "reference": "68efc6fb830feccfaa43354817b5bcd36c7bd5a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/f3bb400b578b0a0ee737d267ebaffdaad7b32dee", - "reference": "f3bb400b578b0a0ee737d267ebaffdaad7b32dee", + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/68efc6fb830feccfaa43354817b5bcd36c7bd5a8", + "reference": "68efc6fb830feccfaa43354817b5bcd36c7bd5a8", "shasum": "" }, "require": { @@ -7028,13 +7021,24 @@ "yiisoft/yii2": "~2.0.14" }, "require-dev": { - "phpunit/phpunit": "<7", + "cweagans/composer-patches": "^1.7", + "phpunit/phpunit": "4.8.34", "yiisoft/yii2-coding-standards": "~2.0" }, "type": "yii2-extension", "extra": { "branch-alias": { "dev-master": "2.0.x-dev" + }, + "composer-exit-on-patch-failure": true, + "patches": { + "phpunit/phpunit-mock-objects": { + "Fix PHP 7 and 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_mock_objects.patch" + }, + "phpunit/phpunit": { + "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch", + "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch" + } } }, "autoload": { @@ -7079,7 +7083,7 @@ "type": "tidelift" } ], - "time": "2020-05-02T11:59:43+00:00" + "time": "2021-05-06T08:11:09+00:00" } ], "aliases": [], diff --git a/mirzaev/skillparts/system/assets/invoices/18234637/invoice.xlsx b/mirzaev/skillparts/system/assets/invoices/18234637/invoice.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..cdf3a5e18f05957e568d8dd577d9c096bcb9529c GIT binary patch literal 8204 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 'order/index', 'orders/<_key:[^/]+>/' => 'order/', 'orders/supply/<_key:[^/]+>/' => 'order/supply-', - 'orders/supply/<_key:[^/]+>//' => 'order/supply--' + 'orders/supply/<_key:[^/]+>//' => 'order/supply--', + 'invoices/' => 'invoice/index', + 'invoices//' => 'invoice/' ], ], diff --git a/mirzaev/skillparts/system/controllers/InvoiceController.php b/mirzaev/skillparts/system/controllers/InvoiceController.php new file mode 100644 index 0000000..192f73b --- /dev/null +++ b/mirzaev/skillparts/system/controllers/InvoiceController.php @@ -0,0 +1,36 @@ +renderPartial('/invoice/order/pattern', [ + 'account' => yii::$app->user->identity->_key, + 'order' => [ + 'id' => $order->_key, + 'date' => $order->date ?? time() // @todo доделать + ] + ]); + } + } + + public function actionDownload(int $order) + { + // Инициализация файла + $file = YII_PATH_PUBLIC . '/../assets/invoices/' . $order . '/invoice.xlsx'; + + if (file_exists($file)) return $this->response->sendFile($file); + else yii::$app->response->statusCode = 500; + } +} diff --git a/mirzaev/skillparts/system/controllers/OrderController.php b/mirzaev/skillparts/system/controllers/OrderController.php index c773cb3..1825c8c 100644 --- a/mirzaev/skillparts/system/controllers/OrderController.php +++ b/mirzaev/skillparts/system/controllers/OrderController.php @@ -133,6 +133,9 @@ class OrderController extends Controller if ($account_edge_order->save()) { // Удалось сохранить изменения + // Запись в журнал + Order::searchById($account_edge_order->_to)->journal('accepted'); + // Инициализация $orders = Order::search(type: 'all', limit: 10, page: 1, select: '{account_edge_order, order}'); $moderator_orders = self::genOrdersForModeration(); @@ -379,10 +382,10 @@ class OrderController extends Controller // Удалось сохранить изменения // Генерация счета - Invoice::generate($this->renderPartial('/invoice/order/pattern', [ + Invoice::generate($model->_key, $this->renderPartial('/invoice/order/pattern', [ 'account' => yii::$app->user->identity->_key, 'order' => [ - 'id' => $edge->_key, + 'id' => $model->_key, 'date' => $edge->date ?? time() // @todo доделать ] ])); diff --git a/mirzaev/skillparts/system/models/AccountEdgeOrder.php b/mirzaev/skillparts/system/models/AccountEdgeOrder.php index 8840e58..b971752 100644 --- a/mirzaev/skillparts/system/models/AccountEdgeOrder.php +++ b/mirzaev/skillparts/system/models/AccountEdgeOrder.php @@ -23,4 +23,12 @@ class AccountEdgeOrder extends Edge { return self::find()->where(['_to' => $order_id])->limit($limit)->all(); } + + public static function convertStatusToRussian(string $status): string + { + return match($status) { + 'accepted' => 'Доставляется', + default => 'Обрабатывается' + }; + } } diff --git a/mirzaev/skillparts/system/models/Invoice.php b/mirzaev/skillparts/system/models/Invoice.php index 6e03ebf..25f5207 100644 --- a/mirzaev/skillparts/system/models/Invoice.php +++ b/mirzaev/skillparts/system/models/Invoice.php @@ -11,15 +11,24 @@ use PhpOffice\PhpSpreadsheet\Writer\Xlsx; // use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader; // use PhpOffice\PhpSpreadsheet\Writer\Html; use PhpOffice\PhpSpreadsheet\Reader\Html as HtmlReader; + +use Exception; + class Invoice extends Model { - public static function generate(string $html): void + public static function generate(string|int $order_key, string $html): void { + // Инициализация директории + $dir = YII_PATH_PUBLIC . '/../assets/invoices/' . $order_key; + + // Сохранение на диск + if (!file_exists($dir) && !mkdir($dir, 0775, true)) throw new Exception('Не удалось записать директорию:' . $dir); + $reader = new HtmlReader(); $spreadsheet = $reader->loadFromString($html); $writer = new Xlsx($spreadsheet); - $writer->save('hello world228.xlsx'); + $writer->save($dir . '/invoice.xlsx'); // $reader = new XlsxReader(); // $reader->setReadDataOnly(true); diff --git a/mirzaev/skillparts/system/models/OrderEdgeSupply.php b/mirzaev/skillparts/system/models/OrderEdgeSupply.php index c40d059..6fb2aa0 100644 --- a/mirzaev/skillparts/system/models/OrderEdgeSupply.php +++ b/mirzaev/skillparts/system/models/OrderEdgeSupply.php @@ -113,4 +113,12 @@ class OrderEdgeSupply extends Edge return []; } + + public static function convertStatusToRussian(string|int $status): string + { + return match($status) { + 'accepted', 1 => 'Ожидается отправка', + default => 'Запрошен' + }; + } } diff --git a/mirzaev/skillparts/system/views/invoice/order/pattern.php b/mirzaev/skillparts/system/views/invoice/order/pattern.php index 4217a86..fd60925 100644 --- a/mirzaev/skillparts/system/views/invoice/order/pattern.php +++ b/mirzaev/skillparts/system/views/invoice/order/pattern.php @@ -3,7 +3,7 @@ - Competency List + Счёт №<?= $order['id'] ?> diff --git a/mirzaev/skillparts/system/views/orders/index.php b/mirzaev/skillparts/system/views/orders/index.php index f453b26..e8472a6 100644 --- a/mirzaev/skillparts/system/views/orders/index.php +++ b/mirzaev/skillparts/system/views/orders/index.php @@ -2,6 +2,8 @@ declare(strict_types=1); +use app\models\AccountEdgeOrder; +use app\models\OrderEdgeSupply; use yii; use yii\bootstrap\ActiveForm; @@ -172,16 +174,22 @@ if (

Заказы

-
+
+
+ Поставки +
Статус
-
+
Время
+
+ +
'', - default => '' - }; - - // Рассчет времени - try { - $delivery_converted = DateTime::createFromFormat('Y-m-d H:i:s', $delivery['orderDates']['giveoutFromOspReceiver'])->getTimestamp(); - } catch (Exception $e) { - $delivery_converted = DateTime::createFromFormat('Y-m-d', $delivery['orderDates']['arrivalToOspReceiver'])->getTimestamp(); - } - $delivery = ceil(($delivery_converted - time()) / 60 / 60 / 24) + 1; - - // Инициализация цены - $cost = $cost . ' ' . $currency; - } + // Инициализация стоимости foreach ($order_edge_supply as $part) { // Перебор связей поставок с заказом + // Инициализация доставки + if (isset($delivery['error'])) { + // Не удалось рассчитать доставку + + // Инициализация индикатора + $time_icon = ''; + + // Инициализация доставки + if (isset($part['time'])) { + // Найдены данные в инстанции поставки + + // Запись в буфер вывода + $time = $part['time'] . ' дн'; + } else { + $time = 'Неизвестно'; + } + + // Инициализация стоимости + if (isset($part['cost'])) $cost = $part['cost'] . ' ' . $currency; + else $cost = 'Неизвестно'; + } else { + // Удалось рассчитать доставку + + // Инициализация типа доставки + $time_type = $part['dlvr']['type'] ?? 'auto'; + + // Инициализация индикатора + $time_icon = match ($time_type) { + 'avia' => '', + default => '' + }; + + // Инициализация доставки + if (isset($part['time'])) { + // Найдены данные в инстанции поставки + + // Запись в буфер вывода + $time = $part['time'] . ' дн'; + } else { + // Рассчет времени из данных поставки + + try { + $time_converted = DateTime::createFromFormat('Y-m-d H:i:s', $delivery['orderDates']['giveoutFromOspReceiver'])->getTimestamp(); + } catch (Exception $e) { + $time_converted = DateTime::createFromFormat('Y-m-d', $delivery['orderDates']['arrivalToOspReceiver'])->getTimestamp(); + } + $time = (ceil(($time_converted - time()) / 60 / 60 / 24) + 1) . ' дн'; + } + + // Инициализация стоимости + if (isset($part['cost'])) $cost = $part['cost'] . ' ' . $currency; + else $cost = $cost . ' ' . $currency; + } + // Инициализация статуса связи поставки - $status = $part['stts'] ?? 0; + $status = OrderEdgeSupply::convertStatusToRussian($part['stts'] ?? 0); $supplies_html .= << -
{$supply['catn']}
-
$status
-
$delivery
-
$cost
+
{$supply['catn']}
+
$status
+
$time_icon $time
+
$cost
HTML; } } } + // Инициализация статуса заказа + $status = AccountEdgeOrder::convertStatusToRussian($account_edge_order[0]['type']); + + // Инициализация счета для скачивания + $invoice = << + HTML; + echo << +
-
+
$supplies_html
-
- {$account_edge_order[0]['type']} +
+ $status
-
+
$date
+
+ $invoice +
HTML; } diff --git a/mirzaev/skillparts/system/views/search/index.php b/mirzaev/skillparts/system/views/search/index.php index 9077352..47b7623 100644 --- a/mirzaev/skillparts/system/views/search/index.php +++ b/mirzaev/skillparts/system/views/search/index.php @@ -97,6 +97,13 @@ if (isset($delivery['error']) || $delivery === '?') { // Не удалось рассчитать доставку + // Инициализация типа доставки + $delivery_type = $delivery['type'] ?? 'auto'; + + // Инициализация индикатора + $delivery_icon = ''; + + // Инициализация времени $delivery = '?'; } else { // Удалось рассчитать доставку diff --git a/mirzaev/skillparts/system/web/js/orders_panel.js b/mirzaev/skillparts/system/web/js/orders_panel.js index 8548315..975a5b5 100644 --- a/mirzaev/skillparts/system/web/js/orders_panel.js +++ b/mirzaev/skillparts/system/web/js/orders_panel.js @@ -279,7 +279,7 @@ function orders_supply_comm_write(button, supply_key, order_key) { dataType: 'json', data: { '_csrf': yii.getCsrfToken(), - 'stts': 1 + 'stts': 'accepted' }, success: function (data, status) { // Инициализация индикатора