Update docs and scripts to use the correct composer install script

diff --git a/.devcontainer/postCreateFriendicaSetup.sh b/.devcontainer/postCreateFriendicaSetup.sh
index c1c518ca20ceed60784c322eb112d65abc45f1d8..1880ac49cc957ffcfcd63812741e74913928d545 100755 (executable)
--- a/.devcontainer/postCreateFriendicaSetup.sh
+++ b/.devcontainer/postCreateFriendicaSetup.sh
@@ -7,7 +7,7 @@ echo ">>> Friendica Setup"
 
 FRIENDICA_PHP_PATH=$(which php)
 export FRIENDICA_PHP_PATH
-  
+
 envsubst < $workspaceFolder/.devcontainer/include/autoinstall.config.php > /tmp/autoinstall.config.php
 cp $workspaceFolder/.devcontainer/include/00apcu.config.php $workspaceFolder/config/00apcu.config.php
 cp $workspaceFolder/.devcontainer/include/01redis.config.php $workspaceFolder/config/01redis.config.php
@@ -19,7 +19,7 @@ cd $DocumentRoot
 # copy the .htaccess-dist file to .htaccess so that rewrite rules work
 cp $DocumentRoot/.htaccess-dist $DocumentRoot/.htaccess
 
-bin/composer.phar --no-dev install
+bin/composer.phar install
 
 # install friendica
 bin/console autoinstall -f /tmp/autoinstall.config.php

diff --git a/doc/Developers-Intro.md b/doc/Developers-Intro.md
index 8540109f85a236fe0638a7909915556e75ed5467..639e1fea742569563b57211ad25b54043f942be2 100644 (file)
--- a/doc/Developers-Intro.md
+++ b/doc/Developers-Intro.md
@@ -62,7 +62,7 @@ If you want to have git automatically update the dependencies with composer, you
     }
     # `composer install` if the `composer.lock` file gets changed
     # to update all the php dependencies
-    check_run composer.lock "bin/composer.phar install --no-dev"
+    check_run composer.lock "bin/composer.phar install"
 
 just place it into `.git/hooks/post-merge` and make it executable.
 

diff --git a/doc/Install.md b/doc/Install.md
index cb4b2de33d516e42adbd0ee8bbd544ef3e748dc7..f613b2ffc3c5130afe56b9f79feeac3053f13276 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -87,7 +87,7 @@ Clone the addon repository (separately):
 
 Install the dependencies:
 
-    bin/composer.phar install --no-dev
+    bin/composer.phar run install:prod
 
 Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case *www-data*
 
@@ -98,7 +98,7 @@ Make sure the folder *view/smarty3* exists and is writable by the webserver user
 If you want to use the development version of Friendica you can switch to the develop branch in the repository by running
 
     git checkout develop
-    bin/composer.phar install
+    bin/composer.phar run install:prod
     cd addon
     git checkout develop
 

diff --git a/doc/Update.md b/doc/Update.md
index 40de14082c30008977b0d63cabfe09a31278c25d..b6c5c53e19730a3cff61cccd24501361be040071 100644 (file)
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -14,7 +14,7 @@ If you installed Friendica in the ``path/to/friendica`` folder:
    * ``.htaccess`` if using Apache web server
 
     The following items only need to be copied if they are located inside your friendica path:
-   * your storage folder as set in **Admin -> Site -> File Upload -> Storage base path** 
+   * your storage folder as set in **Admin -> Site -> File Upload -> Storage base path**
    * your item cache as set in **Admin -> Site -> Performance -> Path to item cache**
    * your temp folder as set in **Admin -> Site -> Advanced -> Temp path**
 3. Rename the ``path/to/friendica`` folder to ``path/to/friendica_old``.
@@ -30,7 +30,7 @@ You can get the latest changes at any time with
 
     cd path/to/friendica
     git pull
-    bin/composer.phar install --no-dev
+    bin/composer.phar run install:prod
 
 The addon tree has to be updated separately like so:
 
@@ -89,7 +89,7 @@ Some of the updates include the use of foreign keys now that will bump into issu
 ```
 Error 1452 occurred during database update:
 Cannot add or update a child row: a foreign key constraint fails (`friendica`.`#sql-10ea6_5a6d`, CONSTRAINT `#sql-10ea6_5a6d_ibfk_1` FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`))
-ALTER TABLE `thread` ADD FOREIGN KEY (`iid`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE; 
+ALTER TABLE `thread` ADD FOREIGN KEY (`iid`) REFERENCES `item` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE;
 ```
 
 All current known fixes for possible items that can go wrong are as below.

diff --git a/doc/de/Install.md b/doc/de/Install.md
index ae910e6fab79cab5888545978c40467f5a014c37..205127e34ef1fc2e4b4168889db0736741758883 100644 (file)
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -59,7 +59,7 @@ Der Linux-Code, mit dem man die Dateien direkt in ein Verzeichnis wie "meinewebs
 
     git clone https://github.com/friendica/friendica.git -b stable mywebsite
     cd mywebsite
-    bin/composer.phar install
+    bin/composer.phar run install:prod
 
 Stelle sicher, dass der Ordner *view/smarty3* existiert and von dem Webserver-Benutzer beschreibbar ist
 
@@ -85,7 +85,7 @@ Wenn du die Entwickler Version von Friendica verwenden möchtest kannst du auf d
 Dies tust du mit den folgenden Befehlen
 
     git checkout develop
-    bin/composer.phar install
+    bin/composer.phar run install:prod
     cd addon
     git checkout develop
 

diff --git a/index.php b/index.php
index 850d9cd1c020338535a0c870b0795f9e376e2204..c1265556f64697baee0c5166a0b431c96aa3e54b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
 $start_time = microtime(true);
 
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
-       die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
+       die('Vendor path not found. Please execute "bin/composer.phar run install:prod" on the command line in the web root.');
 }
 
 require __DIR__ . '/vendor/autoload.php';

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index c9fb547ab7821f312550189f26caea58a2137c40..ee628029f45079331b5e3bf64865cb8c853e45b8 100644 (file)
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 
 if (!file_exists(__DIR__ . '/../vendor/autoload.php')) {
-       die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
+       die('Vendor path not found. Please execute "bin/composer.phar install" on the command line in the web root.');
 }
 
 require __DIR__ . '/../vendor/autoload.php';