Skip to content

Commit bc12687

Browse files
aweichleraweichler
authored
Merge branch 'pimcore:5.x' into 5.x
2 parents 9294c62 + 868867c commit bc12687

File tree

4 files changed

+29
-31
lines changed

4 files changed

+29
-31
lines changed

‎.github/workflows/static-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- { php-version: "8.2", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", phpstan_args: "", experimental: true }
2323
steps:
2424
- name: "Checkout code"
25-
uses: "actions/checkout@v2"
25+
uses: "actions/checkout@v4"
2626

2727
- name: "Install PHP"
2828
uses: "shivammathur/setup-php@v2"
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: "Upload baseline file"
5858
if: ${{ failure() }}
59-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v4
6060
with:
6161
name: phpstan-baseline.neon
6262
path: phpstan-baseline.neon

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"license": "GPL-3.0+",
44
"type": "pimcore-bundle",
55
"require": {
6-
"pimcore/pimcore": "^11.0",
6+
"pimcore/pimcore": "^11.2",
77
"symfony/config": "^6.2",
88
"symfony/dependency-injection": "^6.2",
99
"symfony/event-dispatcher": "^6.2",
1010
"symfony/event-dispatcher-contracts": "^3.0",
11-
"symfony/http-foundation": "^6.2",
11+
"symfony/http-foundation": "^6.3",
1212
"symfony/http-kernel": "^6.2",
1313
"symfony/routing": "^6.2",
1414
"symfony/templating": "^6.2"

‎src/Controller/AdminController.php‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static function getSubscribedServices(): array
7272
*/
7373
public function initializeAction(Request $request, EventDispatcherInterface $eventDispatcher)
7474
{
75-
$objectId = $request->get('id');
75+
$objectId = $request->query->getInt('id');
7676
$object = AbstractObject::getById($objectId);
7777

7878
if (!$object) {
@@ -104,7 +104,7 @@ public function getOutputConfigsAction(Request $request)
104104
Service::initChannelsForRootobject();
105105
$channels = Service::getChannels();
106106

107-
$objectId = $request->get('object_id');
107+
$objectId = $request->request->getInt('object_id');
108108
$object = AbstractObject::getById($objectId);
109109

110110
$classList = $this->getFilteredClassDefinitionList($request);
@@ -166,7 +166,7 @@ private function getOutputDefinitionForObjectAndChannel($object, $classId, $chan
166166
public function resetOutputConfigAction(Request $request)
167167
{
168168
try {
169-
$config = OutputDefinition::getById($request->get('config_id'));
169+
$config = OutputDefinition::getById($request->query->getInt('config_id'));
170170
$config->delete();
171171

172172
return $this->jsonResponse(['success' => true]);
@@ -187,7 +187,7 @@ public function resetOutputConfigAction(Request $request)
187187
public function getOutputConfigAction(Request $request)
188188
{
189189
try {
190-
$config = OutputDefinition::getById($request->get('config_id'));
190+
$config = OutputDefinition::getById($request->query->getInt('config_id'));
191191

192192
$objectClass = ClassDefinition::getById($config->getClassId());
193193
$configuration = json_decode($config->getConfiguration());
@@ -213,19 +213,17 @@ public function getOutputConfigAction(Request $request)
213213
public function getOrCreateOutputConfigAction(Request $request)
214214
{
215215
try {
216-
$config = OutputDefinition::getById($request->get('config_id'));
216+
$config = OutputDefinition::getById($request->query->getInt('config_id'));
217217
$class = null;
218218
if (!$config) {
219-
if (is_numeric($request->get('class_id'))) {
220-
$class = ClassDefinition::getById($request->get('class_id'));
221-
} else {
222-
$class = ClassDefinition::getByName($request->get('class_id'));
219+
if ($request->query->has('class_id')) {
220+
$class = ClassDefinition::getByName($request->query->getString('class_id'));
223221
}
224222
if (!$class) {
225-
throw new \Exception('Class ' . $request->get('class_id') . ' not found.');
223+
throw new \Exception('Class ' . $request->query->getString('class_id') . ' not found.');
226224
}
227225

228-
$config = OutputDefinition::getByObjectIdClassIdChannel($request->get('objectId'), $class->getId(), $request->get('channel'));
226+
$config = OutputDefinition::getByObjectIdClassIdChannel($request->query->getInt('objectId'), $class->getId(), $request->query->getString('channel'));
229227
}
230228

231229
if ($config) {
@@ -237,9 +235,9 @@ public function getOrCreateOutputConfigAction(Request $request)
237235
return $this->jsonResponse(['success' => true, 'outputConfig' => $config]);
238236
} else {
239237
$config = new OutputDefinition();
240-
$config->setChannel($request->get('channel'));
238+
$config->setChannel($request->query->getString('channel'));
241239
$config->setClassId($class->getId());
242-
$config->setObjectId($request->get('objectId'));
240+
$config->setObjectId($request->query->getInt('objectId'));
243241
$config->save();
244242

245243
return $this->jsonResponse(['success' => true, 'outputConfig' => $config]);
@@ -314,8 +312,8 @@ private function sortAttributes(array &$attributes)
314312
*/
315313
public function getAttributeLabelsAction(Request $request)
316314
{
317-
$configration = json_decode($request->get('configuration'));
318-
$class = ClassDefinition::getById($request->get('classId'));
315+
$configration = json_decode($request->request->getString('configuration'));
316+
$class = ClassDefinition::getById($request->request->getString('classId'));
319317

320318
$configration = $this->doGetAttributeLabels($configration, $class);
321319

@@ -403,8 +401,8 @@ private function getFieldDefinition($attributeName, $objectClass)
403401
public function getFieldDefinitionAction(Request $request)
404402
{
405403
try {
406-
$objectClass = ClassDefinition::getById($request->get('class_id'));
407-
$def = $this->getFieldDefinition($request->get('key'), $objectClass);
404+
$objectClass = ClassDefinition::getById($request->query->getString('class_id'));
405+
$def = $this->getFieldDefinition($request->query->getString('key'), $objectClass);
408406

409407
return $this->jsonResponse(['success' => true, 'fieldDefinition' => $def]);
410408
} catch (\Exception $e) {
@@ -423,21 +421,21 @@ public function getFieldDefinitionAction(Request $request)
423421
public function saveOutputConfigAction(Request $request, EventDispatcherInterface $eventDispatcher)
424422
{
425423
try {
426-
$config = OutputDefinition::getById($request->get('config_id'));
424+
$config = OutputDefinition::getById($request->request->getInt('config_id'));
427425

428-
$object = AbstractObject::getById($request->get('object_id'));
426+
$object = AbstractObject::getById($request->request->getInt('object_id'));
429427
if (empty($object)) {
430-
throw new \Exception('Data Object with ID' . $request->get('object_id') . ' not found.');
428+
throw new \Exception('Data Object with ID' . $request->request->getInt('object_id') . ' not found.');
431429
}
432-
if ($config->getObjectId() != $request->get('object_id')) {
430+
if ($config->getObjectId() != $request->request->getInt('object_id')) {
433431
$newConfig = new OutputDefinition();
434432
$newConfig->setChannel($config->getChannel());
435433
$newConfig->setClassId($config->getClassId());
436434
$newConfig->setObjectId($object->getId());
437435
$config = $newConfig;
438436
}
439437

440-
$configJson = $request->get('config');
438+
$configJson = $request->request->getString('config');
441439
$config->setConfiguration($configJson);
442440

443441
$event = new SaveConfigEvent($config);
@@ -469,8 +467,8 @@ private function getFilteredClassDefinitionList(Request $request): ClassDefiniti
469467
{
470468
$classList = new ClassDefinition\Listing();
471469

472-
if ($request->get('class_id')) {
473-
$classList->setCondition('id = ?', $request->get('class_id'));
470+
if ($request->request->has('class_id')) {
471+
$classList->setCondition('id = ?', $request->request->getString('class_id'));
474472
} elseif (!empty($this->defaultGridClasses)) {
475473
$allowedClassIds = [];
476474
foreach ($this->defaultGridClasses as $allowedClass) {

‎src/Controller/ClassController.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class ClassController extends UserAwareController
5656
*/
5757
public function getClassDefinitionForColumnConfigAction(Request $request, EventDispatcherInterface $eventDispatcher, FactoryInterface $factory)
5858
{
59-
$classId = $request->get('id');
59+
$classId = $request->query->getString('id');
6060
$class = DataObject\ClassDefinition::getById($classId);
61-
$objectId = intval($request->get('oid'));
61+
$objectId = $request->query->getInt('oid');
6262

6363
$filteredDefinitions = DataObject\Service::getCustomLayoutDefinitionForGridColumnConfig($class, $objectId);
6464

@@ -131,7 +131,7 @@ private function considerClassificationStoreForColumnConfig(Request $request, ?D
131131
$enrichment = false;
132132
$grouped = $this->getClassificationGroupedDisplay();
133133
if ($displayMode == ColumnConfigDisplayMode::DATA_OBJECT || $displayMode == ColumnConfigDisplayMode::RELEVANT) {
134-
$targetObjectId = $request->get('target_oid');
134+
$targetObjectId = $request->query->getInt('target_oid');
135135

136136
if ($targetObject = DataObject\Concrete::getById($targetObjectId)) {
137137
$class->setFieldDefinitions($fieldDefinitions);

0 commit comments

Comments
 (0)