From 648a1e4e969ca4484a4aadae0e837644612efcfd Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Mon, 4 Apr 2016 08:38:14 -0700 Subject: [PATCH] use released version of php-mf2 now that it is 0.3 --- composer.json | 10 +---- composer.lock | 114 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 88 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index c5ddab4..751d442 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "require": { "league/plates": "3.*", "league/route": "1.*", - "mf2/mf2": "dev-master#bb02f0ee92de17975da1eec738d75ed0dfb68027", + "mf2/mf2": "~0.3", "ezyang/htmlpurifier": "4.*" }, "autoload": { @@ -21,11 +21,5 @@ "files": [ "lib/HTTPTest.php" ] - }, - "repositories": [ - { - "type": "vcs", - "url": "http://github.com/aaronpk/php-mf2" - } - ] + } } diff --git a/composer.lock b/composer.lock index 889580d..42bf683 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9aca2f5dc097a03c196b7c2b4e771ade", - "content-hash": "ccf2adf6d508929e3d329fe3d2adaaef", + "hash": "76c19995b1b2f77725f5a3cc13022004", + "content-hash": "010ed2acde68ceaa42fb406d3b9bc80e", "packages": [ { "name": "ezyang/htmlpurifier", @@ -263,20 +263,20 @@ }, { "name": "mf2/mf2", - "version": "dev-master", + "version": "v0.3.0", "source": { "type": "git", - "url": "https://github.com/aaronpk/php-mf2.git", - "reference": "bb02f0ee92de17975da1eec738d75ed0dfb68027" + "url": "https://github.com/indieweb/php-mf2.git", + "reference": "4fb2eb5365cbc0fd2e0c26ca748777d6c2539763" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aaronpk/php-mf2/zipball/bb02f0ee92de17975da1eec738d75ed0dfb68027", - "reference": "bb02f0ee92de17975da1eec738d75ed0dfb68027", + "url": "https://api.github.com/repos/indieweb/php-mf2/zipball/4fb2eb5365cbc0fd2e0c26ca748777d6c2539763", + "reference": "4fb2eb5365cbc0fd2e0c26ca748777d6c2539763", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" }, "require-dev": { "phpunit/phpunit": "3.7.*" @@ -312,20 +312,20 @@ "parser", "semantic" ], - "time": "2016-02-29 01:39:53" + "time": "2016-03-14 12:13:34" }, { "name": "nikic/fast-route", - "version": "v0.7.0", + "version": "v0.8.0", "source": { "type": "git", "url": "https://github.com/nikic/FastRoute.git", - "reference": "8164b4a0d8afde4eae5f1bfc39084972ba23ad36" + "reference": "5e1f431ed2afe2be5d2bd97fa69b0e99b9ba45e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/FastRoute/zipball/8164b4a0d8afde4eae5f1bfc39084972ba23ad36", - "reference": "8164b4a0d8afde4eae5f1bfc39084972ba23ad36", + "url": "https://api.github.com/repos/nikic/FastRoute/zipball/5e1f431ed2afe2be5d2bd97fa69b0e99b9ba45e6", + "reference": "5e1f431ed2afe2be5d2bd97fa69b0e99b9ba45e6", "shasum": "" }, "require": { @@ -355,24 +355,25 @@ "router", "routing" ], - "time": "2015-12-20 19:50:12" + "time": "2016-03-25 23:46:52" }, { "name": "symfony/http-foundation", - "version": "v2.8.3", + "version": "v2.8.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b" + "reference": "06d6b2c755b2f34ce21e688b62072e9c625709c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b", - "reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/06d6b2c755b2f34ce21e688b62072e9c625709c4", + "reference": "06d6b2c755b2f34ce21e688b62072e9c625709c4", "shasum": "" }, "require": { "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.1", "symfony/polyfill-php54": "~1.0", "symfony/polyfill-php55": "~1.0" }, @@ -409,20 +410,79 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:20:50" + "time": "2016-03-27 12:57:53" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "1289d16209491b584839022f29257ad859b8532d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php54", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php54.git", - "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" + "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", - "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/9ba741ca01c77282ecf5796c2c1d667f03454ffb", + "reference": "9ba741ca01c77282ecf5796c2c1d667f03454ffb", "shasum": "" }, "require": { @@ -467,11 +527,11 @@ "portable", "shim" ], - "time": "2016-01-20 09:13:37" + "time": "2016-01-25 19:13:00" }, { "name": "symfony/polyfill-php55", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php55.git", @@ -529,9 +589,7 @@ "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "mf2/mf2": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [],