Skip to content

Commit 295663e

Browse files
authored
Merge branch '3.x' into fix/browser-params
2 parents 110c7d8 + 541a8a7 commit 295663e

File tree

185 files changed

+1018
-850
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+1018
-850
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
fail-fast: false
6666
matrix:
6767
os: [ubuntu-latest]
68-
php: [8.3, 8.2, 8.1]
69-
laravel: [10.*, 11.*]
68+
php: [8.4, 8.3, 8.2, 8.1]
69+
laravel: [10.*, 11.*, 12.*]
7070
dbal: [3.*, 4.*]
7171
exclude:
7272
- laravel: 10.*
@@ -75,11 +75,15 @@ jobs:
7575
php: 8.1
7676
- laravel: 11.*
7777
dbal: 3.*
78+
- laravel: 12.*
79+
php: 8.1
7880
include:
7981
- laravel: 10.*
8082
testbench: 8.*
8183
- laravel: 11.*
8284
testbench: 9.*
85+
- laravel: 12.*
86+
testbench: 10.*
8387

8488
steps:
8589
- name: Set timezone?

.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@
110110
'phpdoc_types' => true,
111111
'phpdoc_var_without_name' => true,
112112
'short_scalar_cast' => true,
113+
'nullable_type_declaration_for_default_null_value' => true,
113114
'simplified_null_return' => false, // disabled by Shift
114115
'single_blank_line_at_eof' => true,
115-
'single_blank_line_before_namespace' => true,
116116
'single_class_element_per_statement' => true, // here
117117
'single_import_per_statement' => true,
118118
'single_line_after_imports' => true,

composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
"php": "^8.0",
2727
"ext-json": "*",
2828
"ext-pdo": "*",
29-
"astrotomic/laravel-translatable": "^v11.12",
30-
"cartalyst/tags": "^12.0 || ^13.0 || ^14.0",
29+
"astrotomic/laravel-translatable": "^v11.16",
30+
"cartalyst/tags": "^12.0 || ^13.0 || ^14.0 || ^15.0",
3131
"doctrine/dbal": "^3.0 || ^4.0",
3232
"guzzlehttp/guzzle": "^7.0",
3333
"imgix/imgix-php": "^3.0",
3434
"kalnoy/nestedset": "^6.0",
35-
"laravel/framework": "^9.0 || ^10.0 || ^11.0",
35+
"laravel/framework": "^9.0 || ^10.0 || ^11.0 || ^12.0",
3636
"laravel/socialite": "^5.3",
3737
"laravel/ui": "^4.0",
3838
"league/flysystem-aws-s3-v3": "^3.0",
@@ -48,14 +48,14 @@
4848
"area17/phptorch": "dev-main",
4949
"chillerlan/php-qrcode": "~4.0",
5050
"friendsofphp/php-cs-fixer": "^3.0",
51-
"larastan/larastan": "^2.9",
51+
"larastan/larastan": "^2.9 | ^3.0",
5252
"nette/php-generator": "^4.0.3",
5353
"nunomaduro/collision": "^6.0 || ^7.0 || ^8.0",
54-
"orchestra/testbench": "^7.8 || ^8.0 || ^9.0",
55-
"orchestra/testbench-dusk": "^7.8 || ^8.0 || ^9.0",
56-
"phpunit/php-invoker": "^3.1 || ^4.0",
57-
"phpunit/phpunit": "~9.0 || ~10.0",
58-
"rector/rector": "^0.19.2 || ^1.0 ",
54+
"orchestra/testbench": "^7.8 || ^8.0 || ^9.0 || ^10.0",
55+
"orchestra/testbench-dusk": "^7.8 || ^8.0 || ^9.0 || ^10.0",
56+
"phpunit/php-invoker": "^3.1 || ^4.0 || ^5.0",
57+
"phpunit/phpunit": "~9.0 || ~10.0 || ~11.0",
58+
"rector/rector": "^0.19.2 || ^1.0 || ^2.0",
5959
"spatie/invade": "^1.1",
6060
"squizlabs/php_codesniffer": "*"
6161
},

docs/content/1_docs/4_form-fields/11_repeater.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,32 @@ class ProjectController extends BaseModuleController
161161
]);
162162
}
163163
}
164+
```
165+
### Medias
166+
167+
If your json repeater contains media formField, you need to define the
168+
`mediasParams` at `config/twill.php` under `repeaters.crops` or `block_editor.crops`.
169+
170+
```
171+
'repeaters' => [
172+
'crops' => [
173+
‘your-media-field-name’ => [
174+
175+
]
176+
],
177+
]
178+
```
179+
180+
OR
181+
```
182+
'block_editor' => [
183+
'crops' => [
184+
‘your-media-field-name’ => [
185+
186+
]
187+
],
188+
]
189+
164190
```
165191

166192
| Option | Description | Type | Default value |

0 commit comments

Comments
 (0)