Rename composer.json.dist to composer.json (#9279)

* Rename composer.json.dist to composer.json
* fix update

.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

.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
 

.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

.gitignore

@@ -9,7 +9,6 @@ plugins/rcsample
 plugins/plugin_manager
 
 # composer-related
-composer.json
 composer.phar
 composer.lock
 vendor

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!).

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)

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!).

bin/installto.sh

@@ -78,7 +78,8 @@ 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) {
-        $command = 'rsync -a --out-format=%n ' . INSTALL_PATH . "{$file} {$target_dir}/{$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);

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.

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