diff --git a/README.md b/README.md index 65abe97..7ca8f2f 100644 --- a/README.md +++ b/README.md @@ -38,22 +38,6 @@ composer require p3k/xray You can also [download a release](https://github.com/aaronpk/XRay/releases) which is a zip file with all dependencies already installed. -**Note** XRay uses the HTMLPurifier library, which is in the process of updating to support newer PHP versions. Until they release an update beyond `v4.9.3`, you will need to add the following to your `composer.json` file in order to tell your project it's okay to install the dev-master version: - -```json -{ - "require": { - "ezyang/htmlpurifier": "dev-master#6d6d88512a8146939a9161bb03e95e3e97840439@dev" - }, - "repositories": [ - { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git" - } - ] -} -``` - ### Parsing ```php diff --git a/composer.json b/composer.json index 262b04c..768e988 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "description": "X-Ray returns structured data from any URL", "require": { "mf2/mf2": "^0.3.2", - "ezyang/htmlpurifier": "dev-master#6d6d88512a8146939a9161bb03e95e3e97840439@dev", + "ezyang/htmlpurifier": "4.10.*", "indieweb/link-rel-parser": "0.1.*", "dg/twitter-php": "3.6.*", "p3k/timezone": "*", @@ -38,11 +38,5 @@ "controllers/Feeds.php", "controllers/Certbot.php" ] - }, - "repositories": [ - { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git" - } - ] + } } diff --git a/composer.lock b/composer.lock index 8cfae22..80519c6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "bcdd53e30f9960f6b39b0aa2c74d5457", + "content-hash": "59d3e49509e8de79d4f07f04d2259a4c", "packages": [ { "name": "cebe/markdown", @@ -110,11 +110,17 @@ }, { "name": "ezyang/htmlpurifier", - "version": "dev-master", + "version": "v4.10.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "6d6d88512a8146939a9161bb03e95e3e97840439" + "reference": "d85d39da4576a6934b72480be6978fb10c860021" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d85d39da4576a6934b72480be6978fb10c860021", + "reference": "d85d39da4576a6934b72480be6978fb10c860021", + "shasum": "" }, "require": { "php": ">=5.2" @@ -131,6 +137,7 @@ "library/HTMLPurifier.composer.php" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL" ], @@ -146,7 +153,7 @@ "keywords": [ "html" ], - "time": "2017-12-30T05:23:44+00:00" + "time": "2018-02-23T01:58:20+00:00" }, { "name": "facebook/graph-sdk", @@ -2082,9 +2089,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "ezyang/htmlpurifier": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [],