Merge branch 'release/2.0.3'

Rudloff · Jun 17, 2019 · 2c3f357 · 2c3f357
2 parents b139e6e + e8afbd1
commit 2c3f357
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 276 deletions.
diff --git a/classes/Config.php b/classes/Config.php
@@ -177,7 +177,9 @@ private function replaceGenericFormat($oldFormat, $newFormat)
     {
         $keys = array_keys($this->genericFormats);
         $keys[array_search($oldFormat, $keys)] = $newFormat;
-        $this->genericFormats = array_combine($keys, $this->genericFormats);
+        if ($genericFormats = array_combine($keys, $this->genericFormats)) {
+            $this->genericFormats = $genericFormats;
+        }
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -92,5 +92,10 @@
       "xgettext --omit-header -j -o i18n/template.pot classes/* controllers/*"
     ],
     "youtube-dl": "vendor/rg3/youtube-dl/youtube_dl/__main__.py"
+  },
+  "config": {
+    "platform": {
+      "php": "7.0.33"
+    }
   }
 }