Some fixes about upgrade from 2.0.x -> 2.1.0

diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php
index 9adfdc8be35e87f66fcc49fac5c161e56ef1ae75..a8d3bcf25a9382852a9d90e69c330b0b2eb4df71 100644 (file)
--- a/app/DoctrineMigrations/Version20160812120952.php
+++ b/app/DoctrineMigrations/Version20160812120952.php
@@ -29,7 +29,11 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
+        if ($this->connection->getDatabasePlatform()->getName() == 'sqlite') {
+            $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL');
+        } else {
+            $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
+        }
     }
 
     /**

diff --git a/docs/de/conf.py b/docs/de/conf.py
index 8f2d130d08b202bf8956de229cec206ee9aa5029..cc9dcdf810698b3d6428ce929e2de2c541471c0f 100644 (file)
--- a/docs/de/conf.py
+++ b/docs/de/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag-fr'
 copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
+version = '2.1.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'

diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst
index 953c84ff7cd1c5437551298cf219378f21d4355f..084dab7465edae7ff7b17dee7372a31968c12c2f 100644 (file)
--- a/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade.rst
@@ -11,7 +11,9 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ./install.sh
+    ASSETS=build ./install.sh
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 
 Update auf einem Shared Webhosting
 ----------------------------------

diff --git a/docs/en/conf.py b/docs/en/conf.py
index 86e337040978a243bb746120fb8281a00ca3f214..717b35f1433fb2cfe290e82eb5b00132d6efbf6b 100644 (file)
--- a/docs/en/conf.py
+++ b/docs/en/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag'
 copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
+version = '2.1.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'

diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index 5c37be95088ad052f03719b8086bd32e03dead05..f547f247bd72f571ac09adc58426861da50c07ba 100644 (file)
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@ -11,7 +11,9 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
     git fetch origin
     git fetch --tags
     git checkout 2.1.0
-    ./install.sh
+    ASSETS=build ./install.sh
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 
 Upgrade on a shared hosting
 ---------------------------

diff --git a/docs/fr/conf.py b/docs/fr/conf.py
index f1fe39676a13cc2e88bda28cdc1c9a3f10ea3247..49a57e2d5dc97b22216363860139796f533f1fed 100644 (file)
--- a/docs/fr/conf.py
+++ b/docs/fr/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag-fr'
 copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
+version = '2.1.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'

diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst
index e3798979c4ac4bb7bb613d03d6728ee9481aac49..42aef9c76fe112d90ef57520c3502acad10ecc39 100644 (file)
--- a/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade.rst
@@ -11,7 +11,9 @@ 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
-    ./install.sh
+    ASSETS=build ./install.sh
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 
 Mise à jour sur un hébergement mutualisé
 ----------------------------------------

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 968deaf9ab92db344cf6b0c4c20bec34a22fbbb3..95cb31d186614e824fa82e1ab50fa7ae992e8cdd 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -48,6 +48,7 @@ footer:
     page_title: 'Configuration'
 
 config:
+    page_title: 'Configuration'
     tab_menu:
         settings: 'Paramètres'
         rss: 'RSS'

diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 71652760d8a592c2729147ff4691527d1c819d3b..2c32393f74449f373c3a0e168c40dc36ca213cdb 100644 (file)
--- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -47,7 +47,7 @@ class TagControllerTest extends WallabagCoreTestCase
 
         $this->assertEquals(1, count($entry->getTags()));
 
-        # tag already exists and already assigned
+        // tag already exists and already assigned
         $client->submit($form, $data);
         $this->assertEquals(302, $client->getResponse()->getStatusCode());
 
@@ -58,7 +58,7 @@ class TagControllerTest extends WallabagCoreTestCase
 
         $this->assertEquals(1, count($newEntry->getTags()));
 
-        # tag already exists but still not assigned to this entry
+        // tag already exists but still not assigned to this entry
         $data = [
             'tag[label]' => 'foo',
         ];

diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 75b7ee0bd4a110437cdd226455eea0dda7634304..4f103921a78cf6c7c56aa36da70cfb48726ec274 100644 (file)
--- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
+++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
@@ -83,7 +83,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
 
     /**
      * Check if Redis is installed.
-     * If not, mark test as skip
+     * If not, mark test as skip.
      */
     protected function checkRedis()
     {

diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index f670c92582d7b0931dc6e890f17d415211f9183b..441d6519f5723537239b9e24f11863418e2abcba 100644 (file)
--- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
@@ -37,7 +37,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
         );
         $this->mailer = new \Swift_Mailer($transport);
 
-        $twigTemplate = <<<TWIG
+        $twigTemplate = <<<'TWIG'
 {% block subject %}subject{% endblock %}
 {% block body_html %}html body {{ code }}{% endblock %}
 {% block body_text %}text body {{ support_url }}{% endblock %}