Skip to content

Commit 836c9f4

Browse files
authored
Aktualizace závislostí (#758)
* aktualizace zavislosti
1 parent 9cf9610 commit 836c9f4

File tree

7 files changed

+4202
-3841
lines changed

7 files changed

+4202
-3841
lines changed

app/Model/User/CustomInputValue/CustomTextValue.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class CustomTextValue extends CustomInputValue
1919
/**
2020
* Hodnota textového pole přihlášky.
2121
*
22-
* @ORM\Column(type="text", options={"charset":"utf8mb4", "collation":"utf8mb4_unicode_ci"})
22+
* @ORM\Column(type="text")
2323
*/
2424
protected ?string $value = null;
2525

app/config/ci.local.neon

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22

3-
dbal:
3+
nettrine.dbal:
44
connection:
55
host: mysql-test
66
driver: mysqli

app/config/common.neon

+22-17
Original file line numberDiff line numberDiff line change
@@ -216,19 +216,21 @@ extensions:
216216
# Console
217217
console: Contributte\Console\DI\ConsoleExtension(%consoleMode%)
218218

219-
# DBAL
220-
dbal: Nettrine\DBAL\DI\DbalExtension
221-
dbal.console: Nettrine\DBAL\DI\DbalConsoleExtension
222-
223-
# Cache
219+
# Common
220+
nettrine.annotations: Nettrine\Annotations\DI\AnnotationsExtension
224221
nettrine.cache: Nettrine\Cache\DI\CacheExtension
222+
nettrine.migrations: Nettrine\Migrations\DI\MigrationsExtension
223+
224+
# DBAL
225+
nettrine.dbal: Nettrine\DBAL\DI\DbalExtension
226+
nettrine.dbal.console: Nettrine\DBAL\DI\DbalConsoleExtension
225227

226228
# ORM
227-
orm: Nettrine\ORM\DI\OrmExtension
228-
orm.annotations: Nettrine\ORM\DI\OrmAnnotationsExtension
229-
orm.console: Nettrine\ORM\DI\OrmConsoleExtension
229+
nettrine.orm: Nettrine\ORM\DI\OrmExtension
230+
nettrine.orm.cache: Nettrine\ORM\DI\OrmCacheExtension
231+
nettrine.orm.console: Nettrine\ORM\DI\OrmConsoleExtension(%consoleMode%)
232+
nettrine.orm.annotations: Nettrine\ORM\DI\OrmAnnotationsExtension
230233

231-
migrations: Nettrine\Migrations\DI\MigrationsExtension
232234
webloader: WebLoader\Nette\Extension
233235
skautis: Skautis\Nette\SkautisExtension
234236
translation: Contributte\Translation\DI\TranslationExtension
@@ -240,23 +242,25 @@ console:
240242
autoExit: true
241243
lazy: false
242244

243-
dbal:
245+
nettrine.dbal:
244246
debug:
245247
panel: %debugMode%
246248
connection:
247-
charset: UTF8
249+
charset: utf8mb4
250+
default_table_options:
251+
charset: utf8mb4
252+
collate: utf8mb4_unicode_ci
248253

249-
orm:
254+
nettrine.orm:
250255
configuration:
251256
customStringFunctions:
252257
regexp: DoctrineExtensions\Query\Mysql\Regexp
253258

254-
orm.annotations:
255-
debug: %debugMode%
256-
paths:
257-
- %appDir%/Model
259+
nettrine.orm.annotations:
260+
mapping:
261+
App\Model: %appDir%/Model
258262

259-
migrations:
263+
nettrine.migrations:
260264
directory: %appDir%/../migrations
261265

262266
mailing:
@@ -267,6 +271,7 @@ translation:
267271
locales:
268272
whitelist: [cs]
269273
default: cs
274+
fallback: [cs]
270275
dirs:
271276
- %appDir%/lang
272277

app/config/production.local.neon

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22

3-
dbal:
3+
nettrine.dbal:
44
connection:
55
host: "__CONFIG_DATABASE_HOST__"
66
driver: mysqli

app/config/sample.local.neon

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
parameters:
22

3-
dbal:
3+
nettrine.dbal:
44
connection:
55
host: localhost
66
driver: mysqli

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
"require": {
1212
"php": ">=7.4",
13+
"ext-bcmath": "*",
1314
"ext-iconv": "*",
1415
"ext-json": "*",
1516
"ext-mysqli": "*",
@@ -26,15 +27,14 @@
2627
"nette/mail": "^3.1",
2728
"nette/robot-loader": "^3.2",
2829
"nette/security": "^3.0",
29-
"nette/utils": "^3.0",
30+
"nette/utils": "^3.1",
3031
"latte/latte": "^2.8",
3132
"tracy/tracy": "^2.7",
3233

33-
"contributte/console": "^0.7",
34-
"contributte/translation": "0.4.1",
34+
"contributte/console": "^0.8",
35+
"contributte/translation": "0.7",
3536

36-
"nettrine/orm": "^0.4",
37-
"nettrine/cache": "^0.1",
37+
"nettrine/orm": "^0.7",
3838
"nettrine/migrations": "^0.6",
3939
"beberlei/doctrineextensions": "^1.2",
4040
"doctrine/common": "<3.0.0",

0 commit comments

Comments
 (0)