Исправление ошибок

This commit is contained in:
Arsen Mirzaev Tatyano-Muradovich 2021-02-25 01:10:26 +10:00
parent 301b2945bc
commit b91ef68091
2 changed files with 68 additions and 68 deletions

126
composer.lock generated
View File

@ -11,7 +11,7 @@
"version": "v3.4.1", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/twbs/bootstrap.git", "url": "git@github.com:twbs/bootstrap.git",
"reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e" "reference": "68b0d231a13201eb14acd3dc84e51543d16e5f7e"
}, },
"dist": { "dist": {
@ -32,7 +32,7 @@
"version": "3.3.11", "version": "3.3.11",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/RobinHerbots/Inputmask.git", "url": "git@github.com:RobinHerbots/Inputmask.git",
"reference": "5e670ad62f50c738388d4dcec78d2888505ad77b" "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b"
}, },
"dist": { "dist": {
@ -721,7 +721,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.hood.su/mirzaev/yii2/arangodb", "url": "https://git.hood.su/mirzaev/yii2/arangodb",
"reference": "bf4483291486eb0b991907c3e55e5392f84f2ed9" "reference": "7288baa9593053bc769f6037dd50517079892852"
}, },
"require": { "require": {
"php": "^8.0.0", "php": "^8.0.0",
@ -763,7 +763,7 @@
"ArangoDb", "ArangoDb",
"yii2" "yii2"
], ],
"time": "2021-01-31T01:36:27+00:00" "time": "2021-02-23T22:22:04+00:00"
}, },
{ {
"name": "moonlandsoft/yii2-phpexcel", "name": "moonlandsoft/yii2-phpexcel",
@ -816,26 +816,26 @@
}, },
{ {
"name": "myclabs/php-enum", "name": "myclabs/php-enum",
"version": "1.7.7", "version": "1.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/myclabs/php-enum.git", "url": "https://github.com/myclabs/php-enum.git",
"reference": "d178027d1e679832db9f38248fcc7200647dc2b7" "reference": "46cf3d8498b095bd33727b13fd5707263af99421"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7", "url": "https://api.github.com/repos/myclabs/php-enum/zipball/46cf3d8498b095bd33727b13fd5707263af99421",
"reference": "d178027d1e679832db9f38248fcc7200647dc2b7", "reference": "46cf3d8498b095bd33727b13fd5707263af99421",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"php": ">=7.1" "php": "^7.3 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7", "phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "1.*", "squizlabs/php_codesniffer": "1.*",
"vimeo/psalm": "^3.8" "vimeo/psalm": "^4.5.1"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -860,7 +860,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/myclabs/php-enum/issues", "issues": "https://github.com/myclabs/php-enum/issues",
"source": "https://github.com/myclabs/php-enum/tree/1.7.7" "source": "https://github.com/myclabs/php-enum/tree/1.8.0"
}, },
"funding": [ "funding": [
{ {
@ -872,7 +872,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-11-14T18:14:52+00:00" "time": "2021-02-15T16:11:48+00:00"
}, },
{ {
"name": "npm-asset/jquery", "name": "npm-asset/jquery",
@ -1275,16 +1275,16 @@
}, },
{ {
"name": "symfony/polyfill-iconv", "name": "symfony/polyfill-iconv",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git", "url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6" "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6", "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342",
"reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6", "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1335,7 +1335,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -1351,20 +1351,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-07T16:49:33+00:00" "time": "2021-01-22T09:19:47+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git", "url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44" "reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
"reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44", "reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1422,7 +1422,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -1438,20 +1438,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-07T16:49:33+00:00" "time": "2021-01-22T09:19:47+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-normalizer", "name": "symfony/polyfill-intl-normalizer",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-normalizer.git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
"reference": "6e971c891537eb617a00bb07a43d182a6915faba" "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba", "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
"reference": "6e971c891537eb617a00bb07a43d182a6915faba", "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1506,7 +1506,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -1522,20 +1522,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-07T17:09:11+00:00" "time": "2021-01-22T09:19:47+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
"reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1586,7 +1586,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -1602,11 +1602,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-07T16:49:33+00:00" "time": "2021-01-22T09:19:47+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
@ -1662,7 +1662,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -2194,16 +2194,16 @@
}, },
{ {
"name": "codeception/codeception", "name": "codeception/codeception",
"version": "4.1.17", "version": "4.1.18",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Codeception/Codeception.git", "url": "https://github.com/Codeception/Codeception.git",
"reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68" "reference": "f47547bac347dfb5ea5351ff91148cbcc08e6818"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Codeception/Codeception/zipball/c153b1ab289b3e3109e685379aa8847c54ac2b68", "url": "https://api.github.com/repos/Codeception/Codeception/zipball/f47547bac347dfb5ea5351ff91148cbcc08e6818",
"reference": "c153b1ab289b3e3109e685379aa8847c54ac2b68", "reference": "f47547bac347dfb5ea5351ff91148cbcc08e6818",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2277,7 +2277,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/Codeception/Codeception/issues", "issues": "https://github.com/Codeception/Codeception/issues",
"source": "https://github.com/Codeception/Codeception/tree/4.1.17" "source": "https://github.com/Codeception/Codeception/tree/4.1.18"
}, },
"funding": [ "funding": [
{ {
@ -2285,7 +2285,7 @@
"type": "open_collective" "type": "open_collective"
} }
], ],
"time": "2021-02-01T07:30:47+00:00" "time": "2021-02-23T17:11:42+00:00"
}, },
{ {
"name": "codeception/lib-asserts", "name": "codeception/lib-asserts",
@ -3233,16 +3233,16 @@
}, },
{ {
"name": "phar-io/version", "name": "phar-io/version",
"version": "3.0.4", "version": "3.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phar-io/version.git", "url": "https://github.com/phar-io/version.git",
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451" "reference": "bae7c545bef187884426f042434e561ab1ddb182"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451", "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451", "reference": "bae7c545bef187884426f042434e561ab1ddb182",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -3278,9 +3278,9 @@
"description": "Library for handling version information and constraints", "description": "Library for handling version information and constraints",
"support": { "support": {
"issues": "https://github.com/phar-io/version/issues", "issues": "https://github.com/phar-io/version/issues",
"source": "https://github.com/phar-io/version/tree/3.0.4" "source": "https://github.com/phar-io/version/tree/3.1.0"
}, },
"time": "2020-12-13T23:18:30+00:00" "time": "2021-02-23T14:00:09+00:00"
}, },
{ {
"name": "php-webdriver/webdriver", "name": "php-webdriver/webdriver",
@ -5752,7 +5752,7 @@
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
@ -5811,7 +5811,7 @@
"portable" "portable"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -5831,16 +5831,16 @@
}, },
{ {
"name": "symfony/polyfill-intl-grapheme", "name": "symfony/polyfill-intl-grapheme",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
"reference": "267a9adeb8ecb8071040a740930e077cdfb987af" "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/267a9adeb8ecb8071040a740930e077cdfb987af", "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
"reference": "267a9adeb8ecb8071040a740930e077cdfb987af", "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -5892,7 +5892,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -5908,11 +5908,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-01-07T16:49:33+00:00" "time": "2021-01-22T09:19:47+00:00"
}, },
{ {
"name": "symfony/polyfill-php73", "name": "symfony/polyfill-php73",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php73.git", "url": "https://github.com/symfony/polyfill-php73.git",
@ -5971,7 +5971,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php73/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {
@ -5991,7 +5991,7 @@
}, },
{ {
"name": "symfony/polyfill-php80", "name": "symfony/polyfill-php80",
"version": "v1.22.0", "version": "v1.22.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php80.git", "url": "https://github.com/symfony/polyfill-php80.git",
@ -6054,7 +6054,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0" "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
}, },
"funding": [ "funding": [
{ {

View File

@ -5,7 +5,7 @@ declare(strict_types=1);
use yii\helpers\Html; use yii\helpers\Html;
use yii\bootstrap\ActiveForm; use yii\bootstrap\ActiveForm;
use app\models\Account; use app\models\AccountForm;
?> ?>
@ -26,11 +26,11 @@ use app\models\Account;
] ]
]); ]);
$model = $model ?? new Account; $model = $model ?? new AccountForm;
?> ?>
<?php $form->field($model, 'mail', ['enableLabel' => false, 'options' => ['class' => 'mb-2']])->textInput(['autofocus' => true, 'placeholder' => $model->getAttributeLabel('mail')]) ?> <?= $form->field($model, 'mail', ['enableLabel' => false, 'options' => ['class' => 'mb-2']])->textInput(['autofocus' => true, 'placeholder' => $model->getAttributeLabel('mail')]) ?>
<?php $form->field($model, 'pswd', ['enableLabel' => false])->passwordInput(['placeholder' => $model->getAttributeLabel('pswd')]) ?> <?= $form->field($model, 'pswd', ['enableLabel' => false])->passwordInput(['placeholder' => $model->getAttributeLabel('pswd')]) ?>
<div class="d-flex mb-2 mt-3"> <div class="d-flex mb-2 mt-3">
<?= Html::submitButton('Войти', ['name' => 'submitAuthentication', 'onclick' => 'authentication(this.parentElement.parentElement);', 'class' => 'flex-grow-1 mr-2 btn btn-primary button_clean']) ?> <?= Html::submitButton('Войти', ['name' => 'submitAuthentication', 'onclick' => 'authentication(this.parentElement.parentElement);', 'class' => 'flex-grow-1 mr-2 btn btn-primary button_clean']) ?>
@ -40,7 +40,7 @@ use app\models\Account;
</div> </div>
<?= Html::submitButton('Регистрация', ['name' => 'submitRegistration', 'onclick' => 'registration(this.parentElement);', 'class' => 'col-12 ml-auto btn btn-success btn-sm button_clean']) ?> <?= Html::submitButton('Регистрация', ['name' => 'submitRegistration', 'onclick' => 'registration(this.parentElement);', 'class' => 'col-12 ml-auto btn btn-success btn-sm button_clean']) ?>
<?= ActiveForm::end(); ?> <? ActiveForm::end(); ?>
</div> </div>
</div> </div>
</div> </div>