Merge branch '1.8' into 1.x

SECURITY.md

@@ -2,20 +2,21 @@
 
 ## Reporting a Vulnerability
 
-If you think that you have found a security issue, 
-don’t use the bug tracker and don’t publish it publicly. 
-Instead, all security issues must be reported via 📫 to [security-issue@pimcore.com](mailto:security-issue@pimcore.com).
+If you think that you have found a security issue,
+don’t use the bug tracker and don’t publish it publicly.
+Instead, all security issues must be reported via a private vulnerability report.
+
+Please follow the [instructions](https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability#privately-reporting-a-security-vulnerability) to submit a private report.
 
 
 ## Resolving Process
-Every submitted security issue is handled with top priority by following these steps: 
+Every submitted security issue is handled with top priority by following these steps:
 
 1. Confirm the vulnerability
 2. Determine the severity
 3. Contact reporter
 4. Work on a patch
 5. Get a CVE identification number (may be done by the reporter or a security service provider)
-6. Patch reviewing 
+6. Patch reviewing
 7. Tagging a new release for supported versions
 8. Publish security announcement
-

src/Command/SequentialProcessQueueCommand.php

@@ -75,31 +75,36 @@ protected function execute(InputInterface $input, OutputInterface $output)
             exit(1);
         }
 
-        $itemIds = $this->queueService->getAllQueueEntryIds(ImportProcessingService::EXECUTION_TYPE_SEQUENTIAL);
-        $itemCount = count($itemIds);
+        try {
+            $itemIds = $this->queueService->getAllQueueEntryIds(ImportProcessingService::EXECUTION_TYPE_SEQUENTIAL);
+            $itemCount = count($itemIds);
 
-        $output->writeln("Processing {$itemCount} items sequentially\n");
+            $output->writeln("Processing {$itemCount} items sequentially\n");
 
-        $progressBar = new ProgressBar($output, $itemCount);
-        $progressBar->start();
+            $progressBar = new ProgressBar($output, $itemCount);
+            $progressBar->start();
 
-        foreach ($itemIds as $i => $id) {
-            $this->importProcessingService->processQueueItem($id);
-            $progressBar->advance();
+            foreach ($itemIds as $i => $id) {
+                $this->importProcessingService->processQueueItem($id);
+                $progressBar->advance();
 
-            // call the garbage collector to avoid too many connections & memory issue
-            if (($i + 1) % 200 === 0) {
-                \Pimcore::collectGarbage();
+                // call the garbage collector to avoid too many connections & memory issue
+                if (($i + 1) % 200 === 0) {
+                    \Pimcore::collectGarbage();
+                }
             }
-        }
 
-        $progressBar->finish();
+            $progressBar->finish();
 
-        $this->release(); //release the lock
+            $this->release(); //release the lock
 
-        $output->writeln("\n\nProcessed {$itemCount} items.");
+            $output->writeln("\n\nProcessed {$itemCount} items.");
 
-        return 0;
+            return 0;
+        } catch (\Throwable $t) {
+            $this->release();
+            throw $t;
+        }
     }
 
     /**

src/Mapping/Operator/Simple/Explode.php

@@ -45,6 +45,9 @@ public function setSettings(array $settings): void
      */
     public function process($inputData, bool $dryRun = false)
     {
+        if (empty($inputData)) {
+            return [];
+        }
         if (!empty($this->delimiter)) {
             if (is_array($inputData)) {
                 $explodedArray = [];