From 8b199e5385a612efcd00a825ce03bd9c9460ea05 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Tue, 13 Mar 2018 16:41:43 -0700 Subject: [PATCH] switch back to main mf2 parser --- composer.json | 11 ++--------- composer.lock | 19 +++++++++---------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index e4500e3..380061b 100644 --- a/composer.json +++ b/composer.json @@ -5,7 +5,7 @@ "homepage": "https://github.com/aaronpk/XRay", "description": "X-Ray returns structured data from any URL", "require": { - "mf2/mf2": "0.4.0-alpha", + "mf2/mf2": ">=0.4.0", "ezyang/htmlpurifier": "4.10.*", "indieweb/link-rel-parser": "0.1.*", "dg/twitter-php": "3.6.*", @@ -38,12 +38,5 @@ "controllers/Feeds.php", "controllers/Certbot.php" ] - }, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/aaronpk/php-mf2.git", - "no-api": true - } - ] + } } diff --git a/composer.lock b/composer.lock index 1ccd6f5..873b62a 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": "ebd195e5bf9ff15a29795d27641cce90", + "content-hash": "60f545028d44eb8e15c499fbe7ecf4d0", "packages": [ { "name": "cebe/markdown", @@ -261,16 +261,16 @@ }, { "name": "mf2/mf2", - "version": "v0.4.0-alpha", + "version": "v0.4.0", "source": { "type": "git", - "url": "https://github.com/aaronpk/php-mf2.git", - "reference": "5cbfdd4a1075b5113f2a1f4a1d6b8d7c86b93acb" + "url": "https://github.com/indieweb/php-mf2.git", + "reference": "42ef6eb9777bffe654a70cbbc1dbd777a61c1445" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aaronpk/php-mf2/zipball/5cbfdd4a1075b5113f2a1f4a1d6b8d7c86b93acb", - "reference": "5cbfdd4a1075b5113f2a1f4a1d6b8d7c86b93acb", + "url": "https://api.github.com/repos/indieweb/php-mf2/zipball/42ef6eb9777bffe654a70cbbc1dbd777a61c1445", + "reference": "42ef6eb9777bffe654a70cbbc1dbd777a61c1445", "shasum": "" }, "require": { @@ -294,6 +294,7 @@ "Mf2/Parser.php" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "CC0-1.0" ], @@ -311,7 +312,7 @@ "parser", "semantic" ], - "time": "2018-03-08T13:43:49+00:00" + "time": "2018-03-13T23:33:15+00:00" }, { "name": "p3k/http", @@ -2088,9 +2089,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "mf2/mf2": 15 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [],