From 8f5e220327138581446c6dfabb1f47a8042b4e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 18 May 2016 15:02:00 +0200 Subject: Fix form user display when 2FA is disabled --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ {% endif %} {{ form_widget(form.user.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} -- cgit v1.2.3 From e49c62fac85ad2a2aa23023094fe81713a5a19c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 12 Aug 2016 13:55:30 +0200 Subject: Fix form user display for baggy theme --- .../CoreBundle/Resources/views/themes/baggy/Config/index.html.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 @@ {% endif %} - {{ form_rest(form.user) }} + {{ form_widget(form.user._token) }} + {{ form_widget(form.user.save) }}

{{ 'config.tab_menu.password'|trans }}

-- cgit v1.2.3 From 6dfac457d80d2f56ee3a69a5ab69ee64389e9e64 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 17 Aug 2016 11:40:35 +0200 Subject: Fix tests Ensure tests after the InstallCommand test will have a clean database. Previous attempt failed because of a foreign key Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures. And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file. --- .travis.yml | 5 ++++- .../CoreBundle/Command/InstallCommandTest.php | 20 ++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a33198a..a387fc13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,6 +20,7 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 - nightly - hhvm @@ -38,6 +39,7 @@ matrix: env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency allow_failures: - php: hhvm + - php: nightly # exclude v1 branches branches: @@ -46,7 +48,8 @@ branches: before_script: - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; - - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; + # xdebug isn't enable for PHP 7.1 + - if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi - composer self-update --no-progress - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; 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 * * http://stackoverflow.com/a/14374832/569101 */ - $this->markTestSkipped('PostgreSQL spotted: can find a good way to drop current database, skipping.'); + $this->markTestSkipped('PostgreSQL spotted: can\'t find a good way to drop current database, skipping.'); } } + /** + * Ensure next tests will have a clean database + */ public static function tearDownAfterClass() { $application = new Application(static::$kernel); $application->setAutoExit(false); - $code = $application->run(new ArrayInput([ + $application->run(new ArrayInput([ + 'command' => 'doctrine:schema:drop', + '--no-interaction' => true, + '--force' => true, + '--env' => 'test', + ]), new NullOutput()); + + $application->run(new ArrayInput([ + 'command' => 'doctrine:schema:create', + '--no-interaction' => true, + '--env' => 'test', + ]), new NullOutput()); + + $application->run(new ArrayInput([ 'command' => 'doctrine:fixtures:load', '--no-interaction' => true, '--env' => 'test', -- cgit v1.2.3 From 0cecfa25367742907d4833d0b9d0e23d8046913d Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 17 Aug 2016 14:18:28 +0200 Subject: CS --- .../CoreBundle/Form/DataTransformer/StringToListTransformer.php | 2 +- src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 4 +++- src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) 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 private $separator; /** - * @param string $separator The separator used in the list. + * @param string $separator The separator used in the list */ public function __construct($separator = ',') { 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 { $this->themes = array_combine( $themes, - array_map(function ($s) { return ucwords(strtolower(str_replace('-', ' ', $s))); }, $themes) + array_map(function ($s) { + return ucwords(strtolower(str_replace('-', ' ', $s))); + }, $themes) ); $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 /** * Add tags from rules defined by the user. * - * @param Entry $entry Entry to tag. + * @param Entry $entry Entry to tag */ public function tag(Entry $entry) { @@ -49,7 +49,7 @@ class RuleBasedTagger * * @param User $user * - * @return array A list of modified entries. + * @return array A list of modified entries */ public function tagAllForUser(User $user) { @@ -75,7 +75,7 @@ class RuleBasedTagger /** * Fetch a tag. * - * @param string $label The tag's label. + * @param string $label The tag's label * * @return Tag */ -- cgit v1.2.3