Upgrade dependencies

This commit is contained in:
ErickSkrauch 2020-06-10 17:38:05 +03:00
parent 295d3a6dc6
commit c18052c323
No known key found for this signature in database
GPG Key ID: 669339FCBB30EE0E
4 changed files with 1800 additions and 779 deletions

View File

@ -3,10 +3,10 @@ declare(strict_types=1);
namespace common\db\mysql;
use SamIT\Yii2\MariaDb\QueryBuilder as MysqlQueryBuilder;
use SamIT\Yii2\MariaDb\QueryBuilder as MariaDbQueryBuilder;
use yii\db\ExpressionInterface;
class QueryBuilder extends MysqlQueryBuilder {
class QueryBuilder extends MariaDbQueryBuilder {
public function buildOrderBy($columns) {
if (empty($columns)) {

View File

@ -4,14 +4,15 @@ declare(strict_types=1);
namespace common\db\mysql;
use SamIT\Yii2\MariaDb\JsonExpressionBuilder;
use SamIT\Yii2\MariaDb\Schema as MysqlSchema;
use SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
use yii\db\JsonExpression;
class Schema extends MysqlSchema {
class Schema extends MariaDbSchema {
public function createQueryBuilder() {
public function createQueryBuilder(): QueryBuilder {
$result = new QueryBuilder($this->db);
$result->setExpressionBuilders([
'yii\db\JsonExpression' => JsonExpressionBuilder::class,
JsonExpression::class => JsonExpressionBuilder::class,
]);
return $result;

View File

@ -34,8 +34,8 @@
"mito/yii2-sentry": "^1.0",
"nesbot/carbon": "^2.22",
"paragonie/constant_time_encoding": "^2.0",
"ramsey/uuid": "^3.5",
"sam-it/yii2-mariadb": "^1.1",
"ramsey/uuid": "^4.0.0",
"sam-it/yii2-mariadb": "^2.0.0",
"spomky-labs/otphp": "^10.0.0",
"webmozart/assert": "^1.2.0",
"yiisoft/yii2": "~2.0.20",
@ -50,7 +50,6 @@
"codeception/module-yii2": "^1.0.0",
"cweagans/composer-patches": "^1.6",
"ely/php-code-style": "^0.3.0",
"flow/jsonpath": "^0.4.0",
"php-mock/php-mock-phpunit": "^2.5",
"roave/security-advisories": "dev-master"
},
@ -58,7 +57,9 @@
"paragonie/random_compat": "2.99.99",
"symfony/polyfill-ctype": "*",
"symfony/polyfill-iconv": "*",
"symfony/polyfill-intl-grapheme": "*",
"symfony/polyfill-intl-idn": "*",
"symfony/polyfill-intl-normalizer": "*",
"symfony/polyfill-mbstring": "*",
"symfony/polyfill-php70": "*",
"symfony/polyfill-php72": "*",

2559
composer.lock generated

File diff suppressed because it is too large Load Diff