aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authornodiscc <nodiscc@gmail.com>2020-09-24 21:49:01 +0200
committernodiscc <nodiscc@gmail.com>2020-09-24 21:51:28 +0200
commit0f686afe11e56392e0beb3131a8380922600d408 (patch)
treedae8f16cadbc31eb0b1cc81bb380c76a52c38d9a
parentcdb96276c1f4a1b3484ac4a1729fa5c9cdff38a5 (diff)
downloadShaarli-0f686afe11e56392e0beb3131a8380922600d408.tar.gz
Shaarli-0f686afe11e56392e0beb3131a8380922600d408.tar.zst
Shaarli-0f686afe11e56392e0beb3131a8380922600d408.zip
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
-rw-r--r--Makefile4
-rw-r--r--doc/md/dev/Unit-tests.md15
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
85 @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6) 85 @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6)
86 @#$(BIN)/phpcov merge --text coverage/txt coverage 86 @#$(BIN)/phpcov merge --text coverage/txt coverage
87 87
88### download 3rd-party PHP libraries, including dev dependencies
89composer_dependencies_dev: clean
90 composer install --prefer-dist
91
88## 92##
89# Custom release archive generation 93# Custom release archive generation
90# 94#
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:
10- a local version, downloadable [here](https://getcomposer.org/download/). 10- a local version, downloadable [here](https://getcomposer.org/download/).
11 11
12```bash 12```bash
13# system-wide version 13# for Debian-based distros
14$ composer install 14sudo apt install composer
15$ composer update
16
17# local version
18$ php composer.phar self-update
19$ php composer.phar install
20$ php composer.phar update
21``` 15```
22 16
17
23## Install Shaarli dev dependencies 18## Install Shaarli dev dependencies
24 19
25```bash 20```bash
26$ cd /path/to/shaarli 21$ cd /path/to/shaarli
27$ composer update 22$ make composer_dependencies_dev
28``` 23```
29 24
30## Install and enable Xdebug to generate PHPUnit coverage reports 25## Install and enable Xdebug to generate PHPUnit coverage reports
@@ -34,7 +29,7 @@ $ composer update
34 29
35```bash 30```bash
36# for Debian-based distros: 31# for Debian-based distros:
37sudo aptitude install php5-xdebug 32sudo apt install php-xdebug
38 33
39# for ArchLinux: 34# for ArchLinux:
40pacman -S xdebug 35pacman -S xdebug