aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rw-r--r--src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php2
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/ConfigType.php4
-rw-r--r--src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig3
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig2
-rw-r--r--tests/Wallabag/CoreBundle/Command/InstallCommandTest.php20
7 files changed, 32 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 1a33198a..a387fc13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ php:
20 - 5.5 20 - 5.5
21 - 5.6 21 - 5.6
22 - 7.0 22 - 7.0
23 - 7.1
23 - nightly 24 - nightly
24 - hhvm 25 - hhvm
25 26
@@ -38,6 +39,7 @@ matrix:
38 env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency 39 env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
39 allow_failures: 40 allow_failures:
40 - php: hhvm 41 - php: hhvm
42 - php: nightly
41 43
42# exclude v1 branches 44# exclude v1 branches
43branches: 45branches:
@@ -46,7 +48,8 @@ branches:
46 48
47before_script: 49before_script:
48 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; 50 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
49 - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; 51 # xdebug isn't enable for PHP 7.1
52 - if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi
50 - composer self-update --no-progress 53 - composer self-update --no-progress
51 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; 54 - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
52 55
diff --git a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
index b712ad15..cb4bee83 100644
--- a/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
+++ b/src/Wallabag/CoreBundle/Form/DataTransformer/StringToListTransformer.php
@@ -16,7 +16,7 @@ class StringToListTransformer implements DataTransformerInterface
16 private $separator; 16 private $separator;
17 17
18 /** 18 /**
19 * @param string $separator The separator used in the list. 19 * @param string $separator The separator used in the list
20 */ 20 */
21 public function __construct($separator = ',') 21 public function __construct($separator = ',')
22 { 22 {
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
index 74c53bf0..7d25cc80 100644
--- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php
@@ -21,7 +21,9 @@ class ConfigType extends AbstractType
21 { 21 {
22 $this->themes = array_combine( 22 $this->themes = array_combine(
23 $themes, 23 $themes,
24 array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes) 24 array_map(function ($s) {
25 return ucwords(strtolower(str_replace('-', ' ', $s)));
26 }, $themes)
25 ); 27 );
26 28
27 $this->languages = $languages; 29 $this->languages = $languages;
diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
index 14ef4a64..239d09ae 100644
--- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
+++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
@@ -25,7 +25,7 @@ class RuleBasedTagger
25 /** 25 /**
26 * Add tags from rules defined by the user. 26 * Add tags from rules defined by the user.
27 * 27 *
28 * @param Entry $entry Entry to tag. 28 * @param Entry $entry Entry to tag
29 */ 29 */
30 public function tag(Entry $entry) 30 public function tag(Entry $entry)
31 { 31 {
@@ -49,7 +49,7 @@ class RuleBasedTagger
49 * 49 *
50 * @param User $user 50 * @param User $user
51 * 51 *
52 * @return array<Entry> A list of modified entries. 52 * @return array<Entry> A list of modified entries
53 */ 53 */
54 public function tagAllForUser(User $user) 54 public function tagAllForUser(User $user)
55 { 55 {
@@ -75,7 +75,7 @@ class RuleBasedTagger
75 /** 75 /**
76 * Fetch a tag. 76 * Fetch a tag.
77 * 77 *
78 * @param string $label The tag's label. 78 * @param string $label The tag's label
79 * 79 *
80 * @return Tag 80 * @return Tag
81 */ 81 */
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index c51f90d2..a8abe8d3 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -134,7 +134,8 @@
134 </fieldset> 134 </fieldset>
135 {% endif %} 135 {% endif %}
136 136
137 {{ form_rest(form.user) }} 137 {{ form_widget(form.user._token) }}
138 {{ form_widget(form.user.save) }}
138 </form> 139 </form>
139 140
140 <h2>{{ 'config.tab_menu.password'|trans }}</h2> 141 <h2>{{ 'config.tab_menu.password'|trans }}</h2>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index 5a90f227..afd5b499 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -158,7 +158,7 @@
158 {% endif %} 158 {% endif %}
159 159
160 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 160 {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}
161 {{ form_rest(form.user) }} 161 {{ form_widget(form.user._token) }}
162 </form> 162 </form>
163 </div> 163 </div>
164 164
diff --git a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
index 6c6ce087..089a1c5f 100644
--- a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
+++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
@@ -28,16 +28,32 @@ class InstallCommandTest extends WallabagCoreTestCase
28 * 28 *
29 * http://stackoverflow.com/a/14374832/569101 29 * http://stackoverflow.com/a/14374832/569101
30 */ 30 */
31 $this->markTestSkipped('PostgreSQL spotted: can find a good way to drop current database, skipping.'); 31 $this->markTestSkipped('PostgreSQL spotted: can\'t find a good way to drop current database, skipping.');
32 } 32 }
33 } 33 }
34 34
35 /**
36 * Ensure next tests will have a clean database
37 */
35 public static function tearDownAfterClass() 38 public static function tearDownAfterClass()
36 { 39 {
37 $application = new Application(static::$kernel); 40 $application = new Application(static::$kernel);
38 $application->setAutoExit(false); 41 $application->setAutoExit(false);
39 42
40 $code = $application->run(new ArrayInput([ 43 $application->run(new ArrayInput([
44 'command' => 'doctrine:schema:drop',
45 '--no-interaction' => true,
46 '--force' => true,
47 '--env' => 'test',
48 ]), new NullOutput());
49
50 $application->run(new ArrayInput([
51 'command' => 'doctrine:schema:create',
52 '--no-interaction' => true,
53 '--env' => 'test',
54 ]), new NullOutput());
55
56 $application->run(new ArrayInput([
41 'command' => 'doctrine:fixtures:load', 57 'command' => 'doctrine:fixtures:load',
42 '--no-interaction' => true, 58 '--no-interaction' => true,
43 '--env' => 'test', 59 '--env' => 'test',