From 1f2b00bdac08caa0b3f20dcecacef84ad4af6d63 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Wed, 21 Dec 2022 08:33:24 +0100
Subject: [PATCH] Fix `json_array` removed type

---
 config/packages/doctrine.yaml      | 2 ++
 src/Doctrine/JsonArrayType.php     | 2 +-
 src/Doctrine/WallabagMigration.php | 4 ++--
 src/Entity/User.php                | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index a1402acba..b3c3f054b 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -1,6 +1,8 @@
 doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
+        types:
+            json_array: App\Doctrine\JsonArrayType
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
diff --git a/src/Doctrine/JsonArrayType.php b/src/Doctrine/JsonArrayType.php
index 0580e9ab4..f9d7b134e 100644
--- a/src/Doctrine/JsonArrayType.php
+++ b/src/Doctrine/JsonArrayType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Doctrine;
+namespace App\Doctrine;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\JsonType;
diff --git a/src/Doctrine/WallabagMigration.php b/src/Doctrine/WallabagMigration.php
index abaad89dc..d344bf1e5 100644
--- a/src/Doctrine/WallabagMigration.php
+++ b/src/Doctrine/WallabagMigration.php
@@ -25,7 +25,7 @@ abstract class WallabagMigration extends AbstractMigration implements ContainerA
     {
     }
 
-    public function setContainer(ContainerInterface $container = null)
+    public function setContainer(ContainerInterface $container = null): void
     {
         $this->container = $container;
     }
@@ -40,7 +40,7 @@ abstract class WallabagMigration extends AbstractMigration implements ContainerA
         return false;
     }
 
-    protected function getTable($tableName, $unEscaped = false)
+    protected function getTable(string $tableName, bool $unEscaped = false): string
     {
         $table = $this->container->getParameter('database_table_prefix') . $tableName;
 
diff --git a/src/Entity/User.php b/src/Entity/User.php
index 8bc3b8515..a51f3f074 100644
--- a/src/Entity/User.php
+++ b/src/Entity/User.php
@@ -172,7 +172,7 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
      *
      * @ORM\Column(type="json", nullable=true)
      */
-    private array $backupCodes;
+    private $backupCodes;
 
     /**
      * @var bool