Merge branch 'release-1.2.2'

composer.json

@@ -23,7 +23,7 @@
     "phpunit/phpunit": "~6.5.2",
     "doctrine/instantiator": "~1.0.0",
     "ffmpeg/ffmpeg": "4.0.2",
-    "rg3/youtube-dl": "2018.06.02",
+    "rg3/youtube-dl": "2018.09.10",
     "heroku/heroku-buildpack-php": "*",
     "anam/phantomjs-linux-x86-binary": "~2.1.1"
   },
@@ -39,10 +39,10 @@
       "type": "package",
       "package": {
         "name": "rg3/youtube-dl",
-        "version": "2018.06.02",
+        "version": "2018.09.10",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2018.06.02.zip"
+          "url": "https://github.com/rg3/youtube-dl/archive/2018.09.10.zip"
         }
       }
     },

package.json

@@ -1,7 +1,7 @@
 {
   "name": "alltube",
   "description": "HTML GUI for youtube-dl",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "Pierre Rudloff",
   "bugs": "https://github.com/Rudloff/alltube/issues",
   "dependencies": {
@@ -18,7 +18,7 @@
     "grunt-githash": "~0.1.3",
     "grunt-jslint": "~1.1.15",
     "grunt-jsonlint": "~1.1.0",
-    "grunt-markdownlint": "~1.1.2",
+    "grunt-markdownlint": "~2.1.0",
     "grunt-phpcs": "~0.4.0",
     "grunt-phpdocumentor": "~0.4.1",
     "grunt-phpunit": "~0.3.6"

tests/VideoDownloadTest.php

@@ -187,7 +187,7 @@ public function urlProvider()
             ],
             [
                 'http://www.bbc.co.uk/programmes/b039g8p7', 'bestaudio/best',
-                'Leonard_Cohen_Kaleidoscope_-_BBC_Radio_4-b039d07m',
+                'Kaleidoscope_Leonard_Cohen-b039d07m',
                 'flv',
                 'bbcodspdns.fcod.llnwd.net',
             ],

yarn.lock

@@ -741,11 +741,11 @@ grunt-legacy-util@~1.1.1:
     underscore.string "~3.3.4"
     which "~1.3.0"
 
-grunt-markdownlint@~1.1.2:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/grunt-markdownlint/-/grunt-markdownlint-1.1.6.tgz#2a7c89a6949b84cf6141107e2bb3d10e4dbb53da"
+grunt-markdownlint@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/grunt-markdownlint/-/grunt-markdownlint-2.1.0.tgz#8d9b1abeebb588893576c40221acd7c4098e1f37"
   dependencies:
-    markdownlint "^0.10.0"
+    markdownlint "^0.11.0"
 
 grunt-phpcs@~0.4.0:
   version "0.4.0"
@@ -1028,21 +1028,21 @@ map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
 
-markdown-it@8.4.1:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44"
+markdown-it@8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54"
   dependencies:
     argparse "^1.0.7"
     entities "~1.1.1"
     linkify-it "^2.0.0"
     mdurl "^1.0.1"
     uc.micro "^1.0.5"
 
-markdownlint@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.10.0.tgz#ee941ee943f78ff6adbc1ff0fad49365e600b664"
+markdownlint@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.11.0.tgz#3858bbdbc1ab78abf0c098d841c72b63dd3206a0"
   dependencies:
-    markdown-it "8.4.1"
+    markdown-it "8.4.2"
 
 maxmin@^2.1.0:
   version "2.1.0"