Prepare 2.6.7 release

wallabag · Oct 2, 2023 · 06abeca · 06abeca
1 parent 0cfdddc
commit 06abeca
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [2.6.7](https://github.com/wallabag/wallabag/tree/2.6.7)
+[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.6...2.6.7)
+
+### Security fix
+* A user can disable her 2FA unintentionally by @kdecherf in https://github.com/wallabag/wallabag/commit/0cfdddc2eb0aee5ffb69bf499d377d75655ba157
+
+### Fixes
+* Fix deprecated null tag parameter by @Simounet in https://github.com/wallabag/wallabag/pull/6985
+* Full clickable card on mass action by @Simounet in https://github.com/wallabag/wallabag/pull/6991
+* Add tag form submit button always displayed by @Simounet in https://github.com/wallabag/wallabag/pull/6986
+
 ## [2.6.6](https://github.com/wallabag/wallabag/tree/2.6.6)
 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.5...2.6.6)
 

diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.6.6
+    version: 2.6.7
     paypal_url: "https://liberapay.com/wallabag/donate"
     languages:
         en: 'English'

diff --git a/composer.lock b/composer.lock
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -62,5 +62,5 @@ parameters:
 
         -
             message: "#^Method FOS\\\\UserBundle\\\\Model\\\\UserManagerInterface\\:\\:updateUser()#"
-            count: 7
+            count: 6
             path: src/Wallabag/CoreBundle/Controller/ConfigController.php
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -373,7 +373,7 @@ function ($backupCode) {
      * Cancelling 2FA using OTP app.
      *
      * @Route("/config/otp/app/cancel", name="config_otp_app_cancel")
-     * 
+     *
      * XXX: commented until we rewrite 2fa with a real two-steps activation
      */
     /*public function otpAppCancelAction()

diff --git a/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php b/src/Wallabag/CoreBundle/Form/Type/UserInformationType.php
@@ -4,7 +4,6 @@
 
 use FOS\UserBundle\Form\Type\RegistrationFormType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;

diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
@@ -1215,7 +1215,7 @@ public function testUserDisable2faEmail()
         $client->submit($form);
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
-        
+
         $this->assertStringContainsString('flashes.config.notice.otp_disabled', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
 
         // restore user
@@ -1264,7 +1264,7 @@ public function testUserDisable2faGoogle()
             ->getRepository(User::class)
             ->findOneByUsername('admin');
 
-        $user->setGoogleAuthenticatorSecret("Google2FA");
+        $user->setGoogleAuthenticatorSecret('Google2FA');
         $em->persist($user);
         $em->flush();
 
@@ -1274,7 +1274,7 @@ public function testUserDisable2faGoogle()
         $client->submit($form);
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
-        
+
         $this->assertStringContainsString('flashes.config.notice.otp_disabled', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
 
         // restore user