From 0f686afe11e56392e0beb3131a8380922600d408 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Thu, 24 Sep 2020 21:49:01 +0200 Subject: doc/Makefile: remove references to composer update - add make composer_dependencies_dev Makefile target and use this instead - fix composer initial installation procedure - fix php-xdebug install instructions --- Makefile | 4 ++++ doc/md/dev/Unit-tests.md | 15 +++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 2d604b54..d1663926 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,10 @@ all_tests: test locale_test_de_DE locale_test_en_US locale_test_fr_FR @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6) @#$(BIN)/phpcov merge --text coverage/txt coverage +### download 3rd-party PHP libraries, including dev dependencies +composer_dependencies_dev: clean + composer install --prefer-dist + ## # Custom release archive generation # diff --git a/doc/md/dev/Unit-tests.md b/doc/md/dev/Unit-tests.md index 25af82d7..fd286bf0 100644 --- a/doc/md/dev/Unit-tests.md +++ b/doc/md/dev/Unit-tests.md @@ -10,21 +10,16 @@ You can either use: - a local version, downloadable [here](https://getcomposer.org/download/). ```bash -# system-wide version -$ composer install -$ composer update - -# local version -$ php composer.phar self-update -$ php composer.phar install -$ php composer.phar update +# for Debian-based distros +sudo apt install composer ``` + ## Install Shaarli dev dependencies ```bash $ cd /path/to/shaarli -$ composer update +$ make composer_dependencies_dev ``` ## Install and enable Xdebug to generate PHPUnit coverage reports @@ -34,7 +29,7 @@ $ composer update ```bash # for Debian-based distros: -sudo aptitude install php5-xdebug +sudo apt install php-xdebug # for ArchLinux: pacman -S xdebug -- cgit v1.2.3