Remove binary from repo

Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.

:warning: You have to update your Composer to the 1.2 (`composer selfupdate`)

diff --git a/.gitignore b/.gitignore
index 02e921f8d0accce39ad7aa53e1882a7ec588b3b0..f596c7b8fb9d6562ec0baa1a1b76f580308451ec 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 /var/sessions/*
 !var/sessions/.gitkeep
 !var/SymfonyRequirements.php
+/bin/*
+!/bin/console
+!/bin/symfony_requirements
 
 # Parameters
 /app/config/parameters.yml

diff --git a/README.md b/README.md
index 2a7b54bf78b89aa793ecf652d2044e1e26cf204f..0d87d7bb332210eb6bfe09f418d86297a60f11f1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ 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/).
+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).
 Then you can install wallabag by executing the following commands:
 
 ```

diff --git a/bin/doctrine b/bin/doctrine
deleted file mode 120000 (symlink)
index 0f72e36..0000000
--- a/bin/doctrine
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/doctrine/orm/bin/doctrine
\ No newline at end of file

diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal
deleted file mode 120000 (symlink)
index 110e93c..0000000
--- a/bin/doctrine-dbal
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/doctrine/dbal/bin/doctrine-dbal
\ No newline at end of file

diff --git a/bin/doctrine-migrations b/bin/doctrine-migrations
deleted file mode 120000 (symlink)
index 7184da7..0000000
--- a/bin/doctrine-migrations
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/doctrine/migrations/bin/doctrine-migrations
\ No newline at end of file

diff --git a/bin/doctrine.php b/bin/doctrine.php
deleted file mode 120000 (symlink)
index b22b74d..0000000
--- a/bin/doctrine.php
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/doctrine/orm/bin/doctrine.php
\ No newline at end of file

diff --git a/bin/php-cs-fixer b/bin/php-cs-fixer
deleted file mode 120000 (symlink)
index 4d77120..0000000
--- a/bin/php-cs-fixer
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/friendsofphp/php-cs-fixer/php-cs-fixer
\ No newline at end of file

diff --git a/bin/security-checker b/bin/security-checker
deleted file mode 120000 (symlink)
index 85f6e8e..0000000
--- a/bin/security-checker
+++ /dev/null
@@ -1 +0,0 @@
-../vendor/sensiolabs/security-checker/security-checker
\ No newline at end of file

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 58d9fb7e0a80078ff9f13b28064e9b208e3a999a..bd3095e03752d55e630c74a6f215decc03f55803 100644 (file)
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -37,7 +37,7 @@ Installation
 On a dedicated web server (recommended way)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so.
+wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so and be sure to use the 1.2 version (if you already have Composer, run a ``composer selfupdate``).
 
 Install Composer:
 

diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index b1136c12b33853c89f1b669135966c0f7f638c15..0693fc5d33542782a274dcd0e0f5c43556a4df0c 100644 (file)
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -35,7 +35,7 @@ Installation
 Sur un serveur dédié (méthode conseillée)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait.
+wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait et vous assurer que vous utilisez bien la version 1.2 (si vous avez déjà Composer, faite un ``composer selfupdate``).
 
 Installation de Composer :