mirror of
https://github.com/wallabag/wallabag.git
synced 2025-08-01 17:38:38 +00:00
Rename internal settings table
In fact it's not _just_ a rename. We are now able to use our own entity with the CraueConfigBundle which allow us to enforce a custom length on string field and avoid error with utf8mb4 on MySQL. To fix that issue before we were in need to fork CraueConfigBundle to hard apply these length changes. The recent 2.3.0 release fix that issue. That's why we are in need to rename the table (getting rid of the bundle name from it) Also updating deps: - Updating symfony/polyfill-mbstring (v1.11.0 => v1.12.0) - Updating symfony/polyfill-ctype (v1.11.0 => v1.12.0) - Updating symfony/polyfill-php70 (v1.11.0 => v1.12.0) - Updating symfony/polyfill-util (v1.11.0 => v1.12.0) - Updating symfony/polyfill-php56 (v1.11.0 => v1.12.0) - Updating symfony/polyfill-intl-icu (v1.11.0 => v1.12.0) - Updating symfony/polyfill-apcu (v1.11.0 => v1.12.0) - Updating j0k3r/graby-site-config (1.0.88 => 1.0.89) - Updating php-http/message (1.7.2 => 1.8.0) - Updating symfony/polyfill-php73 (v1.11.0 => v1.12.0) - Updating symfony/http-client (v4.3.2 => v4.3.3) - Updating symfony/polyfill-php72 (v1.11.0 => v1.12.0) - Updating symfony/polyfill-intl-idn (v1.11.0 => v1.12.0) - Updating symfony/mime (v4.3.2 => v4.3.3) - Updating craue/config-bundle (dev-utf8mb4 46cfd37 => 2.3.0) - Updating masterminds/html5 (2.6.0 => 2.7.0) - Updating nette/di (v3.0.0 => v3.0.1) - Updating symfony/polyfill-iconv (v1.11.0 => v1.12.0) - Updating wallabag/php-mobi (1.0.1 => 1.1.0)
This commit is contained in:
parent
97c678a0b2
commit
1576905e03
8 changed files with 236 additions and 164 deletions
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace Wallabag\CoreBundle\Command;
|
||||
|
||||
use Craue\ConfigBundle\Entity\Setting;
|
||||
use FOS\UserBundle\Event\UserEvent;
|
||||
use FOS\UserBundle\FOSUserEvents;
|
||||
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
|
||||
|
@ -13,6 +12,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
|
|||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Question\Question;
|
||||
use Symfony\Component\Console\Style\SymfonyStyle;
|
||||
use Wallabag\CoreBundle\Entity\InternalSetting;
|
||||
|
||||
class InstallCommand extends ContainerAwareCommand
|
||||
{
|
||||
|
@ -276,10 +276,10 @@ class InstallCommand extends ContainerAwareCommand
|
|||
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
|
||||
|
||||
// cleanup before insert new stuff
|
||||
$em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
|
||||
$em->createQuery('DELETE FROM WallabagCoreBundle:InternalSetting')->execute();
|
||||
|
||||
foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
|
||||
$newSetting = new Setting();
|
||||
$newSetting = new InternalSetting();
|
||||
$newSetting->setName($setting['name']);
|
||||
$newSetting->setValue($setting['value']);
|
||||
$newSetting->setSection($setting['section']);
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
namespace Wallabag\CoreBundle\DataFixtures;
|
||||
|
||||
use Craue\ConfigBundle\Entity\Setting;
|
||||
use Doctrine\Bundle\FixturesBundle\Fixture;
|
||||
use Doctrine\Common\Persistence\ObjectManager;
|
||||
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
|
||||
use Symfony\Component\DependencyInjection\ContainerInterface;
|
||||
use Wallabag\CoreBundle\Entity\InternalSetting;
|
||||
|
||||
class SettingFixtures extends Fixture implements ContainerAwareInterface
|
||||
class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
|
||||
{
|
||||
/**
|
||||
* @var ContainerInterface
|
||||
|
@ -26,7 +26,7 @@ class SettingFixtures extends Fixture implements ContainerAwareInterface
|
|||
public function load(ObjectManager $manager)
|
||||
{
|
||||
foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
|
||||
$newSetting = new Setting();
|
||||
$newSetting = new InternalSetting();
|
||||
$newSetting->setName($setting['name']);
|
||||
$newSetting->setValue($setting['value']);
|
||||
$newSetting->setSection($setting['section']);
|
|
@ -17,7 +17,6 @@ use Wallabag\UserBundle\Entity\User;
|
|||
* @ORM\Index(name="config_feed_token", columns={"feed_token"}, options={"lengths"={255}}),
|
||||
* }
|
||||
* )
|
||||
* @ORM\Entity
|
||||
*/
|
||||
class Config
|
||||
{
|
||||
|
|
36
src/Wallabag/CoreBundle/Entity/InternalSetting.php
Normal file
36
src/Wallabag/CoreBundle/Entity/InternalSetting.php
Normal file
|
@ -0,0 +1,36 @@
|
|||
<?php
|
||||
|
||||
namespace Wallabag\CoreBundle\Entity;
|
||||
|
||||
use Craue\ConfigBundle\Entity\BaseSetting;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
/**
|
||||
* InternalSetting.
|
||||
*
|
||||
* Re-define setting so we can override length attribute to fix utf8mb4 issue.
|
||||
*
|
||||
* @ORM\Entity(repositoryClass="Craue\ConfigBundle\Repository\SettingRepository")
|
||||
* @ORM\Table(name="`internal_setting`")
|
||||
* @ORM\AttributeOverrides({
|
||||
* @ORM\AttributeOverride(name="name",
|
||||
* column=@ORM\Column(
|
||||
* length = 191
|
||||
* )
|
||||
* ),
|
||||
* @ORM\AttributeOverride(name="section",
|
||||
* column=@ORM\Column(
|
||||
* length = 191
|
||||
* )
|
||||
* )
|
||||
* })
|
||||
*/
|
||||
class InternalSetting extends BaseSetting
|
||||
{
|
||||
/**
|
||||
* @var string|null
|
||||
*
|
||||
* @ORM\Column(name="value", type="string", nullable=true, length=191)
|
||||
*/
|
||||
protected $value;
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue