[Security] Upgrading to ^2.2 (#677)

* Upgrading to ^2.2 * Apply php-cs-fixer changes --------- Co-authored-by: mattamon <mattamon@users.noreply.github.com>
pimcore · Sep 2, 2024 · 28f6e32 · 28f6e32
1 parent dd2ad6a
commit 28f6e32
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
   "require": {
     "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
     "cbschuld/browser.php": "^1.9.6",
-    "phpoffice/phpspreadsheet": "^1.24 || ^2.1",
+    "phpoffice/phpspreadsheet": "^1.24 || ^2.2",
     "pimcore/pimcore": "~11.3.1",
     "symfony/webpack-encore-bundle": "^1.13.2"
   },

diff --git a/src/Controller/Admin/DataObject/DataObjectController.php b/src/Controller/Admin/DataObject/DataObjectController.php
@@ -410,7 +410,7 @@ static function (Task $task) {
 
             try {
                 $this->getDataForObject($object, $objectFromVersion);
-            } catch(\Throwable $e) {
+            } catch (\Throwable $e) {
                 $object = $objectFromDatabase;
                 $this->getDataForObject($object, false);
             }
@@ -1352,7 +1352,7 @@ public function saveAction(Request $request): JsonResponse
         if ($request->get('data')) {
             try {
                 $this->applyChanges($object, $this->decodeJson($request->get('data')));
-            } catch(\Throwable $e) {
+            } catch (\Throwable $e) {
                 $this->applyChanges($objectFromDatabase, $this->decodeJson($request->get('data')));
             }
         }

diff --git a/src/Controller/Admin/DataObject/DataObjectHelperController.php b/src/Controller/Admin/DataObject/DataObjectHelperController.php
@@ -317,7 +317,7 @@ public function doGetGridColumnConfig(Request $request, Config $config, bool $is
                 $setAsFavourite = $savedGridConfig->isSetAsFavourite();
                 $saveFilters = $savedGridConfig->isSaveFilters();
 
-                foreach($gridConfig['columns'] as &$column) {
+                foreach ($gridConfig['columns'] as &$column) {
                     if (array_key_exists('isOperator', $column) && $column['isOperator']) {
                         $colAttributes = &$column['fieldConfig']['attributes'];
                         SecurityHelper::convertHtmlSpecialCharsArrayKeys($colAttributes, ['label', 'attribute', 'param1']);
@@ -1184,7 +1184,7 @@ public function getExportJobsAction(Request $request, GridHelperService $gridHel
         //prepare fields
         $fieldnames = [];
         $fields = json_decode($allParams['fields'][0], true);
-        foreach($fields as $field) {
+        foreach ($fields as $field) {
             $fieldnames[] = $field['key'];
         }
         $allParams['fields'] = $fieldnames;

diff --git a/src/Controller/Admin/ElementController.php b/src/Controller/Admin/ElementController.php
@@ -703,7 +703,7 @@ public function getRequiresDependenciesAction(Request $request): JsonResponse
                     'requires' => [],  // Initialize 'requires' as an empty array
                 ];
 
-                if(count($elements) > 0) {
+                if (count($elements) > 0) {
                     $result = Model\Element\Service::getFilterRequiresForFrontend($elements);
                     $result['total'] = count($result['requires']);
 
@@ -765,7 +765,7 @@ public function getRequiredByDependenciesAction(Request $request): JsonResponse
                     'requiredBy' => [], // Initialize 'requiredBy' as an empty array
                 ];
 
-                if(count($elements) > 0) {
+                if (count($elements) > 0) {
                     $result = Model\Element\Service::getFilterRequiredByPathForFrontend($elements);
                     $result['total'] = count($result['requiredBy']);
 

diff --git a/src/Controller/Admin/MiscController.php b/src/Controller/Admin/MiscController.php
@@ -129,7 +129,7 @@ public function jsonTranslationsSystemAction(Request $request, TranslatorInterfa
     public function scriptProxyAction(Request $request): Response
     {
         $storageFile = $request->get('storageFile');
-        if(!$storageFile) {
+        if (!$storageFile) {
             throw new \InvalidArgumentException('The parameter storageFile is required');
         }
 

diff --git a/src/Controller/Admin/TranslationController.php b/src/Controller/Admin/TranslationController.php
@@ -634,10 +634,10 @@ protected function getGridFilterCondition(Request $request, string $tableName, b
             ];
         }
 
-        if(!empty($conditionFilters)) {
+        if (!empty($conditionFilters)) {
             $conditions = [];
             $params = [];
-            foreach($conditionFilters as $conditionFilter) {
+            foreach ($conditionFilters as $conditionFilter) {
                 $conditions[] = $conditionFilter['condition'];
                 $params[$conditionFilter['field']] = $conditionFilter['value'];
             }

diff --git a/src/Helper/GridHelperService.php b/src/Helper/GridHelperService.php
@@ -699,7 +699,7 @@ public function prepareListingForGrid(array $requestParams, string $requestedLan
             if (isset($requestParams['filter_by_object_type'])) {
                 if ($requestParams['filter_by_object_type'] === 'only_objects') {
                     $list->setObjectTypes([DataObject::OBJECT_TYPE_OBJECT]);
-                } elseif($requestParams['filter_by_object_type'] === 'only_variant_objects') {
+                } elseif ($requestParams['filter_by_object_type'] === 'only_variant_objects') {
                     $list->setObjectTypes([DataObject::OBJECT_TYPE_VARIANT]);
                 }
             }

diff --git a/src/Service/PreviewGenerator.php b/src/Service/PreviewGenerator.php
@@ -115,7 +115,7 @@ protected function getSitePreviewConfig(Concrete $object): array
             $domains = $site->getDomains();
             array_unshift($domains, $site->getMainDomain());
 
-            if(is_null($preSelectedSite) && in_array(Tool::getHostname(), $domains)) {
+            if (is_null($preSelectedSite) && in_array(Tool::getHostname(), $domains)) {
                 $preSelectedSite = $sitesOptions[$label];
             }
         }

diff --git a/src/System/AdminConfig.php b/src/System/AdminConfig.php
@@ -62,7 +62,7 @@ public static function get(): array
 
         // If the read target is settings-store and no data is found there,
         // load the data from the container config
-        if(!$data && $loadType === $repository::LOCATION_SETTINGS_STORE) {
+        if (!$data && $loadType === $repository::LOCATION_SETTINGS_STORE) {
             $containerConfig = \Pimcore::getContainer()->getParameter('pimcore_admin.config');
             $data[self::BRANDING] = $containerConfig[self::BRANDING];
             $data[self::ASSETS] = $containerConfig[self::ASSETS];