forked from wallabag/wallabag
Fix json_array removed type
This commit is contained in:
@ -1,6 +1,8 @@
|
|||||||
doctrine:
|
doctrine:
|
||||||
dbal:
|
dbal:
|
||||||
url: '%env(resolve:DATABASE_URL)%'
|
url: '%env(resolve:DATABASE_URL)%'
|
||||||
|
types:
|
||||||
|
json_array: App\Doctrine\JsonArrayType
|
||||||
|
|
||||||
orm:
|
orm:
|
||||||
auto_generate_proxy_classes: "%kernel.debug%"
|
auto_generate_proxy_classes: "%kernel.debug%"
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Wallabag\CoreBundle\Doctrine;
|
namespace App\Doctrine;
|
||||||
|
|
||||||
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
use Doctrine\DBAL\Platforms\AbstractPlatform;
|
||||||
use Doctrine\DBAL\Types\JsonType;
|
use Doctrine\DBAL\Types\JsonType;
|
||||||
|
|||||||
@ -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;
|
$this->container = $container;
|
||||||
}
|
}
|
||||||
@ -40,7 +40,7 @@ abstract class WallabagMigration extends AbstractMigration implements ContainerA
|
|||||||
return false;
|
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;
|
$table = $this->container->getParameter('database_table_prefix') . $tableName;
|
||||||
|
|
||||||
|
|||||||
@ -172,7 +172,7 @@ class User extends BaseUser implements EmailTwoFactorInterface, GoogleTwoFactorI
|
|||||||
*
|
*
|
||||||
* @ORM\Column(type="json", nullable=true)
|
* @ORM\Column(type="json", nullable=true)
|
||||||
*/
|
*/
|
||||||
private array $backupCodes;
|
private $backupCodes;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
|
|||||||
Reference in New Issue
Block a user