Merge remote-tracking branch 'origin/10.5' into 10.6

# Conflicts: # composer.json
michalananapps · Feb 17, 2023 · a16e65e · a16e65e
2 parents 860621c + 517aa44
commit a16e65e
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 15 deletions.
diff --git a/.github/workflows/monthly-recurring-issues.yml b/.github/workflows/monthly-recurring-issues.yml
@@ -0,0 +1,25 @@
+name: Monthly Recurring Issues
+on:
+    workflow_dispatch:
+    schedule:
+        - cron: 0 4 1 * *
+
+jobs:
+    monthly_recurring_issues:
+        name: Monthly Recurring Issues
+        runs-on: ubuntu-latest
+        steps:
+
+            - name: Get current month
+              run: echo "MONTH=$(date '+%B')" >> $GITHUB_ENV
+
+            - name: PhpStan Version Upgrade
+              uses: imjohnbo/issue-bot@v3
+              with:
+                  labels: "Task"
+                  title: PhpStan Version Upgrade ${{ env.MONTH }}
+                  body: |-
+                      Please check for a newer PhpStan version. 
+                      Create a PR with the latest version and fix all occurring issues :-)
+                  project-v2-path: orgs/pimcore/projects/10
+                  token: ${{ secrets.ISSUE_CREATION_TOKEN }}
diff --git a/bundles/AdminBundle/Controller/Admin/Asset/AssetController.php b/bundles/AdminBundle/Controller/Admin/Asset/AssetController.php
@@ -2347,7 +2347,7 @@ public function importZipFilesAction(Request $request)
             for ($i = $offset; $i < ($offset + $limit); $i++) {
                 $path = $zip->getNameIndex($i);
 
-                if (str_starts_with($path, '__MACOSX/')) {
+                if (str_starts_with($path, '__MACOSX/') || $path === 'Thumbs.db') {
                     continue;
                 }
 

diff --git a/composer.json b/composer.json
@@ -175,7 +175,7 @@
     "codeception/module-symfony": "^1.6.0",
     "codeception/phpunit-wrapper": "^9",
     "pimcore/elasticsearch-client": "^1.0.0",
-    "phpstan/phpstan": "^1.9.5",
+    "phpstan/phpstan": "1.9.17",
     "phpstan/phpstan-symfony": "^1.2.19",
     "phpunit/phpunit": "^9.3",
     "spiritix/php-chrome-html2pdf": "^1.6",

diff --git a/...ex_Service/01_Product_Index_Configuration/03_Assortment_Tenant_Configuration.md b/...ex_Service/01_Product_Index_Configuration/03_Assortment_Tenant_Configuration.md
@@ -13,7 +13,7 @@ The E-Commerce Framework provides a two level Assortment Tenant system for the P
 One system can have multiple tenants (heavy- and light-weight). But too many tenants can have bad effects on the performance 
 of saving products, since all *Product Indices* need to be updated on every save. 
 
-By default the system always uses one heavy-weight tenant (= `DefaultMysql`), but the default tenant can be disabled. 
+By default the system always uses one heavy-weight tenant (which is `DefaultMysql`), but the default tenant can be disabled. 
 
 
 ## Assortment Tenants
@@ -40,7 +40,7 @@ attributes. Depending on the *Product Index* implementation, additional configur
 
 - **Declare the service:**
 You need to declare the service as well so the class can be used. On your service configuration or for instance at the top of the ecommerce configuration file:
-```
+```yaml
 services:
     MyBundle\Service\MySubtenantConfig:
         calls:
@@ -146,7 +146,7 @@ In order to populate the additional mapping data, also following methods have to
      *
      * @return mixed $subTenantData
      */
-    public function prepareSubTenantEntries(IIndexable $object, $subObjectId = null);
+    public function prepareSubTenantEntries(IndexableInterface $object, $subObjectId = null);
 
     /**
      * populates index for tenant relations based on given data
@@ -176,7 +176,7 @@ In order to populate the additional mapping data, the following method has to be
      *
      * @return array $subTenantData
      */
-    public function prepareSubTenantEntries(IIndexable $object, $subObjectId = null);
+    public function prepareSubTenantEntries(IndexableInterface $object, $subObjectId = null);
 
 ```
 

diff --git a/lib/Web2Print/Processor/HeadlessChrome.php b/lib/Web2Print/Processor/HeadlessChrome.php
@@ -113,8 +113,8 @@ public function getPdfFromString($html, $params = [], $returnFilePath = false)
         $converter = new Converter($input, $output);
         if ($this->nodePath) {
             $converter->setNodePath($this->nodePath);
-        } else {
-            $converter->setNodePath(Console::getExecutable('node'));
+        } elseif ($nodePath = Console::getExecutable('node')) {
+            $converter->setNodePath($nodePath);
         }
         $converter->setOptions($params);
 

diff --git a/models/DataObject/Objectbrick/Definition.php b/models/DataObject/Objectbrick/Definition.php
@@ -137,13 +137,15 @@ private function checkTablenames()
             }
         }
 
-        $tablesLen = array_map('strlen', $tables);
-        array_multisort($tablesLen, $tables);
-        $longestTablename = end($tables);
-
-        $length = strlen($longestTablename);
-        if ($length > 64) {
-            throw new \Exception('table name ' . $longestTablename . ' would be too long. Max length is 64. Current length would be ' .  $length . '.');
+        if ($tables) {
+            $tablesLen = array_map('strlen', $tables);
+            array_multisort($tablesLen, $tables);
+            $longestTablename = end($tables);
+
+            $length = strlen($longestTablename);
+            if ($length > 64) {
+                throw new \Exception('table name ' . $longestTablename . ' would be too long. Max length is 64. Current length would be ' .  $length . '.');
+            }
         }
     }