From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Wed, 27 Mar 2019 19:30:19 +0000 (+0100)
Subject: Merge branch '3.0'
X-Git-Tag: 3.1.9~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=adc49f9c3799ce5889fa87960210726b2db0e186;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '3.0'
---

adc49f9c3799ce5889fa87960210726b2db0e186
diff --cc wcfsetup/install/files/lib/system/api/composer.json
index 123e436868,0db9587920..bdf84f200f
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@@ -5,10 -5,8 +5,10 @@@
      },
      "require": {
          "ezyang/htmlpurifier": "4.9.*",
-         "erusev/parsedown": "1.6.*",
+         "erusev/parsedown": "1.7.*",
          "pelago/emogrifier": "1.2.*",
 +        "chrisjean/php-ico": "1.0.*",
 +        "true/punycode": "~2.0",
          "pear/net_idna2": "^0.2.0"
      }
  }
diff --cc wcfsetup/install/files/lib/system/api/composer.lock
index 64b3200999,fee6a466ee..fbb68c7c11
--- a/wcfsetup/install/files/lib/system/api/composer.lock
+++ b/wcfsetup/install/files/lib/system/api/composer.lock
@@@ -4,54 -4,11 +4,54 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "31e86ed529e8ffb1ad5f5525e39fc2f5",
 -    "content-hash": "55c7b0c13709c1a852a543b58031d056",
++    "content-hash": "5bfe3a3e87123035f9549110cdc90342",
      "packages": [
 +        {
 +            "name": "chrisjean/php-ico",
 +            "version": "1.0.4",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/chrisbliss18/php-ico.git",
 +                "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/chrisbliss18/php-ico/zipball/ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6",
 +                "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "ext-gd": "*",
 +                "php": ">=5.2.4"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "classmap": [
 +                    "class-php-ico.php"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "GPL-2.0+"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Chris Jean",
 +                    "homepage": "https://chrisjean.com",
 +                    "role": "Developer"
 +                }
 +            ],
 +            "description": "An easy-to-use library to generate valid ICO files.",
 +            "homepage": "https://github.com/chrisbliss18/php-ico",
 +            "keywords": [
 +                "favicon",
 +                "ico"
 +            ],
 +            "time": "2016-09-27T22:00:56+00:00"
 +        },
          {
              "name": "erusev/parsedown",
-             "version": "1.6.4",
+             "version": "v1.7.2",
              "source": {
                  "type": "git",
                  "url": "https://github.com/erusev/parsedown.git",
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.json
index ffa6faee44,23ff312d88..90f76fc961
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@@ -1,53 -1,8 +1,53 @@@
  [
 +    {
 +        "name": "chrisjean/php-ico",
 +        "version": "1.0.4",
 +        "version_normalized": "1.0.4.0",
 +        "source": {
 +            "type": "git",
 +            "url": "https://github.com/chrisbliss18/php-ico.git",
 +            "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6"
 +        },
 +        "dist": {
 +            "type": "zip",
 +            "url": "https://api.github.com/repos/chrisbliss18/php-ico/zipball/ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6",
 +            "reference": "ccd5c0d56554f3ddcd7a823e695be83e0d1e43b6",
 +            "shasum": ""
 +        },
 +        "require": {
 +            "ext-gd": "*",
 +            "php": ">=5.2.4"
 +        },
 +        "time": "2016-09-27T22:00:56+00:00",
 +        "type": "library",
 +        "installation-source": "dist",
 +        "autoload": {
 +            "classmap": [
 +                "class-php-ico.php"
 +            ]
 +        },
 +        "notification-url": "https://packagist.org/downloads/",
 +        "license": [
 +            "GPL-2.0+"
 +        ],
 +        "authors": [
 +            {
 +                "name": "Chris Jean",
 +                "homepage": "https://chrisjean.com",
 +                "role": "Developer"
 +            }
 +        ],
 +        "description": "An easy-to-use library to generate valid ICO files.",
 +        "homepage": "https://github.com/chrisbliss18/php-ico",
 +        "keywords": [
 +            "favicon",
 +            "ico"
 +        ]
 +    },
      {
          "name": "erusev/parsedown",
-         "version": "1.6.4",
-         "version_normalized": "1.6.4.0",
+         "version": "v1.7.2",
+         "version_normalized": "1.7.2.0",
          "source": {
              "type": "git",
              "url": "https://github.com/erusev/parsedown.git",