Update doc

Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)

diff --git a/.travis.yml b/.travis.yml
index 821ae48fa22699998542a83382a4cda2959e0224..28f068b969f226d313eb8acf7928ce13d5ed00de 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,9 +61,7 @@ matrix:
           group: edge
           env: DB=sqlite
         - php: 7.0
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
-        - php: 7.0
-          env: DB=sqlite ASSETS=build
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
         - php: hhvm-3.12
         - php: 7.1
@@ -94,7 +92,7 @@ before_install:
 script:
     - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
     - ant prepare-$DB
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
     - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
     - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
     - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi;

diff --git a/README.md b/README.md
index 6d215c896cbd4982ee5e5253228c076fcbc3ab61..0936f666bad3656562c3879388d6a007819efc30 100644 (file)
--- a/README.md
+++ b/README.md
@@ -10,14 +10,14 @@ More informations on our website: [wallabag.org](https://wallabag.org)
 
 # Install wallabag
 
-If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation. 
+If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation.
 Then you can install wallabag by executing the following commands:
 
 ```
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console server:run --env=prod
 ```
 

diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml
index 6e9f98de54fa3448523239b21cd528b7a452a1ad..1952e3a61135340aa66c461c53c53e0fbe1b3332 100644 (file)
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@@ -5,4 +5,4 @@ parameters:
     test_database_name: ~
     test_database_user: ~
     test_database_password: ~
-    test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite"
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"

diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index 7fa8c625ead18f6eeed7f74b4f7a70734c9d1d90..f9f34c3cdde71e826208b0832146abc45389e0d6 100644 (file)
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -55,7 +55,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen:
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
 Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen:

diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst
index 7c20f4ee8533563225bc0d0d1f0289482cd95137..7319a18a4cf418475a7a1fa52d99375dcc71a319 100644 (file)
--- a/docs/de/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst
@@ -15,7 +15,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console doctrine:migrations:migrate --env=prod
     php bin/console cache:clear --env=prod
 

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 82fa6f4e23879a8fd2d4860fe628fa1e05158a4a..756eb74cdc7ef8902c65d727c02b277617d4a7a3 100644 (file)
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -54,7 +54,7 @@ To install wallabag itself, you must run the following commands:
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
 To start PHP's build-in server and test if everything did install correctly, you can do:

diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst
index 234045ba474e263fd2d042b2c11c409cb2601d16..ce5b5441bfd19817cfbb76599d7020a04fcf12a6 100644 (file)
--- a/docs/en/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst
@@ -15,7 +15,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console doctrine:migrations:migrate --env=prod
     php bin/console cache:clear --env=prod
 

diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index bb4de534f1bf4c38f5e4c6abfab7b91309f67138..e8d18434beb963dc8d330eb93d5e454d88564d34 100644 (file)
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -52,7 +52,7 @@ Pour installer wallabag, vous devez exécuter ces commandes :
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
 Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :

diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
index fdd1f0cbbb4802b32ee680f7ebaa2383812cc430..a059cfb8471820b890028a2e1dc30ca3bc55b66d 100644 (file)
--- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
@@ -15,7 +15,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ASSETS=build ./install.sh
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console doctrine:migrations:migrate --env=prod
     php bin/console cache:clear --env=prod