From 4c2e0d934ccd959c3e1a7163222622c906ee7e77 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 30 Mar 2020 13:18:35 +0200
Subject: [PATCH] Fix error

Error : Unsupported operand types dans FacesExtendable->extend() (ligne 233 dans /var/www/framaforms/sites/all/modules/rules/includes/faces.inc).
---
 scripts/install                     |  6 +++++-
 sources/patches/.gitignore          |  2 ++
 sources/patches/app-001-faces.patch | 12 ++++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 sources/patches/.gitignore
 create mode 100644 sources/patches/app-001-faces.patch

diff --git a/scripts/install b/scripts/install
index 00d1994..4e8c247 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,6 +17,10 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================
 
+ynh_clean_setup () {
+	read -p "key"
+	true
+}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
@@ -184,7 +188,7 @@ chown -R $app: $final_path
 
 update-alternatives --set php /usr/bin/php7.3
 
-ynh_exec_as $app env PATH=$PATH drush @$app upwd --password="$password" "admin" 2>&1
+ynh_exec_as $app env PATH=$PATH drush @$app user-password "admin" --password="$password" 2>&1
 ynh_exec_as $app env PATH=$PATH drush @$app variable-set site_name "Framaforms" 2>&1
 ynh_exec_as $app env PATH=$PATH drush @$app variable-set site_mail "no-reply@$domain" 2>&1
 ynh_exec_as $app env PATH=$PATH drush @$app variable-set file_private_path "/home/yunohost.app/$app/data" 2>&1
diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore
new file mode 100644
index 0000000..783a4ae
--- /dev/null
+++ b/sources/patches/.gitignore
@@ -0,0 +1,2 @@
+*~
+*.sw[op]
diff --git a/sources/patches/app-001-faces.patch b/sources/patches/app-001-faces.patch
new file mode 100644
index 0000000..75a827c
--- /dev/null
+++ b/sources/patches/app-001-faces.patch
@@ -0,0 +1,12 @@
+diff --git a/sites/all/modules/rules/includes/faces.inc b/sites/all/modules/rules/includes/faces.inc
+index a1fc93bd..812d96a1 100644
+--- a/sites/all/modules/rules/includes/faces.inc
++++ b/sites/all/modules/rules/includes/faces.inc
+@@ -224,6 +224,7 @@ if (!class_exists('FacesExtendable', FALSE)) {
+      *   describe a single file.
+      */
+     public function extend($interface, array $callbacks = array(), array $includes = array()) {
++      $interface = class_exists($interface) ? $interface : FALSE;
+       $face_methods = $interface ? get_class_methods($interface) : array_keys($callbacks);
+       if ($interface) {
+         if (array_diff($face_methods, array_keys($callbacks))) {