Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1566 from nodiscc/makefile-composer-install

Browse source 
doc/Makefile: remove references to composer update
This commit is contained in:
ArthurHoaro 2020-09-30 11:12:17 +02:00 committed by GitHub
commit 769a28833b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -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) @# --text doesn't work with phpunit 4.* (v5 requires PHP 5.6)
@#$(BIN)/phpcov merge --text coverage/txt coverage @#$(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 # Custom release archive generation
# #

15
doc/md/dev/Unit-tests.md
View file

@ -10,21 +10,16 @@ You can either use:
- a local version, downloadable [here](https://getcomposer.org/download/). - a local version, downloadable [here](https://getcomposer.org/download/).
```bash ```bash
# system-wide version # for Debian-based distros
$ composer install sudo apt install composer
$ composer update
# local version
$ php composer.phar self-update
$ php composer.phar install
$ php composer.phar update
``` ```
## Install Shaarli dev dependencies ## Install Shaarli dev dependencies
```bash ```bash
$ cd /path/to/shaarli $ cd /path/to/shaarli
$ composer update $ make composer_dependencies_dev
``` ```
## Install and enable Xdebug to generate PHPUnit coverage reports ## Install and enable Xdebug to generate PHPUnit coverage reports
@ -34,7 +29,7 @@ $ composer update
```bash ```bash
# for Debian-based distros: # for Debian-based distros:
sudo aptitude install php5-xdebug sudo apt install php-xdebug
# for ArchLinux: # for ArchLinux:
pacman -S xdebug pacman -S xdebug