From 3b29d163d29cdfd8f64800bece92fa785ab9c82e Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Thu, 29 Apr 2021 00:32:58 +0200
Subject: [PATCH] Reinstate composer helper and remove ynh_send_readme_to_admin

---
 scripts/experimental_helpers/ynh_composer | 61 +++++++++++++++++++++++
 scripts/install                           |  3 +-
 scripts/upgrade                           |  1 +
 3 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 scripts/experimental_helpers/ynh_composer

diff --git a/scripts/experimental_helpers/ynh_composer b/scripts/experimental_helpers/ynh_composer
new file mode 100644
index 0000000..37c50ed
--- /dev/null
+++ b/scripts/experimental_helpers/ynh_composer
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+readonly YNH_DEFAULT_COMPOSER_VERSION=1.10.17
+# Declare the actual composer version to use.
+# A packager willing to use another version of composer can override the variable into its _common.sh.
+YNH_COMPOSER_VERSION=${YNH_COMPOSER_VERSION:-$YNH_DEFAULT_COMPOSER_VERSION}
+
+# Execute a command with Composer
+#
+# usage: ynh_composer_exec [--phpversion=phpversion] [--workdir=$final_path] --commands="commands"
+# | arg: -v, --phpversion - PHP version to use with composer
+# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+# | arg: -c, --commands - Commands to execute.
+ynh_composer_exec () {
+    # Declare an array to define the options of this helper.
+    local legacy_args=vwc
+    declare -Ar args_array=( [v]=phpversion= [w]=workdir= [c]=commands= )
+    local phpversion
+    local workdir
+    local commands
+    # Manage arguments with getopts
+    ynh_handle_getopts_args "$@"
+    workdir="${workdir:-$final_path}"
+    phpversion="${phpversion:-$YNH_PHP_VERSION}"
+
+    COMPOSER_HOME="$workdir/.composer" \
+        php${phpversion} "$workdir/composer.phar" $commands \
+        -d "$workdir" --quiet --no-interaction
+}
+
+# Install and initialize Composer in the given directory
+#
+# usage: ynh_install_composer [--phpversion=phpversion] [--workdir=$final_path] [--install_args="--optimize-autoloader"] [--composerversion=composerversion]
+# | arg: -v, --phpversion - PHP version to use with composer
+# | arg: -w, --workdir - The directory from where the command will be executed. Default $final_path.
+# | arg: -a, --install_args - Additional arguments provided to the composer install. Argument --no-dev already include
+# | arg: -c, --composerversion - Composer version to install
+ynh_install_composer () {
+    # Declare an array to define the options of this helper.
+    local legacy_args=vwac
+    declare -Ar args_array=( [v]=phpversion= [w]=workdir= [a]=install_args= [c]=composerversion=)
+    local phpversion
+    local workdir
+    local install_args
+    local composerversion
+    # Manage arguments with getopts
+    ynh_handle_getopts_args "$@"
+    workdir="${workdir:-$final_path}"
+    phpversion="${phpversion:-$YNH_PHP_VERSION}"
+    install_args="${install_args:-}"
+    composerversion="${composerversion:-$YNH_COMPOSER_VERSION}"
+
+    curl -sS https://getcomposer.org/installer \
+        | COMPOSER_HOME="$workdir/.composer" \
+        php${phpversion} -- --quiet --install-dir="$workdir" --version=$composerversion \
+        || ynh_die "Unable to install Composer."
+
+    # install dependencies
+    ynh_composer_exec --phpversion="${phpversion}" --workdir="$workdir" --commands="install --no-dev $install_args" \
+        || ynh_die "Unable to install core dependencies with Composer."
+}
diff --git a/scripts/install b/scripts/install
index 53514e3..bccdbff 100644
--- a/scripts/install
+++ b/scripts/install
@@ -8,8 +8,7 @@
 
 source _common.sh
 source experimental_helpers/ynh_exec_as
-source experimental_helpers/ynh_composer__2
-source experimental_helpers/ynh_send_readme_to_admin
+source experimental_helpers/ynh_composer
 source experimental_helpers/ynh_add_swap
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/upgrade b/scripts/upgrade
index c5b2fdb..b7add8a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -8,6 +8,7 @@
 
 source _common.sh
 source experimental_helpers/ynh_exec_as
+source experimental_helpers/ynh_composer
 source experimental_helpers/ynh_add_swap
 source /usr/share/yunohost/helpers