From 5768556299b4ebc9993e9369945c1a3d7a19e48d Mon Sep 17 00:00:00 2001 From: Simon Perdrisat Date: Fri, 29 Aug 2025 21:52:47 +0000 Subject: [PATCH] Move composer.json to the root --- build/build.sh | 8 ++++---- includes/composer.json => composer.json | 2 ++ includes/composer.lock => composer.lock | 0 core/modules/facture/doc/pdf_swissqr.modules.php | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename includes/composer.json => composer.json (65%) rename includes/composer.lock => composer.lock (100%) diff --git a/build/build.sh b/build/build.sh index a247305..072e9b2 100644 --- a/build/build.sh +++ b/build/build.sh @@ -1,11 +1,11 @@ #!/bin/bash -docker run --rm --interactive --tty --volume ./includes:/app composer update --ignore-platform-req=ext-bcmath +docker run --rm --interactive --tty --volume $(pwd):/app composer update --ignore-platform-req=ext-bcmath -# Clean up vendor directory -if [ -d includes/vendor/sprain/swiss-qr-bill/example ]; then - rm -rf includes/vendor/sprain/swiss-qr-bill/example +# Nettoyage du dossier vendor +if [ -d vendor/sprain/swiss-qr-bill/example ]; then + rm -rf vendor/sprain/swiss-qr-bill/example fi cd .. diff --git a/includes/composer.json b/composer.json similarity index 65% rename from includes/composer.json rename to composer.json index bd51c6b..8664a99 100644 --- a/includes/composer.json +++ b/composer.json @@ -1,4 +1,6 @@ { + "name": "sinabe/dolibarr-swissqr", + "description": "Dolibarr SwissQR", "config": { "platform": { "php": "8.1.0" diff --git a/includes/composer.lock b/composer.lock similarity index 100% rename from includes/composer.lock rename to composer.lock diff --git a/core/modules/facture/doc/pdf_swissqr.modules.php b/core/modules/facture/doc/pdf_swissqr.modules.php index 3e4ba90..e11054f 100644 --- a/core/modules/facture/doc/pdf_swissqr.modules.php +++ b/core/modules/facture/doc/pdf_swissqr.modules.php @@ -25,7 +25,7 @@ */ use Sprain\SwissQrBill as QrBill; -require_once DOL_DOCUMENT_ROOT.'/custom/swissqr/includes/vendor/autoload.php'; +require_once DOL_DOCUMENT_ROOT.'/custom/swissqr/vendor/autoload.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/doc/pdf_sponge.modules.php';