mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-05-18 17:18:05 +00:00
Code Issues Projects Releases Wiki Activity

Rename internal settings table

Browse source 
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:
Jeremy Benoist 2019-08-08 15:19:53 +02:00
parent 97c678a0b2
commit 1576905e03
No known key found for this signature in database
GPG key ID: 84290C294324D304
8 changed files with 236 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/DoctrineMigrations/Version20190808124957.php Normal file
View file

@ -0,0 +1,42 @@
<?php
namespace Application\Migrations;
use Doctrine\DBAL\Schema\Schema;
use Wallabag\CoreBundle\Doctrine\WallabagMigration;
/**
* Change the internal setting table name.
*/
final class Version20190808124957 extends WallabagMigration
{
public function up(Schema $schema): void
{
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting', true) . ' RENAME TO ' . $this->getTable('internal_setting', true));
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME ' . $this->getTable('internal_setting'));
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME TO ' . $this->getTable('internal_setting'));
break;
}
}
public function down(Schema $schema): void
{
switch ($this->connection->getDatabasePlatform()->getName()) {
case 'sqlite':
$this->addSql('ALTER TABLE ' . $this->getTable('internal_setting', true) . ' RENAME TO ' . $this->getTable('craue_config_setting', true));
break;
case 'mysql':
$this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME ' . $this->getTable('craue_config_setting'));
break;
case 'postgresql':
$this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME TO ' . $this->getTable('craue_config_setting'));
break;
}
}
}

4
app/config/config.yml
View file

@ -392,3 +392,7 @@ httplug:
'X-Accept': 'application/json'
discovery:
client: false
# define custom entity so we can override length attribute to fix utf8mb4 issue
craue_config:
entity_name: Wallabag\CoreBundle\Entity\InternalSetting

7
composer.json
View file

@ -77,7 +77,7 @@
"kphoen/rulerz-bundle": "~0.13",
"guzzlehttp/guzzle": "^5.3.1",
"doctrine/doctrine-migrations-bundle": "^1.3",
"craue/config-bundle": "dev-utf8mb4",
"craue/config-bundle": "^2.3.0",
"mnapoli/piwik-twig-extension": "^2.0",
"ocramius/proxy-manager": "^2.1.1",
"white-october/pagerfanta-bundle": "^1.1",
@ -166,11 +166,6 @@
"type": "vcs",
"url": "https://github.com/Daniel-KM/PHPePub",
"comment": "The most up-to-date PHPePub as of now"
},
{
"type": "vcs",
"url": "https://github.com/wallabag/CraueConfigBundle",
"comment": "To handle utf8mb4 field size"
}
]
}

298
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "2dfef02524d5e64b49dfca4dc54353c0",
"content-hash": "02ec26b02dc55d65cb9353ad99be7ebe",
"packages": [
{
"name": "bdunogier/guzzle-site-authenticator",
@ -209,34 +209,36 @@
},
{
"name": "craue/config-bundle",
"version": "dev-utf8mb4",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/wallabag/CraueConfigBundle.git",
"reference": "46cfd37febc51d62e84e4c64fdb166e7495ca172"
"url": "https://github.com/craue/CraueConfigBundle.git",
"reference": "7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wallabag/CraueConfigBundle/zipball/46cfd37febc51d62e84e4c64fdb166e7495ca172",
"reference": "46cfd37febc51d62e84e4c64fdb166e7495ca172",
"url": "https://api.github.com/repos/craue/CraueConfigBundle/zipball/7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72",
"reference": "7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72",
"shasum": ""
},
"require": {
"doctrine/doctrine-bundle": "~1.3",
"php": "^5.3.9|~7.0",
"symfony/framework-bundle": "~2.7|~3.0|~4.0"
"doctrine/doctrine-bundle": "^1.5.1",
"php": "~7.0",
"psr/simple-cache": "^1.0",
"symfony/framework-bundle": "~3.4|~4.1"
},
"require-dev": {
"doctrine/doctrine-cache-bundle": "~1.3",
"doctrine/orm": "^2.3.1",
"phpunit/phpunit": "^4.8.35|~5.7|~6.0",
"symfony/phpunit-bridge": "~3.2|~4.0",
"symfony/symfony": "~2.7|~3.0|~4.0"
"doctrine/doctrine-cache-bundle": "^1.3.5",
"doctrine/instantiator": "^1.0.5",
"doctrine/orm": "^2.5.14",
"phpunit/phpunit": "^6.5.13|^7.5.1",
"symfony/phpunit-bridge": "~3.4|~4.1",
"symfony/symfony": "~3.4|~4.1"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "2.3.x-dev"
}
},
"autoload": {
@ -247,6 +249,7 @@
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
@ -264,14 +267,10 @@
"homepage": "https://github.com/craue/CraueConfigBundle",
"keywords": [
"config",
"symfony2",
"symfony3",
"symfony4"
],
"support": {
"source": "https://github.com/wallabag/CraueConfigBundle/tree/utf8mb4"
},
"time": "2018-11-28T19:15:35+00:00"
"time": "2019-08-01T15:52:03+00:00"
},
{
"name": "defuse/php-encryption",
@ -3729,16 +3728,16 @@
},
{
"name": "j0k3r/graby-site-config",
"version": "1.0.88",
"version": "1.0.89",
"source": {
"type": "git",
"url": "https://github.com/j0k3r/graby-site-config.git",
"reference": "b485a36c31736b8834ebf62f42bd97fb333eefa7"
"reference": "5052101225b3578a1a7258079ae8fe864b68e23e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/b485a36c31736b8834ebf62f42bd97fb333eefa7",
"reference": "b485a36c31736b8834ebf62f42bd97fb333eefa7",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/5052101225b3578a1a7258079ae8fe864b68e23e",
"reference": "5052101225b3578a1a7258079ae8fe864b68e23e",
"shasum": ""
},
"require": {
@ -3746,7 +3745,7 @@
},
"require-dev": {
"liip/rmt": "1.2.*",
"symfony/phpunit-bridge": "^3.2"
"symfony/phpunit-bridge": "^4.3"
},
"type": "library",
"autoload": {
@ -3765,7 +3764,7 @@
}
],
"description": "Graby site config files",
"time": "2019-07-23T15:40:40+00:00"
"time": "2019-08-05T11:10:32+00:00"
},
{
"name": "j0k3r/httplug-ssrf-plugin",
@ -4546,8 +4545,8 @@
"authors": [
{
"name": "Luís Otávio Cobucci Oblonczyk",
"email": "lcobucci@gmail.com",
"role": "Developer"
"role": "Developer",
"email": "lcobucci@gmail.com"
}
],
"description": "A simple library to work with JSON Web Token and JSON Web Signature",
@ -4685,16 +4684,16 @@
},
{
"name": "masterminds/html5",
"version": "2.6.0",
"version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/Masterminds/html5-php.git",
"reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad"
"reference": "104443ad663d15981225f99532ba73c2f1d6b6f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad",
"reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad",
"url": "https://api.github.com/repos/Masterminds/html5-php/zipball/104443ad663d15981225f99532ba73c2f1d6b6f2",
"reference": "104443ad663d15981225f99532ba73c2f1d6b6f2",
"shasum": ""
},
"require": {
@ -4711,7 +4710,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.6-dev"
"dev-master": "2.7-dev"
}
},
"autoload": {
@ -4728,13 +4727,13 @@
"name": "Matt Butcher",
"email": "technosophos@gmail.com"
},
{
"name": "Asmir Mustafic",
"email": "goetas@gmail.com"
},
{
"name": "Matt Farina",
"email": "matt@mattfarina.com"
},
{
"name": "Asmir Mustafic",
"email": "goetas@gmail.com"
}
],
"description": "An HTML5 parser and serializer.",
@ -4748,7 +4747,7 @@
"serializer",
"xml"
],
"time": "2019-03-10T11:41:28+00:00"
"time": "2019-07-25T07:03:26+00:00"
},
{
"name": "mgargano/simplehtmldom",
@ -6015,21 +6014,21 @@
},
{
"name": "php-http/message",
"version": "1.7.2",
"version": "1.8.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/message.git",
"reference": "b159ffe570dffd335e22ef0b91a946eacb182fa1"
"reference": "ce8f43ac1e294b54aabf5808515c3554a19c1e1c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/message/zipball/b159ffe570dffd335e22ef0b91a946eacb182fa1",
"reference": "b159ffe570dffd335e22ef0b91a946eacb182fa1",
"url": "https://api.github.com/repos/php-http/message/zipball/ce8f43ac1e294b54aabf5808515c3554a19c1e1c",
"reference": "ce8f43ac1e294b54aabf5808515c3554a19c1e1c",
"shasum": ""
},
"require": {
"clue/stream-filter": "^1.4",
"php": "^5.4 || ^7.0",
"php": "^7.1",
"php-http/message-factory": "^1.0.2",
"psr/http-message": "^1.0"
},
@ -6055,7 +6054,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6-dev"
"dev-master": "1.8-dev"
}
},
"autoload": {
@ -6083,7 +6082,7 @@
"message",
"psr-7"
],
"time": "2018-11-01T09:32:41+00:00"
"time": "2019-08-05T06:55:08+00:00"
},
{
"name": "php-http/message-factory",
@ -7859,16 +7858,16 @@
},
{
"name": "symfony/http-client",
"version": "v4.3.2",
"version": "v4.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-client.git",
"reference": "e903ab079c99eab322fc5c71eb63fc467cd19a2a"
"reference": "7759fabfbdf7f57a1d29655550b49c4ff04891a5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-client/zipball/e903ab079c99eab322fc5c71eb63fc467cd19a2a",
"reference": "e903ab079c99eab322fc5c71eb63fc467cd19a2a",
"url": "https://api.github.com/repos/symfony/http-client/zipball/7759fabfbdf7f57a1d29655550b49c4ff04891a5",
"reference": "7759fabfbdf7f57a1d29655550b49c4ff04891a5",
"shasum": ""
},
"require": {
@ -7917,7 +7916,7 @@
],
"description": "Symfony HttpClient component",
"homepage": "https://symfony.com",
"time": "2019-06-26T07:29:23+00:00"
"time": "2019-07-24T10:16:23+00:00"
},
{
"name": "symfony/http-client-contracts",
@ -7978,16 +7977,16 @@
},
{
"name": "symfony/mime",
"version": "v4.3.2",
"version": "v4.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/mime.git",
"reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b"
"reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
"reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
"url": "https://api.github.com/repos/symfony/mime/zipball/6b7148029b1dd5eda1502064f06d01357b7b2d8b",
"reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b",
"shasum": ""
},
"require": {
@ -8033,7 +8032,7 @@
"mime",
"mime-type"
],
"time": "2019-06-04T09:22:54+00:00"
"time": "2019-07-19T16:21:19+00:00"
},
{
"name": "symfony/monolog-bundle",
@ -8100,16 +8099,16 @@
},
{
"name": "symfony/polyfill-apcu",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-apcu.git",
"reference": "a502face1da6a53289480166f24de2c3c68e5c3c"
"reference": "71ce80635d5dcd67772b4dda00b86068595f64d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a502face1da6a53289480166f24de2c3c68e5c3c",
"reference": "a502face1da6a53289480166f24de2c3c68e5c3c",
"url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/71ce80635d5dcd67772b4dda00b86068595f64d5",
"reference": "71ce80635d5dcd67772b4dda00b86068595f64d5",
"shasum": ""
},
"require": {
@ -8118,7 +8117,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8152,20 +8151,20 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "82ebae02209c21113908c229e9883c419720738a"
"reference": "550ebaac289296ce228a706d0867afc34687e3f4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
"reference": "82ebae02209c21113908c229e9883c419720738a",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
"reference": "550ebaac289296ce228a706d0867afc34687e3f4",
"shasum": ""
},
"require": {
@ -8177,7 +8176,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8193,13 +8192,13 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
},
{
"name": "Gert de Pagter",
"email": "BackEndTea@gmail.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for ctype functions",
@ -8210,20 +8209,20 @@
"polyfill",
"portable"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7"
"reference": "685968b11e61a347c18bf25db32effa478be610f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f037ea22acfaee983e271dd9c3b8bb4150bd8ad7",
"reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
"reference": "685968b11e61a347c18bf25db32effa478be610f",
"shasum": ""
},
"require": {
@ -8235,7 +8234,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8269,25 +8268,25 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-intl-icu",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-icu.git",
"reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057"
"reference": "66810b9d6eb4af54d543867909d65ab9af654d7e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/999878a3a09d73cae157b0cf89bb6fb2cc073057",
"reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057",
"url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66810b9d6eb4af54d543867909d65ab9af654d7e",
"reference": "66810b9d6eb4af54d543867909d65ab9af654d7e",
"shasum": ""
},
"require": {
"php": ">=5.3.3",
"symfony/intl": "~2.3|~3.0|~4.0"
"symfony/intl": "~2.3|~3.0|~4.0|~5.0"
},
"suggest": {
"ext-intl": "For best performance"
@ -8295,7 +8294,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8327,20 +8326,20 @@
"portable",
"shim"
],
"time": "2019-01-07T19:39:47+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af"
"reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c766e95bec706cdd89903b1eda8afab7d7a6b7af",
"reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
"reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
"shasum": ""
},
"require": {
@ -8354,7 +8353,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8370,13 +8369,13 @@
"MIT"
],
"authors": [
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
},
{
"name": "Laurent Bassin",
"email": "laurent@bassin.info"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
@ -8389,20 +8388,20 @@
"portable",
"shim"
],
"time": "2019-03-04T13:44:35+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
"reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
"reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
"reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
"shasum": ""
},
"require": {
@ -8414,7 +8413,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8448,20 +8447,20 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-php56",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php56.git",
"reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
"reference": "0e3b212e96a51338639d8ce175c046d7729c3403"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
"reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
"url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403",
"reference": "0e3b212e96a51338639d8ce175c046d7729c3403",
"shasum": ""
},
"require": {
@ -8471,7 +8470,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8504,20 +8503,20 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-php70",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
"reference": "bc4858fb611bda58719124ca079baff854149c89"
"reference": "54b4c428a0054e254223797d2713c31e08610831"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
"reference": "bc4858fb611bda58719124ca079baff854149c89",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
"reference": "54b4c428a0054e254223797d2713c31e08610831",
"shasum": ""
},
"require": {
@ -8527,7 +8526,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8563,20 +8562,20 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
"reference": "04ce3335667451138df4307d6a9b61565560199e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
"reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
"reference": "04ce3335667451138df4307d6a9b61565560199e",
"shasum": ""
},
"require": {
@ -8585,7 +8584,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8618,20 +8617,20 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-php73",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd"
"reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd",
"reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
"reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
"shasum": ""
},
"require": {
@ -8640,7 +8639,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8676,20 +8675,20 @@
"portable",
"shim"
],
"time": "2019-02-06T07:57:58+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/polyfill-util",
"version": "v1.11.0",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-util.git",
"reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
"reference": "4317de1386717b4c22caed7725350a8887ab205c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
"reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
"url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c",
"reference": "4317de1386717b4c22caed7725350a8887ab205c",
"shasum": ""
},
"require": {
@ -8698,7 +8697,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11-dev"
"dev-master": "1.12-dev"
}
},
"autoload": {
@ -8728,7 +8727,7 @@
"polyfill",
"shim"
],
"time": "2019-02-08T14:16:39+00:00"
"time": "2019-08-06T08:03:45+00:00"
},
{
"name": "symfony/swiftmailer-bundle",
@ -9120,23 +9119,21 @@
},
{
"name": "wallabag/php-mobi",
"version": "1.0.1",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/wallabag/php-mobi.git",
"reference": "1cd7d022fe6be838535d6bba917d19cc48dcf487"
"reference": "bfe9c18d038e5ca24664cfdab107a645ac57c9b5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wallabag/php-mobi/zipball/1cd7d022fe6be838535d6bba917d19cc48dcf487",
"reference": "1cd7d022fe6be838535d6bba917d19cc48dcf487",
"url": "https://api.github.com/repos/wallabag/php-mobi/zipball/bfe9c18d038e5ca24664cfdab107a645ac57c9b5",
"reference": "bfe9c18d038e5ca24664cfdab107a645ac57c9b5",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"replace": {
"wallabag/phpmobi": "*"
"php": ">=5.3.0",
"symfony/polyfill-mbstring": "^1.12"
},
"type": "library",
"autoload": {
@ -9149,20 +9146,20 @@
"Apache-2.0"
],
"authors": [
{
"name": "Nicolas Lœuillet",
"email": "nicolas@loeuillet.org",
"homepage": "http://www.cdetc.fr"
},
{
"name": "Sander Kromwijk",
"role": "Original developer",
"email": "s.kromwijk@gmail.co"
},
{
"name": "Nicolas Lœuillet",
"email": "nicolas@loeuillet.org",
"homepage": "http://www.cdetc.fr"
}
],
"description": "A Mobipocket file (.mobi) creator in PHP.",
"homepage": "https://github.com/wallabag/phpMobi",
"time": "2015-10-16T08:42:42+00:00"
"homepage": "https://github.com/wallabag/php-mobi",
"time": "2019-08-08T12:26:23+00:00"
},
{
"name": "wallabag/tcpdf",
@ -10176,16 +10173,16 @@
},
{
"name": "nette/di",
"version": "v3.0.0",
"version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/nette/di.git",
"reference": "19d83539245aaacb59470828919182411061841f"
"reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/di/zipball/19d83539245aaacb59470828919182411061841f",
"reference": "19d83539245aaacb59470828919182411061841f",
"url": "https://api.github.com/repos/nette/di/zipball/4aff517a1c6bb5c36fa09733d4cea089f529de6d",
"reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d",
"shasum": ""
},
"require": {
@ -10245,7 +10242,7 @@
"nette",
"static"
],
"time": "2019-04-03T19:35:46+00:00"
"time": "2019-08-07T12:11:33+00:00"
},
{
"name": "nette/finder",
@ -11222,7 +11219,6 @@
"minimum-stability": "dev",
"stability-flags": {
"grandt/phpepub": 20,
"craue/config-bundle": 20,
"predis/predis": 20
},
"prefer-stable": true,

6
src/Wallabag/CoreBundle/Command/InstallCommand.php
View file

@ -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']);

6
src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php → src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php
View file

@ -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']);

1
src/Wallabag/CoreBundle/Entity/Config.php
View file

@ -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
View 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;
}