aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-09-28 10:02:31 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-09-28 10:04:36 +0200
commit084fb0d303efc6edd0bfbf43d96b6cbe48acb2b8 (patch)
tree4fa9a2f8dba11f8478884823a382e1017410999a
parent92fa168344c51cd1c5835678e649b05cb7a2d030 (diff)
downloadwallabag-084fb0d303efc6edd0bfbf43d96b6cbe48acb2b8.tar.gz
wallabag-084fb0d303efc6edd0bfbf43d96b6cbe48acb2b8.tar.zst
wallabag-084fb0d303efc6edd0bfbf43d96b6cbe48acb2b8.zip
Some fixes about upgrade from 2.0.x -> 2.1.0
-rw-r--r--app/DoctrineMigrations/Version20160812120952.php6
-rw-r--r--docs/de/conf.py2
-rw-r--r--docs/de/user/upgrade.rst4
-rw-r--r--docs/en/conf.py2
-rw-r--r--docs/en/user/upgrade.rst4
-rw-r--r--docs/fr/conf.py2
-rw-r--r--docs/fr/user/upgrade.rst4
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--tests/Wallabag/CoreBundle/Controller/TagControllerTest.php4
-rw-r--r--tests/Wallabag/CoreBundle/WallabagCoreTestCase.php2
-rw-r--r--tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php2
11 files changed, 22 insertions, 11 deletions
diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php
index 9adfdc8b..a8d3bcf2 100644
--- a/app/DoctrineMigrations/Version20160812120952.php
+++ b/app/DoctrineMigrations/Version20160812120952.php
@@ -29,7 +29,11 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
29 */ 29 */
30 public function up(Schema $schema) 30 public function up(Schema $schema)
31 { 31 {
32 $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL'); 32 if ($this->connection->getDatabasePlatform()->getName() == 'sqlite') {
33 $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL');
34 } else {
35 $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
36 }
33 } 37 }
34 38
35 /** 39 /**
diff --git a/docs/de/conf.py b/docs/de/conf.py
index 8f2d130d..cc9dcdf8 100644
--- a/docs/de/conf.py
+++ b/docs/de/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
12master_doc = 'index' 12master_doc = 'index'
13project = u'wallabag-fr' 13project = u'wallabag-fr'
14copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence' 14copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
15version = '2.0.0' 15version = '2.1.0'
16release = version 16release = version
17exclude_patterns = ['_build'] 17exclude_patterns = ['_build']
18pygments_style = 'sphinx' 18pygments_style = 'sphinx'
diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst
index 953c84ff..084dab74 100644
--- 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
11 git fetch origin 11 git fetch origin
12 git fetch --tags 12 git fetch --tags
13 git checkout 2.1.0 13 git checkout 2.1.0
14 ./install.sh 14 ASSETS=build ./install.sh
15 php bin/console doctrine:migrations:migrate --env=prod
16 php bin/console cache:clear --env=prod
15 17
16Update auf einem Shared Webhosting 18Update auf einem Shared Webhosting
17---------------------------------- 19----------------------------------
diff --git a/docs/en/conf.py b/docs/en/conf.py
index 86e33704..717b35f1 100644
--- a/docs/en/conf.py
+++ b/docs/en/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
12master_doc = 'index' 12master_doc = 'index'
13project = u'wallabag' 13project = u'wallabag'
14copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence' 14copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
15version = '2.0.0' 15version = '2.1.0'
16release = version 16release = version
17exclude_patterns = ['_build'] 17exclude_patterns = ['_build']
18pygments_style = 'sphinx' 18pygments_style = 'sphinx'
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index 5c37be95..f547f247 100644
--- 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
11 git fetch origin 11 git fetch origin
12 git fetch --tags 12 git fetch --tags
13 git checkout 2.1.0 13 git checkout 2.1.0
14 ./install.sh 14 ASSETS=build ./install.sh
15 php bin/console doctrine:migrations:migrate --env=prod
16 php bin/console cache:clear --env=prod
15 17
16Upgrade on a shared hosting 18Upgrade on a shared hosting
17--------------------------- 19---------------------------
diff --git a/docs/fr/conf.py b/docs/fr/conf.py
index f1fe3967..49a57e2d 100644
--- a/docs/fr/conf.py
+++ b/docs/fr/conf.py
@@ -12,7 +12,7 @@ source_suffix = '.rst'
12master_doc = 'index' 12master_doc = 'index'
13project = u'wallabag-fr' 13project = u'wallabag-fr'
14copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence' 14copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
15version = '2.0.0' 15version = '2.1.0'
16release = version 16release = version
17exclude_patterns = ['_build'] 17exclude_patterns = ['_build']
18pygments_style = 'sphinx' 18pygments_style = 'sphinx'
diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst
index e3798979..42aef9c7 100644
--- 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
11 git fetch origin 11 git fetch origin
12 git fetch --tags 12 git fetch --tags
13 git checkout 2.1.0 13 git checkout 2.1.0
14 ./install.sh 14 ASSETS=build ./install.sh
15 php bin/console doctrine:migrations:migrate --env=prod
16 php bin/console cache:clear --env=prod
15 17
16Mise à jour sur un hébergement mutualisé 18Mise à jour sur un hébergement mutualisé
17---------------------------------------- 19----------------------------------------
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 968deaf9..95cb31d1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -48,6 +48,7 @@ footer:
48 page_title: 'Configuration' 48 page_title: 'Configuration'
49 49
50config: 50config:
51 page_title: 'Configuration'
51 tab_menu: 52 tab_menu:
52 settings: 'Paramètres' 53 settings: 'Paramètres'
53 rss: 'RSS' 54 rss: 'RSS'
diff --git a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
index 71652760..2c32393f 100644
--- a/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
@@ -47,7 +47,7 @@ class TagControllerTest extends WallabagCoreTestCase
47 47
48 $this->assertEquals(1, count($entry->getTags())); 48 $this->assertEquals(1, count($entry->getTags()));
49 49
50 # tag already exists and already assigned 50 // tag already exists and already assigned
51 $client->submit($form, $data); 51 $client->submit($form, $data);
52 $this->assertEquals(302, $client->getResponse()->getStatusCode()); 52 $this->assertEquals(302, $client->getResponse()->getStatusCode());
53 53
@@ -58,7 +58,7 @@ class TagControllerTest extends WallabagCoreTestCase
58 58
59 $this->assertEquals(1, count($newEntry->getTags())); 59 $this->assertEquals(1, count($newEntry->getTags()));
60 60
61 # tag already exists but still not assigned to this entry 61 // tag already exists but still not assigned to this entry
62 $data = [ 62 $data = [
63 'tag[label]' => 'foo', 63 'tag[label]' => 'foo',
64 ]; 64 ];
diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
index 75b7ee0b..4f103921 100644
--- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
+++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
@@ -83,7 +83,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
83 83
84 /** 84 /**
85 * Check if Redis is installed. 85 * Check if Redis is installed.
86 * If not, mark test as skip 86 * If not, mark test as skip.
87 */ 87 */
88 protected function checkRedis() 88 protected function checkRedis()
89 { 89 {
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index f670c925..441d6519 100644
--- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
@@ -37,7 +37,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
37 ); 37 );
38 $this->mailer = new \Swift_Mailer($transport); 38 $this->mailer = new \Swift_Mailer($transport);
39 39
40 $twigTemplate = <<<TWIG 40 $twigTemplate = <<<'TWIG'
41{% block subject %}subject{% endblock %} 41{% block subject %}subject{% endblock %}
42{% block body_html %}html body {{ code }}{% endblock %} 42{% block body_html %}html body {{ code }}{% endblock %}
43{% block body_text %}text body {{ support_url }}{% endblock %} 43{% block body_text %}text body {{ support_url }}{% endblock %}