From 4c33b9a306def1a95ed97229ac7253b0e21af414 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 29 Jan 2018 00:13:57 +0100 Subject: [PATCH 1/2] Fix issue with PHP 7.1 dependency in dev manual Signed-off-by: Morris Jobke --- build/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/composer.json b/build/composer.json index b0facd795..034c6631f 100644 --- a/build/composer.json +++ b/build/composer.json @@ -1,6 +1,6 @@ { "minimum-stability": "dev", "require": { - "juliushaertl/phpdoc-to-rst": "dev-master" + "juliushaertl/phpdoc-to-rst": "dev-php7.0" } } From 92198068986db1cd74d58971e1dd95e6df0f9d4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 30 Jan 2018 15:34:53 +0100 Subject: [PATCH 2/2] Lock versions for php 7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- build/composer.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/build/composer.json b/build/composer.json index 034c6631f..c051dae66 100644 --- a/build/composer.json +++ b/build/composer.json @@ -1,6 +1,13 @@ { "minimum-stability": "dev", + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/juliushaertl/reflection.git" + } + ], "require": { - "juliushaertl/phpdoc-to-rst": "dev-php7.0" + "juliushaertl/phpdoc-to-rst": "dev-php7.0", + "phpdocumentor/reflection": "dev-php7.0" } }