From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Tue, 28 Mar 2017 11:18:17 +0000 (+0200)
Subject: Merge pull request #2861 from wallabag/2.3-droping-5.5
X-Git-Tag: 2.3.0~31^2~127^2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=6ae579e43f6a4ffe607a6361191366410d19f806;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2861 from wallabag/2.3-droping-5.5

Dropping PHP 5.5
---

6ae579e43f6a4ffe607a6361191366410d19f806
diff --combined .travis.yml
index 29ca7dc3,1603ea9b..77872f49
--- a/.travis.yml
+++ b/.travis.yml
@@@ -24,7 -24,6 +24,6 @@@ cache
          - $HOME/.npm
  
  php:
-     - 5.5
      - 5.6
      - 7.0
      - 7.1
@@@ -44,6 -43,7 +43,6 @@@ matrix
          - php: 7.0
            env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
      allow_failures:
 -        - php: 7.1
          - php: nightly
  
  # exclude v1 branches
diff --combined composer.json
index c43d2dcf,55bd179a..ed0e30c1
--- a/composer.json
+++ b/composer.json
@@@ -28,7 -28,7 +28,7 @@@
          "issues": "https://github.com/wallabag/wallabag/issues"
      },
      "require": {
-         "php": ">=5.5.9",
+         "php": ">=5.6.0",
          "ext-pcre": "*",
          "ext-dom": "*",
          "ext-curl": "*",
@@@ -58,7 -58,7 +58,7 @@@
          "jms/serializer-bundle": "~1.1",
          "nelmio/api-doc-bundle": "~2.7",
          "mgargano/simplehtmldom": "~1.5",
 -        "tecnickcom/tc-lib-pdf": "dev-master",
 +        "wallabag/tcpdf": "^6.2",
          "simplepie/simplepie": "~1.3.1",
          "willdurand/hateoas-bundle": "~1.0",
          "htmlawed/htmlawed": "~1.1.19",
@@@ -130,7 -130,7 +130,7 @@@
      "config": {
          "bin-dir": "bin",
          "platform": {
-             "php": "5.5.9"
+             "php": "5.6.0"
          }
      },
      "minimum-stability": "dev",
diff --combined docs/de/user/installation.rst
index 0de6b6de,1b7f0dee..8393455a
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@@ -4,7 -4,7 +4,7 @@@ Installation von wallaba
  Voraussetzungen
  ---------------
  
- wallabag ist kompatibel mit PHP >= 5.5, inkl. PHP 7.
+ wallabag ist kompatibel mit **PHP >= 5.6**, inkl. PHP 7.
  
  .. note::
  
@@@ -111,12 -111,6 +111,12 @@@ Virtualhost
  Konfiguration von Apache
  ~~~~~~~~~~~~~~~~~~~~~~~~
  
 +Vergiss nicht, die *rewrite* mod von Apache zu aktivieren.
 +
 +.. code-block:: bash
 +
 +    a2enmod rewrite && systemctl reload apache2
 +
  Angenommen du willst wallabag in das Verzeichnis ``/var/www/wallabag`` installieren und du willst PHP als Apache Modul nutzen, dann ist hier ein vhost für wallabag:
  
  ::
diff --combined docs/en/user/installation.rst
index 2b730b83,5b229bda..2c4b8749
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@@ -4,7 -4,7 +4,7 @@@ Install wallaba
  Requirements
  ------------
  
- wallabag is compatible with PHP >= 5.5, including PHP 7.
+ wallabag is compatible with **PHP >= 5.6**, including PHP 7.
  
  .. note::
  
@@@ -110,12 -110,6 +110,12 @@@ Virtual host
  Configuration on Apache
  ~~~~~~~~~~~~~~~~~~~~~~~
  
 +Do not forget to active the *rewrite* mod of Apache
 +
 +.. code-block:: bash
 +
 +    a2enmod rewrite && systemctl reload apache2
 +
  Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you want to use PHP as an Apache module, here's a vhost for wallabag:
  
  ::
@@@ -155,23 -149,6 +155,23 @@@
          ErrorLog /var/log/apache2/wallabag_error.log
          CustomLog /var/log/apache2/wallabag_access.log combined
      </VirtualHost>
 +    
 +    
 +.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : 
 +
 +::
 +
 +    AllowOverride None
 +    Order Allow,Deny
 +    Allow from All
 +
 +
 +by 
 +
 +::
 +    
 +    Require All granted
 +    
  
  After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
  
diff --combined docs/fr/user/installation.rst
index 5d29cb01,0884608d..9dcb0efb
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@@ -4,7 -4,7 +4,7 @@@ Installer wallaba
  Pré-requis
  ------------
  
- wallabag est compatible avec PHP >= 5.5, PHP 7 inclus.
+ wallabag est compatible avec **PHP >= 5.6**, PHP 7 inclus.
  
  .. note::
  
@@@ -107,12 -107,6 +107,12 @@@ Virtual host
  Configuration avec Apache
  ~~~~~~~~~~~~~~~~~~~~~~~~~
  
 +N'oubliez pas d'activer le mod *rewrite* de Apache
 +
 +.. code-block:: bash
 +
 +    a2enmod rewrite && systemctl reload apache2
 +
  En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag`` et que vous utilisiez PHP comme un module Apache, voici un vhost pour wallabag :
  
  ::
@@@ -153,24 -147,6 +153,24 @@@
          CustomLog /var/log/apache2/wallabag_access.log combined
      </VirtualHost>
  
 +.. tip:: Pour Apache 2.4, dans la section `<Directory /var/www/wallabag/web>` vous devez remplacer les directives suivantes :
 +
 +::
 +
 +    AllowOverride None
 +    Order Allow,Deny
 +    Allow from All
 +
 +
 +par 
 +
 +::
 +    
 +    Require All granted
 +    
 +
 +
 +
  Après que vous ayez rechargé/redémarré Apache, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld.
  
  Configuration avec Nginx