From: ArthurHoaro <arthur@hoa.ro>
Date: Wed, 30 Sep 2020 09:12:17 +0000 (+0200)
Subject: Merge pull request #1566 from nodiscc/makefile-composer-install
X-Git-Tag: v0.12.0-beta-1~4
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=769a28833b68f4c629c5578348b31d51016fbf6f;hp=-c;p=github%2Fshaarli%2FShaarli.git

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

doc/Makefile: remove references to composer update
---

769a28833b68f4c629c5578348b31d51016fbf6f
diff --combined Makefile
index 4c9a9c83,d1663926..0ff6bd3f
--- a/Makefile
+++ b/Makefile
@@@ -3,7 -3,7 +3,7 @@@
  
  BIN = vendor/bin
  
 -all: static_analysis_summary check_permissions test
 +all: check_permissions test
  
  ##
  # Docker test adapter
@@@ -85,6 -85,10 +85,10 @@@ all_tests: test locale_test_de_DE local
  	@# --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
  #