From b9acf836538cb138e09615ebae316c034ce36951 Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Sun, 25 Oct 2015 01:03:28 +0200 Subject: [PATCH] [ticket/14250] Track version numbers instead of commit id PHPBB3-14250 --- phpBB/composer.json | 4 ++-- phpBB/composer.lock | 15 +++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index e861cddfcb..10a866daf0 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -28,10 +28,10 @@ "php": ">=5.4,<7.1", "bantu/ini-get-wrapper": "1.0.*", "google/recaptcha": "~1.1", - "lusitanian/oauth": "~0.3", + "lusitanian/oauth": "^0.8.1", "marc1706/fast-image-size": "1.1.*", "patchwork/utf8": "1.1.*", - "s9e/text-formatter": "dev-release/php5.3", + "s9e/text-formatter": "^0.4.2", "symfony/config": "2.8.*", "symfony/console": "2.8.*", "symfony/dependency-injection": "2.8.*", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index ea35cba07c..94d4139045 100644 --- a/phpBB/composer.lock +++ b/phpBB/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": "8352b05d1a9194d25d702f016cc8dde9", - "content-hash": "59113cbe72bacd3bd403a2ef0a7f4c68", + "hash": "9d0b346ca06e847f35fbb72c4c2223a4", + "content-hash": "9b480e50816ebe7971b3a6196cab41ca", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -291,16 +291,16 @@ }, { "name": "s9e/text-formatter", - "version": "dev-release/php5.3", + "version": "0.4.6", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "0dd9c8174c497c196d905e50b28077fe0b5615f5" + "reference": "da255f4be12d9b192063b2e4c9de580faee180a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/0dd9c8174c497c196d905e50b28077fe0b5615f5", - "reference": "0dd9c8174c497c196d905e50b28077fe0b5615f5", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/da255f4be12d9b192063b2e4c9de580faee180a8", + "reference": "da255f4be12d9b192063b2e4c9de580faee180a8", "shasum": "" }, "require": { @@ -346,7 +346,7 @@ "parser", "shortcodes" ], - "time": "2015-12-22 19:19:15" + "time": "2015-12-21 11:07:20" }, { "name": "symfony/config", @@ -2808,7 +2808,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "s9e/text-formatter": 20, "symfony/browser-kit": 20, "symfony/dom-crawler": 20, "symfony/css-selector": 20,