From 4394c78a739eb824cea3edafe4413656f0a2235f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 7 Dec 2023 14:07:27 +0100 Subject: [PATCH 1/2] Rename composer.json.dist to composer.json --- .github/workflows/browser_tests.yml | 4 +--- .github/workflows/ci.yml | 5 ----- .github/workflows/tests.yml | 8 ++------ .gitignore | 1 - INSTALL | 3 +-- Makefile | 1 - UPGRADING | 1 - bin/installto.sh | 2 +- composer.json-dist => composer.json | 0 plugins/password/README | 2 +- program/lib/Roundcube/README.md | 2 +- 11 files changed, 7 insertions(+), 22 deletions(-) rename composer.json-dist => composer.json (100%) diff --git a/.github/workflows/browser_tests.yml b/.github/workflows/browser_tests.yml index 724a4cb868b..55086b799e7 100644 --- a/.github/workflows/browser_tests.yml +++ b/.github/workflows/browser_tests.yml @@ -44,9 +44,7 @@ jobs: run: sudo apt-get -y install aspell aspell-en aspell-de - name: Setup composer - run: | - cp composer.json-dist composer.json - composer require "laravel/dusk:^7.9" --no-update + run: composer require "laravel/dusk:^7.9" --no-update - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ef78554b5d..8d23a1f0840 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,10 +26,6 @@ jobs: tools: composer:v2 coverage: none - - name: Setup composer - run: | - cp composer.json-dist composer.json - - name: Install dependencies run: composer install --prefer-dist --no-interaction --no-progress @@ -64,7 +60,6 @@ jobs: - name: Setup composer run: | - cp composer.json-dist composer.json composer require "kolab/net_ldap3:~1.1.1" --no-update composer require "laravel/dusk:^7.9" --no-update diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4bd13509074..d2873f7abfe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,9 +38,7 @@ jobs: run: sudo apt-get -y install aspell aspell-en aspell-de hunspell-en-us - name: Setup composer - run: | - cp composer.json-dist composer.json - composer require "kolab/net_ldap3:~1.1.4" --no-update + run: composer require "kolab/net_ldap3:~1.1.4" --no-update - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress @@ -88,9 +86,7 @@ jobs: coverage: none - name: Setup composer - run: | - cp composer.json-dist composer.json - composer require "kolab/net_ldap3:~1.1.4" --no-update + run: composer require "kolab/net_ldap3:~1.1.4" --no-update - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress diff --git a/.gitignore b/.gitignore index 7b36d6da6f4..5b856e7d2ee 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ plugins/rcsample plugins/plugin_manager # composer-related -composer.json composer.phar composer.lock vendor diff --git a/INSTALL b/INSTALL index e6470f52d8b..14b5129da5d 100644 --- a/INSTALL +++ b/INSTALL @@ -18,7 +18,7 @@ REQUIREMENTS - LDAP for LDAP addressbook support (optional) - GD, Imagick, XMLWriter (optional: thumbnails generation, QR-code) * PEAR and PEAR packages distributed with Roundcube or external. - See composer.json-dist for the list of required packages. + See composer.json for the list of required packages. * php.ini options: - memory_limit > 16MB - file_uploads enabled (for uploading attachments and import files) @@ -40,7 +40,6 @@ INSTALLATION you have to install PHP and javascript dependencies. 2.1. Install PHP dependencies using composer: - get composer from https://getcomposer.org/download/ - - rename the composer.json-dist file into composer.json - if you want to use LDAP address books, enable the LDAP libraries in your composer.json file by moving the items from "suggest" to the "require" section (remove the explanation texts after the version!). diff --git a/Makefile b/Makefile index 0b33f62ab22..4e2395cb9e8 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ all: clean complete dependent framework complete: roundcubemail-git cp -RH roundcubemail-git roundcubemail-$(VERSION) - (cd roundcubemail-$(VERSION); cp composer.json-dist composer.json) (cd roundcubemail-$(VERSION); php /tmp/composer.phar config platform.php $(PHP_VERSION)) (cd roundcubemail-$(VERSION); php /tmp/composer.phar require "kolab/net_ldap3:~1.1.4" --no-update --no-install) (cd roundcubemail-$(VERSION); php /tmp/composer.phar config --unset suggest.kolab/net_ldap3) diff --git a/UPGRADING b/UPGRADING index d7129a2bb3b..b54841670ea 100644 --- a/UPGRADING +++ b/UPGRADING @@ -52,7 +52,6 @@ it on a unix system, you need to do the following operations by hand: by running `php composer.phar update --no-dev`. 4b. Install/update dependencies using composer: - get composer from https://getcomposer.org/download/ - - rename the composer.json-dist file into composer.json - if you want to use LDAP address books, enable the LDAP libraries in your composer.json file by moving the items from "suggest" to the "require" section (remove the explanation texts after the version!). diff --git a/bin/installto.sh b/bin/installto.sh index de288827537..ba8b4182cab 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -77,7 +77,7 @@ if (strtolower($input) == 'y') { } } - foreach (['index.php', 'config/defaults.inc.php', 'composer.json-dist', 'jsdeps.json', 'CHANGELOG.md', 'README.md', 'UPGRADING', 'LICENSE', 'INSTALL'] as $file) { + foreach (['index.php', 'config/defaults.inc.php', 'composer.json', 'jsdeps.json', 'CHANGELOG.md', 'README.md', 'UPGRADING', 'LICENSE', 'INSTALL'] as $file) { $command = 'rsync -a --out-format=%n ' . INSTALL_PATH . "{$file} {$target_dir}/{$file}"; if (file_exists(INSTALL_PATH . $file) && (system($command, $ret) === false || $ret > 0)) { diff --git a/composer.json-dist b/composer.json similarity index 100% rename from composer.json-dist rename to composer.json diff --git a/plugins/password/README b/plugins/password/README index f4d21318c70..79412e79f5c 100644 --- a/plugins/password/README +++ b/plugins/password/README @@ -437,7 +437,7 @@ ------------- Driver to use the Zxcvbn library to check password strength. Requires zxcvbn-php library. - The library is not distributed with Roundcube (see composer.json-dist). + The library is not distributed with Roundcube (see composer.json). Note: Required PHP's memory_limit >= 24M. Set $config['password_zxcvbn_min_score'] to define minimum acceptable password strength score. diff --git a/program/lib/Roundcube/README.md b/program/lib/Roundcube/README.md index cce07febec1..966b10574a1 100644 --- a/program/lib/Roundcube/README.md +++ b/program/lib/Roundcube/README.md @@ -29,7 +29,7 @@ INSTALLATION ------------ Copy all files of this directory to your project or install it in the default include_path directory of your webserver. Some classes of the framework require -external libraries. See composer.json-dist for the list of required packages. +external libraries. See composer.json for the list of required packages. USAGE From 20e57974081dd810e329f9046b027a0650bf2dbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 19 Dec 2023 17:47:01 +0100 Subject: [PATCH 2/2] fix update --- bin/installto.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/installto.sh b/bin/installto.sh index ba8b4182cab..88017c02ccb 100755 --- a/bin/installto.sh +++ b/bin/installto.sh @@ -77,8 +77,9 @@ if (strtolower($input) == 'y') { } } - foreach (['index.php', 'config/defaults.inc.php', 'composer.json', 'jsdeps.json', 'CHANGELOG.md', 'README.md', 'UPGRADING', 'LICENSE', 'INSTALL'] as $file) { - $command = 'rsync -a --out-format=%n ' . INSTALL_PATH . "{$file} {$target_dir}/{$file}"; + foreach (['index.php', 'config/defaults.inc.php', 'composer.json-dist', 'jsdeps.json', 'CHANGELOG.md', 'README.md', 'UPGRADING', 'LICENSE', 'INSTALL'] as $file) { + $source_file = $file === 'composer.json-dist' ? 'composer.json' : $file; + $command = 'rsync -a --out-format=%n ' . INSTALL_PATH . "{$source_file} {$target_dir}/{$file}"; if (file_exists(INSTALL_PATH . $file) && (system($command, $ret) === false || $ret > 0)) { rcube::raise_error("Failed to execute command: {$command}", false, true);