aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/DoctrineMigrations/Version20190808124957.php42
-rw-r--r--app/config/config.yml4
-rw-r--r--composer.json7
-rw-r--r--composer.lock298
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php6
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php (renamed from src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php)6
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php1
-rw-r--r--src/Wallabag/CoreBundle/Entity/InternalSetting.php36
8 files changed, 236 insertions, 164 deletions
diff --git a/app/DoctrineMigrations/Version20190808124957.php b/app/DoctrineMigrations/Version20190808124957.php
new file mode 100644
index 00000000..4e12e995
--- /dev/null
+++ b/app/DoctrineMigrations/Version20190808124957.php
@@ -0,0 +1,42 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Schema\Schema;
6use Wallabag\CoreBundle\Doctrine\WallabagMigration;
7
8/**
9 * Change the internal setting table name.
10 */
11final class Version20190808124957 extends WallabagMigration
12{
13 public function up(Schema $schema): void
14 {
15 switch ($this->connection->getDatabasePlatform()->getName()) {
16 case 'sqlite':
17 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting', true) . ' RENAME TO ' . $this->getTable('internal_setting', true));
18 break;
19 case 'mysql':
20 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME ' . $this->getTable('internal_setting'));
21 break;
22 case 'postgresql':
23 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME TO ' . $this->getTable('internal_setting'));
24 break;
25 }
26 }
27
28 public function down(Schema $schema): void
29 {
30 switch ($this->connection->getDatabasePlatform()->getName()) {
31 case 'sqlite':
32 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting', true) . ' RENAME TO ' . $this->getTable('craue_config_setting', true));
33 break;
34 case 'mysql':
35 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME ' . $this->getTable('craue_config_setting'));
36 break;
37 case 'postgresql':
38 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME TO ' . $this->getTable('craue_config_setting'));
39 break;
40 }
41 }
42}
diff --git a/app/config/config.yml b/app/config/config.yml
index bbcc682f..642e198d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -392,3 +392,7 @@ httplug:
392 'X-Accept': 'application/json' 392 'X-Accept': 'application/json'
393 discovery: 393 discovery:
394 client: false 394 client: false
395
396# define custom entity so we can override length attribute to fix utf8mb4 issue
397craue_config:
398 entity_name: Wallabag\CoreBundle\Entity\InternalSetting
diff --git a/composer.json b/composer.json
index af9a9e62..e7fc256a 100644
--- a/composer.json
+++ b/composer.json
@@ -77,7 +77,7 @@
77 "kphoen/rulerz-bundle": "~0.13", 77 "kphoen/rulerz-bundle": "~0.13",
78 "guzzlehttp/guzzle": "^5.3.1", 78 "guzzlehttp/guzzle": "^5.3.1",
79 "doctrine/doctrine-migrations-bundle": "^1.3", 79 "doctrine/doctrine-migrations-bundle": "^1.3",
80 "craue/config-bundle": "dev-utf8mb4", 80 "craue/config-bundle": "^2.3.0",
81 "mnapoli/piwik-twig-extension": "^2.0", 81 "mnapoli/piwik-twig-extension": "^2.0",
82 "ocramius/proxy-manager": "^2.1.1", 82 "ocramius/proxy-manager": "^2.1.1",
83 "white-october/pagerfanta-bundle": "^1.1", 83 "white-october/pagerfanta-bundle": "^1.1",
@@ -166,11 +166,6 @@
166 "type": "vcs", 166 "type": "vcs",
167 "url": "https://github.com/Daniel-KM/PHPePub", 167 "url": "https://github.com/Daniel-KM/PHPePub",
168 "comment": "The most up-to-date PHPePub as of now" 168 "comment": "The most up-to-date PHPePub as of now"
169 },
170 {
171 "type": "vcs",
172 "url": "https://github.com/wallabag/CraueConfigBundle",
173 "comment": "To handle utf8mb4 field size"
174 } 169 }
175 ] 170 ]
176} 171}
diff --git a/composer.lock b/composer.lock
index 31d72e61..b81ad340 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "content-hash": "2dfef02524d5e64b49dfca4dc54353c0", 7 "content-hash": "02ec26b02dc55d65cb9353ad99be7ebe",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "bdunogier/guzzle-site-authenticator", 10 "name": "bdunogier/guzzle-site-authenticator",
@@ -209,34 +209,36 @@
209 }, 209 },
210 { 210 {
211 "name": "craue/config-bundle", 211 "name": "craue/config-bundle",
212 "version": "dev-utf8mb4", 212 "version": "2.3.0",
213 "source": { 213 "source": {
214 "type": "git", 214 "type": "git",
215 "url": "https://github.com/wallabag/CraueConfigBundle.git", 215 "url": "https://github.com/craue/CraueConfigBundle.git",
216 "reference": "46cfd37febc51d62e84e4c64fdb166e7495ca172" 216 "reference": "7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72"
217 }, 217 },
218 "dist": { 218 "dist": {
219 "type": "zip", 219 "type": "zip",
220 "url": "https://api.github.com/repos/wallabag/CraueConfigBundle/zipball/46cfd37febc51d62e84e4c64fdb166e7495ca172", 220 "url": "https://api.github.com/repos/craue/CraueConfigBundle/zipball/7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72",
221 "reference": "46cfd37febc51d62e84e4c64fdb166e7495ca172", 221 "reference": "7cf7447c7ee47853b3c60e5fc08a1c8f7112bd72",
222 "shasum": "" 222 "shasum": ""
223 }, 223 },
224 "require": { 224 "require": {
225 "doctrine/doctrine-bundle": "~1.3", 225 "doctrine/doctrine-bundle": "^1.5.1",
226 "php": "^5.3.9|~7.0", 226 "php": "~7.0",
227 "symfony/framework-bundle": "~2.7|~3.0|~4.0" 227 "psr/simple-cache": "^1.0",
228 "symfony/framework-bundle": "~3.4|~4.1"
228 }, 229 },
229 "require-dev": { 230 "require-dev": {
230 "doctrine/doctrine-cache-bundle": "~1.3", 231 "doctrine/doctrine-cache-bundle": "^1.3.5",
231 "doctrine/orm": "^2.3.1", 232 "doctrine/instantiator": "^1.0.5",
232 "phpunit/phpunit": "^4.8.35|~5.7|~6.0", 233 "doctrine/orm": "^2.5.14",
233 "symfony/phpunit-bridge": "~3.2|~4.0", 234 "phpunit/phpunit": "^6.5.13|^7.5.1",
234 "symfony/symfony": "~2.7|~3.0|~4.0" 235 "symfony/phpunit-bridge": "~3.4|~4.1",
236 "symfony/symfony": "~3.4|~4.1"
235 }, 237 },
236 "type": "symfony-bundle", 238 "type": "symfony-bundle",
237 "extra": { 239 "extra": {
238 "branch-alias": { 240 "branch-alias": {
239 "dev-master": "2.1.x-dev" 241 "dev-master": "2.3.x-dev"
240 } 242 }
241 }, 243 },
242 "autoload": { 244 "autoload": {
@@ -247,6 +249,7 @@
247 "/Tests/" 249 "/Tests/"
248 ] 250 ]
249 }, 251 },
252 "notification-url": "https://packagist.org/downloads/",
250 "license": [ 253 "license": [
251 "MIT" 254 "MIT"
252 ], 255 ],
@@ -264,14 +267,10 @@
264 "homepage": "https://github.com/craue/CraueConfigBundle", 267 "homepage": "https://github.com/craue/CraueConfigBundle",
265 "keywords": [ 268 "keywords": [
266 "config", 269 "config",
267 "symfony2",
268 "symfony3", 270 "symfony3",
269 "symfony4" 271 "symfony4"
270 ], 272 ],
271 "support": { 273 "time": "2019-08-01T15:52:03+00:00"
272 "source": "https://github.com/wallabag/CraueConfigBundle/tree/utf8mb4"
273 },
274 "time": "2018-11-28T19:15:35+00:00"
275 }, 274 },
276 { 275 {
277 "name": "defuse/php-encryption", 276 "name": "defuse/php-encryption",
@@ -3729,16 +3728,16 @@
3729 }, 3728 },
3730 { 3729 {
3731 "name": "j0k3r/graby-site-config", 3730 "name": "j0k3r/graby-site-config",
3732 "version": "1.0.88", 3731 "version": "1.0.89",
3733 "source": { 3732 "source": {
3734 "type": "git", 3733 "type": "git",
3735 "url": "https://github.com/j0k3r/graby-site-config.git", 3734 "url": "https://github.com/j0k3r/graby-site-config.git",
3736 "reference": "b485a36c31736b8834ebf62f42bd97fb333eefa7" 3735 "reference": "5052101225b3578a1a7258079ae8fe864b68e23e"
3737 }, 3736 },
3738 "dist": { 3737 "dist": {
3739 "type": "zip", 3738 "type": "zip",
3740 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/b485a36c31736b8834ebf62f42bd97fb333eefa7", 3739 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/5052101225b3578a1a7258079ae8fe864b68e23e",
3741 "reference": "b485a36c31736b8834ebf62f42bd97fb333eefa7", 3740 "reference": "5052101225b3578a1a7258079ae8fe864b68e23e",
3742 "shasum": "" 3741 "shasum": ""
3743 }, 3742 },
3744 "require": { 3743 "require": {
@@ -3746,7 +3745,7 @@
3746 }, 3745 },
3747 "require-dev": { 3746 "require-dev": {
3748 "liip/rmt": "1.2.*", 3747 "liip/rmt": "1.2.*",
3749 "symfony/phpunit-bridge": "^3.2" 3748 "symfony/phpunit-bridge": "^4.3"
3750 }, 3749 },
3751 "type": "library", 3750 "type": "library",
3752 "autoload": { 3751 "autoload": {
@@ -3765,7 +3764,7 @@
3765 } 3764 }
3766 ], 3765 ],
3767 "description": "Graby site config files", 3766 "description": "Graby site config files",
3768 "time": "2019-07-23T15:40:40+00:00" 3767 "time": "2019-08-05T11:10:32+00:00"
3769 }, 3768 },
3770 { 3769 {
3771 "name": "j0k3r/httplug-ssrf-plugin", 3770 "name": "j0k3r/httplug-ssrf-plugin",
@@ -4546,8 +4545,8 @@
4546 "authors": [ 4545 "authors": [
4547 { 4546 {
4548 "name": "Luís Otávio Cobucci Oblonczyk", 4547 "name": "Luís Otávio Cobucci Oblonczyk",
4549 "email": "lcobucci@gmail.com", 4548 "role": "Developer",
4550 "role": "Developer" 4549 "email": "lcobucci@gmail.com"
4551 } 4550 }
4552 ], 4551 ],
4553 "description": "A simple library to work with JSON Web Token and JSON Web Signature", 4552 "description": "A simple library to work with JSON Web Token and JSON Web Signature",
@@ -4685,16 +4684,16 @@
4685 }, 4684 },
4686 { 4685 {
4687 "name": "masterminds/html5", 4686 "name": "masterminds/html5",
4688 "version": "2.6.0", 4687 "version": "2.7.0",
4689 "source": { 4688 "source": {
4690 "type": "git", 4689 "type": "git",
4691 "url": "https://github.com/Masterminds/html5-php.git", 4690 "url": "https://github.com/Masterminds/html5-php.git",
4692 "reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad" 4691 "reference": "104443ad663d15981225f99532ba73c2f1d6b6f2"
4693 }, 4692 },
4694 "dist": { 4693 "dist": {
4695 "type": "zip", 4694 "type": "zip",
4696 "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad", 4695 "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/104443ad663d15981225f99532ba73c2f1d6b6f2",
4697 "reference": "c961ca6a0a81dc6b55b6859b3f9ea7f402edf9ad", 4696 "reference": "104443ad663d15981225f99532ba73c2f1d6b6f2",
4698 "shasum": "" 4697 "shasum": ""
4699 }, 4698 },
4700 "require": { 4699 "require": {
@@ -4711,7 +4710,7 @@
4711 "type": "library", 4710 "type": "library",
4712 "extra": { 4711 "extra": {
4713 "branch-alias": { 4712 "branch-alias": {
4714 "dev-master": "2.6-dev" 4713 "dev-master": "2.7-dev"
4715 } 4714 }
4716 }, 4715 },
4717 "autoload": { 4716 "autoload": {
@@ -4729,12 +4728,12 @@
4729 "email": "technosophos@gmail.com" 4728 "email": "technosophos@gmail.com"
4730 }, 4729 },
4731 { 4730 {
4732 "name": "Asmir Mustafic",
4733 "email": "goetas@gmail.com"
4734 },
4735 {
4736 "name": "Matt Farina", 4731 "name": "Matt Farina",
4737 "email": "matt@mattfarina.com" 4732 "email": "matt@mattfarina.com"
4733 },
4734 {
4735 "name": "Asmir Mustafic",
4736 "email": "goetas@gmail.com"
4738 } 4737 }
4739 ], 4738 ],
4740 "description": "An HTML5 parser and serializer.", 4739 "description": "An HTML5 parser and serializer.",
@@ -4748,7 +4747,7 @@
4748 "serializer", 4747 "serializer",
4749 "xml" 4748 "xml"
4750 ], 4749 ],
4751 "time": "2019-03-10T11:41:28+00:00" 4750 "time": "2019-07-25T07:03:26+00:00"
4752 }, 4751 },
4753 { 4752 {
4754 "name": "mgargano/simplehtmldom", 4753 "name": "mgargano/simplehtmldom",
@@ -6015,21 +6014,21 @@
6015 }, 6014 },
6016 { 6015 {
6017 "name": "php-http/message", 6016 "name": "php-http/message",
6018 "version": "1.7.2", 6017 "version": "1.8.0",
6019 "source": { 6018 "source": {
6020 "type": "git", 6019 "type": "git",
6021 "url": "https://github.com/php-http/message.git", 6020 "url": "https://github.com/php-http/message.git",
6022 "reference": "b159ffe570dffd335e22ef0b91a946eacb182fa1" 6021 "reference": "ce8f43ac1e294b54aabf5808515c3554a19c1e1c"
6023 }, 6022 },
6024 "dist": { 6023 "dist": {
6025 "type": "zip", 6024 "type": "zip",
6026 "url": "https://api.github.com/repos/php-http/message/zipball/b159ffe570dffd335e22ef0b91a946eacb182fa1", 6025 "url": "https://api.github.com/repos/php-http/message/zipball/ce8f43ac1e294b54aabf5808515c3554a19c1e1c",
6027 "reference": "b159ffe570dffd335e22ef0b91a946eacb182fa1", 6026 "reference": "ce8f43ac1e294b54aabf5808515c3554a19c1e1c",
6028 "shasum": "" 6027 "shasum": ""
6029 }, 6028 },
6030 "require": { 6029 "require": {
6031 "clue/stream-filter": "^1.4", 6030 "clue/stream-filter": "^1.4",
6032 "php": "^5.4 || ^7.0", 6031 "php": "^7.1",
6033 "php-http/message-factory": "^1.0.2", 6032 "php-http/message-factory": "^1.0.2",
6034 "psr/http-message": "^1.0" 6033 "psr/http-message": "^1.0"
6035 }, 6034 },
@@ -6055,7 +6054,7 @@
6055 "type": "library", 6054 "type": "library",
6056 "extra": { 6055 "extra": {
6057 "branch-alias": { 6056 "branch-alias": {
6058 "dev-master": "1.6-dev" 6057 "dev-master": "1.8-dev"
6059 } 6058 }
6060 }, 6059 },
6061 "autoload": { 6060 "autoload": {
@@ -6083,7 +6082,7 @@
6083 "message", 6082 "message",
6084 "psr-7" 6083 "psr-7"
6085 ], 6084 ],
6086 "time": "2018-11-01T09:32:41+00:00" 6085 "time": "2019-08-05T06:55:08+00:00"
6087 }, 6086 },
6088 { 6087 {
6089 "name": "php-http/message-factory", 6088 "name": "php-http/message-factory",
@@ -7859,16 +7858,16 @@
7859 }, 7858 },
7860 { 7859 {
7861 "name": "symfony/http-client", 7860 "name": "symfony/http-client",
7862 "version": "v4.3.2", 7861 "version": "v4.3.3",
7863 "source": { 7862 "source": {
7864 "type": "git", 7863 "type": "git",
7865 "url": "https://github.com/symfony/http-client.git", 7864 "url": "https://github.com/symfony/http-client.git",
7866 "reference": "e903ab079c99eab322fc5c71eb63fc467cd19a2a" 7865 "reference": "7759fabfbdf7f57a1d29655550b49c4ff04891a5"
7867 }, 7866 },
7868 "dist": { 7867 "dist": {
7869 "type": "zip", 7868 "type": "zip",
7870 "url": "https://api.github.com/repos/symfony/http-client/zipball/e903ab079c99eab322fc5c71eb63fc467cd19a2a", 7869 "url": "https://api.github.com/repos/symfony/http-client/zipball/7759fabfbdf7f57a1d29655550b49c4ff04891a5",
7871 "reference": "e903ab079c99eab322fc5c71eb63fc467cd19a2a", 7870 "reference": "7759fabfbdf7f57a1d29655550b49c4ff04891a5",
7872 "shasum": "" 7871 "shasum": ""
7873 }, 7872 },
7874 "require": { 7873 "require": {
@@ -7917,7 +7916,7 @@
7917 ], 7916 ],
7918 "description": "Symfony HttpClient component", 7917 "description": "Symfony HttpClient component",
7919 "homepage": "https://symfony.com", 7918 "homepage": "https://symfony.com",
7920 "time": "2019-06-26T07:29:23+00:00" 7919 "time": "2019-07-24T10:16:23+00:00"
7921 }, 7920 },
7922 { 7921 {
7923 "name": "symfony/http-client-contracts", 7922 "name": "symfony/http-client-contracts",
@@ -7978,16 +7977,16 @@
7978 }, 7977 },
7979 { 7978 {
7980 "name": "symfony/mime", 7979 "name": "symfony/mime",
7981 "version": "v4.3.2", 7980 "version": "v4.3.3",
7982 "source": { 7981 "source": {
7983 "type": "git", 7982 "type": "git",
7984 "url": "https://github.com/symfony/mime.git", 7983 "url": "https://github.com/symfony/mime.git",
7985 "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b" 7984 "reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b"
7986 }, 7985 },
7987 "dist": { 7986 "dist": {
7988 "type": "zip", 7987 "type": "zip",
7989 "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b", 7988 "url": "https://api.github.com/repos/symfony/mime/zipball/6b7148029b1dd5eda1502064f06d01357b7b2d8b",
7990 "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b", 7989 "reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b",
7991 "shasum": "" 7990 "shasum": ""
7992 }, 7991 },
7993 "require": { 7992 "require": {
@@ -8033,7 +8032,7 @@
8033 "mime", 8032 "mime",
8034 "mime-type" 8033 "mime-type"
8035 ], 8034 ],
8036 "time": "2019-06-04T09:22:54+00:00" 8035 "time": "2019-07-19T16:21:19+00:00"
8037 }, 8036 },
8038 { 8037 {
8039 "name": "symfony/monolog-bundle", 8038 "name": "symfony/monolog-bundle",
@@ -8100,16 +8099,16 @@
8100 }, 8099 },
8101 { 8100 {
8102 "name": "symfony/polyfill-apcu", 8101 "name": "symfony/polyfill-apcu",
8103 "version": "v1.11.0", 8102 "version": "v1.12.0",
8104 "source": { 8103 "source": {
8105 "type": "git", 8104 "type": "git",
8106 "url": "https://github.com/symfony/polyfill-apcu.git", 8105 "url": "https://github.com/symfony/polyfill-apcu.git",
8107 "reference": "a502face1da6a53289480166f24de2c3c68e5c3c" 8106 "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5"
8108 }, 8107 },
8109 "dist": { 8108 "dist": {
8110 "type": "zip", 8109 "type": "zip",
8111 "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a502face1da6a53289480166f24de2c3c68e5c3c", 8110 "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/71ce80635d5dcd67772b4dda00b86068595f64d5",
8112 "reference": "a502face1da6a53289480166f24de2c3c68e5c3c", 8111 "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5",
8113 "shasum": "" 8112 "shasum": ""
8114 }, 8113 },
8115 "require": { 8114 "require": {
@@ -8118,7 +8117,7 @@
8118 "type": "library", 8117 "type": "library",
8119 "extra": { 8118 "extra": {
8120 "branch-alias": { 8119 "branch-alias": {
8121 "dev-master": "1.11-dev" 8120 "dev-master": "1.12-dev"
8122 } 8121 }
8123 }, 8122 },
8124 "autoload": { 8123 "autoload": {
@@ -8152,20 +8151,20 @@
8152 "portable", 8151 "portable",
8153 "shim" 8152 "shim"
8154 ], 8153 ],
8155 "time": "2019-02-06T07:57:58+00:00" 8154 "time": "2019-08-06T08:03:45+00:00"
8156 }, 8155 },
8157 { 8156 {
8158 "name": "symfony/polyfill-ctype", 8157 "name": "symfony/polyfill-ctype",
8159 "version": "v1.11.0", 8158 "version": "v1.12.0",
8160 "source": { 8159 "source": {
8161 "type": "git", 8160 "type": "git",
8162 "url": "https://github.com/symfony/polyfill-ctype.git", 8161 "url": "https://github.com/symfony/polyfill-ctype.git",
8163 "reference": "82ebae02209c21113908c229e9883c419720738a" 8162 "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
8164 }, 8163 },
8165 "dist": { 8164 "dist": {
8166 "type": "zip", 8165 "type": "zip",
8167 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", 8166 "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
8168 "reference": "82ebae02209c21113908c229e9883c419720738a", 8167 "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
8169 "shasum": "" 8168 "shasum": ""
8170 }, 8169 },
8171 "require": { 8170 "require": {
@@ -8177,7 +8176,7 @@
8177 "type": "library", 8176 "type": "library",
8178 "extra": { 8177 "extra": {
8179 "branch-alias": { 8178 "branch-alias": {
8180 "dev-master": "1.11-dev" 8179 "dev-master": "1.12-dev"
8181 } 8180 }
8182 }, 8181 },
8183 "autoload": { 8182 "autoload": {
@@ -8194,12 +8193,12 @@
8194 ], 8193 ],
8195 "authors": [ 8194 "authors": [
8196 { 8195 {
8197 "name": "Symfony Community",
8198 "homepage": "https://symfony.com/contributors"
8199 },
8200 {
8201 "name": "Gert de Pagter", 8196 "name": "Gert de Pagter",
8202 "email": "BackEndTea@gmail.com" 8197 "email": "BackEndTea@gmail.com"
8198 },
8199 {
8200 "name": "Symfony Community",
8201 "homepage": "https://symfony.com/contributors"
8203 } 8202 }
8204 ], 8203 ],
8205 "description": "Symfony polyfill for ctype functions", 8204 "description": "Symfony polyfill for ctype functions",
@@ -8210,20 +8209,20 @@
8210 "polyfill", 8209 "polyfill",
8211 "portable" 8210 "portable"
8212 ], 8211 ],
8213 "time": "2019-02-06T07:57:58+00:00" 8212 "time": "2019-08-06T08:03:45+00:00"
8214 }, 8213 },
8215 { 8214 {
8216 "name": "symfony/polyfill-iconv", 8215 "name": "symfony/polyfill-iconv",
8217 "version": "v1.11.0", 8216 "version": "v1.12.0",
8218 "source": { 8217 "source": {
8219 "type": "git", 8218 "type": "git",
8220 "url": "https://github.com/symfony/polyfill-iconv.git", 8219 "url": "https://github.com/symfony/polyfill-iconv.git",
8221 "reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7" 8220 "reference": "685968b11e61a347c18bf25db32effa478be610f"
8222 }, 8221 },
8223 "dist": { 8222 "dist": {
8224 "type": "zip", 8223 "type": "zip",
8225 "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f037ea22acfaee983e271dd9c3b8bb4150bd8ad7", 8224 "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/685968b11e61a347c18bf25db32effa478be610f",
8226 "reference": "f037ea22acfaee983e271dd9c3b8bb4150bd8ad7", 8225 "reference": "685968b11e61a347c18bf25db32effa478be610f",
8227 "shasum": "" 8226 "shasum": ""
8228 }, 8227 },
8229 "require": { 8228 "require": {
@@ -8235,7 +8234,7 @@
8235 "type": "library", 8234 "type": "library",
8236 "extra": { 8235 "extra": {
8237 "branch-alias": { 8236 "branch-alias": {
8238 "dev-master": "1.11-dev" 8237 "dev-master": "1.12-dev"
8239 } 8238 }
8240 }, 8239 },
8241 "autoload": { 8240 "autoload": {
@@ -8269,25 +8268,25 @@
8269 "portable", 8268 "portable",
8270 "shim" 8269 "shim"
8271 ], 8270 ],
8272 "time": "2019-02-06T07:57:58+00:00" 8271 "time": "2019-08-06T08:03:45+00:00"
8273 }, 8272 },
8274 { 8273 {
8275 "name": "symfony/polyfill-intl-icu", 8274 "name": "symfony/polyfill-intl-icu",
8276 "version": "v1.11.0", 8275 "version": "v1.12.0",
8277 "source": { 8276 "source": {
8278 "type": "git", 8277 "type": "git",
8279 "url": "https://github.com/symfony/polyfill-intl-icu.git", 8278 "url": "https://github.com/symfony/polyfill-intl-icu.git",
8280 "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057" 8279 "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e"
8281 }, 8280 },
8282 "dist": { 8281 "dist": {
8283 "type": "zip", 8282 "type": "zip",
8284 "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/999878a3a09d73cae157b0cf89bb6fb2cc073057", 8283 "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66810b9d6eb4af54d543867909d65ab9af654d7e",
8285 "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057", 8284 "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e",
8286 "shasum": "" 8285 "shasum": ""
8287 }, 8286 },
8288 "require": { 8287 "require": {
8289 "php": ">=5.3.3", 8288 "php": ">=5.3.3",
8290 "symfony/intl": "~2.3|~3.0|~4.0" 8289 "symfony/intl": "~2.3|~3.0|~4.0|~5.0"
8291 }, 8290 },
8292 "suggest": { 8291 "suggest": {
8293 "ext-intl": "For best performance" 8292 "ext-intl": "For best performance"
@@ -8295,7 +8294,7 @@
8295 "type": "library", 8294 "type": "library",
8296 "extra": { 8295 "extra": {
8297 "branch-alias": { 8296 "branch-alias": {
8298 "dev-master": "1.9-dev" 8297 "dev-master": "1.12-dev"
8299 } 8298 }
8300 }, 8299 },
8301 "autoload": { 8300 "autoload": {
@@ -8327,20 +8326,20 @@
8327 "portable", 8326 "portable",
8328 "shim" 8327 "shim"
8329 ], 8328 ],
8330 "time": "2019-01-07T19:39:47+00:00" 8329 "time": "2019-08-06T08:03:45+00:00"
8331 }, 8330 },
8332 { 8331 {
8333 "name": "symfony/polyfill-intl-idn", 8332 "name": "symfony/polyfill-intl-idn",
8334 "version": "v1.11.0", 8333 "version": "v1.12.0",
8335 "source": { 8334 "source": {
8336 "type": "git", 8335 "type": "git",
8337 "url": "https://github.com/symfony/polyfill-intl-idn.git", 8336 "url": "https://github.com/symfony/polyfill-intl-idn.git",
8338 "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af" 8337 "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2"
8339 }, 8338 },
8340 "dist": { 8339 "dist": {
8341 "type": "zip", 8340 "type": "zip",
8342 "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c766e95bec706cdd89903b1eda8afab7d7a6b7af", 8341 "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
8343 "reference": "c766e95bec706cdd89903b1eda8afab7d7a6b7af", 8342 "reference": "6af626ae6fa37d396dc90a399c0ff08e5cfc45b2",
8344 "shasum": "" 8343 "shasum": ""
8345 }, 8344 },
8346 "require": { 8345 "require": {
@@ -8354,7 +8353,7 @@
8354 "type": "library", 8353 "type": "library",
8355 "extra": { 8354 "extra": {
8356 "branch-alias": { 8355 "branch-alias": {
8357 "dev-master": "1.9-dev" 8356 "dev-master": "1.12-dev"
8358 } 8357 }
8359 }, 8358 },
8360 "autoload": { 8359 "autoload": {
@@ -8371,12 +8370,12 @@
8371 ], 8370 ],
8372 "authors": [ 8371 "authors": [
8373 { 8372 {
8374 "name": "Symfony Community",
8375 "homepage": "https://symfony.com/contributors"
8376 },
8377 {
8378 "name": "Laurent Bassin", 8373 "name": "Laurent Bassin",
8379 "email": "laurent@bassin.info" 8374 "email": "laurent@bassin.info"
8375 },
8376 {
8377 "name": "Symfony Community",
8378 "homepage": "https://symfony.com/contributors"
8380 } 8379 }
8381 ], 8380 ],
8382 "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", 8381 "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
@@ -8389,20 +8388,20 @@
8389 "portable", 8388 "portable",
8390 "shim" 8389 "shim"
8391 ], 8390 ],
8392 "time": "2019-03-04T13:44:35+00:00" 8391 "time": "2019-08-06T08:03:45+00:00"
8393 }, 8392 },
8394 { 8393 {
8395 "name": "symfony/polyfill-mbstring", 8394 "name": "symfony/polyfill-mbstring",
8396 "version": "v1.11.0", 8395 "version": "v1.12.0",
8397 "source": { 8396 "source": {
8398 "type": "git", 8397 "type": "git",
8399 "url": "https://github.com/symfony/polyfill-mbstring.git", 8398 "url": "https://github.com/symfony/polyfill-mbstring.git",
8400 "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" 8399 "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17"
8401 }, 8400 },
8402 "dist": { 8401 "dist": {
8403 "type": "zip", 8402 "type": "zip",
8404 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", 8403 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17",
8405 "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", 8404 "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17",
8406 "shasum": "" 8405 "shasum": ""
8407 }, 8406 },
8408 "require": { 8407 "require": {
@@ -8414,7 +8413,7 @@
8414 "type": "library", 8413 "type": "library",
8415 "extra": { 8414 "extra": {
8416 "branch-alias": { 8415 "branch-alias": {
8417 "dev-master": "1.11-dev" 8416 "dev-master": "1.12-dev"
8418 } 8417 }
8419 }, 8418 },
8420 "autoload": { 8419 "autoload": {
@@ -8448,20 +8447,20 @@
8448 "portable", 8447 "portable",
8449 "shim" 8448 "shim"
8450 ], 8449 ],
8451 "time": "2019-02-06T07:57:58+00:00" 8450 "time": "2019-08-06T08:03:45+00:00"
8452 }, 8451 },
8453 { 8452 {
8454 "name": "symfony/polyfill-php56", 8453 "name": "symfony/polyfill-php56",
8455 "version": "v1.11.0", 8454 "version": "v1.12.0",
8456 "source": { 8455 "source": {
8457 "type": "git", 8456 "type": "git",
8458 "url": "https://github.com/symfony/polyfill-php56.git", 8457 "url": "https://github.com/symfony/polyfill-php56.git",
8459 "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42" 8458 "reference": "0e3b212e96a51338639d8ce175c046d7729c3403"
8460 }, 8459 },
8461 "dist": { 8460 "dist": {
8462 "type": "zip", 8461 "type": "zip",
8463 "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42", 8462 "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403",
8464 "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42", 8463 "reference": "0e3b212e96a51338639d8ce175c046d7729c3403",
8465 "shasum": "" 8464 "shasum": ""
8466 }, 8465 },
8467 "require": { 8466 "require": {
@@ -8471,7 +8470,7 @@
8471 "type": "library", 8470 "type": "library",
8472 "extra": { 8471 "extra": {
8473 "branch-alias": { 8472 "branch-alias": {
8474 "dev-master": "1.11-dev" 8473 "dev-master": "1.12-dev"
8475 } 8474 }
8476 }, 8475 },
8477 "autoload": { 8476 "autoload": {
@@ -8504,20 +8503,20 @@
8504 "portable", 8503 "portable",
8505 "shim" 8504 "shim"
8506 ], 8505 ],
8507 "time": "2019-02-06T07:57:58+00:00" 8506 "time": "2019-08-06T08:03:45+00:00"
8508 }, 8507 },
8509 { 8508 {
8510 "name": "symfony/polyfill-php70", 8509 "name": "symfony/polyfill-php70",
8511 "version": "v1.11.0", 8510 "version": "v1.12.0",
8512 "source": { 8511 "source": {
8513 "type": "git", 8512 "type": "git",
8514 "url": "https://github.com/symfony/polyfill-php70.git", 8513 "url": "https://github.com/symfony/polyfill-php70.git",
8515 "reference": "bc4858fb611bda58719124ca079baff854149c89" 8514 "reference": "54b4c428a0054e254223797d2713c31e08610831"
8516 }, 8515 },
8517 "dist": { 8516 "dist": {
8518 "type": "zip", 8517 "type": "zip",
8519 "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89", 8518 "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831",
8520 "reference": "bc4858fb611bda58719124ca079baff854149c89", 8519 "reference": "54b4c428a0054e254223797d2713c31e08610831",
8521 "shasum": "" 8520 "shasum": ""
8522 }, 8521 },
8523 "require": { 8522 "require": {
@@ -8527,7 +8526,7 @@
8527 "type": "library", 8526 "type": "library",
8528 "extra": { 8527 "extra": {
8529 "branch-alias": { 8528 "branch-alias": {
8530 "dev-master": "1.11-dev" 8529 "dev-master": "1.12-dev"
8531 } 8530 }
8532 }, 8531 },
8533 "autoload": { 8532 "autoload": {
@@ -8563,20 +8562,20 @@
8563 "portable", 8562 "portable",
8564 "shim" 8563 "shim"
8565 ], 8564 ],
8566 "time": "2019-02-06T07:57:58+00:00" 8565 "time": "2019-08-06T08:03:45+00:00"
8567 }, 8566 },
8568 { 8567 {
8569 "name": "symfony/polyfill-php72", 8568 "name": "symfony/polyfill-php72",
8570 "version": "v1.11.0", 8569 "version": "v1.12.0",
8571 "source": { 8570 "source": {
8572 "type": "git", 8571 "type": "git",
8573 "url": "https://github.com/symfony/polyfill-php72.git", 8572 "url": "https://github.com/symfony/polyfill-php72.git",
8574 "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c" 8573 "reference": "04ce3335667451138df4307d6a9b61565560199e"
8575 }, 8574 },
8576 "dist": { 8575 "dist": {
8577 "type": "zip", 8576 "type": "zip",
8578 "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c", 8577 "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/04ce3335667451138df4307d6a9b61565560199e",
8579 "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c", 8578 "reference": "04ce3335667451138df4307d6a9b61565560199e",
8580 "shasum": "" 8579 "shasum": ""
8581 }, 8580 },
8582 "require": { 8581 "require": {
@@ -8585,7 +8584,7 @@
8585 "type": "library", 8584 "type": "library",
8586 "extra": { 8585 "extra": {
8587 "branch-alias": { 8586 "branch-alias": {
8588 "dev-master": "1.11-dev" 8587 "dev-master": "1.12-dev"
8589 } 8588 }
8590 }, 8589 },
8591 "autoload": { 8590 "autoload": {
@@ -8618,20 +8617,20 @@
8618 "portable", 8617 "portable",
8619 "shim" 8618 "shim"
8620 ], 8619 ],
8621 "time": "2019-02-06T07:57:58+00:00" 8620 "time": "2019-08-06T08:03:45+00:00"
8622 }, 8621 },
8623 { 8622 {
8624 "name": "symfony/polyfill-php73", 8623 "name": "symfony/polyfill-php73",
8625 "version": "v1.11.0", 8624 "version": "v1.12.0",
8626 "source": { 8625 "source": {
8627 "type": "git", 8626 "type": "git",
8628 "url": "https://github.com/symfony/polyfill-php73.git", 8627 "url": "https://github.com/symfony/polyfill-php73.git",
8629 "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd" 8628 "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188"
8630 }, 8629 },
8631 "dist": { 8630 "dist": {
8632 "type": "zip", 8631 "type": "zip",
8633 "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", 8632 "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/2ceb49eaccb9352bff54d22570276bb75ba4a188",
8634 "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", 8633 "reference": "2ceb49eaccb9352bff54d22570276bb75ba4a188",
8635 "shasum": "" 8634 "shasum": ""
8636 }, 8635 },
8637 "require": { 8636 "require": {
@@ -8640,7 +8639,7 @@
8640 "type": "library", 8639 "type": "library",
8641 "extra": { 8640 "extra": {
8642 "branch-alias": { 8641 "branch-alias": {
8643 "dev-master": "1.11-dev" 8642 "dev-master": "1.12-dev"
8644 } 8643 }
8645 }, 8644 },
8646 "autoload": { 8645 "autoload": {
@@ -8676,20 +8675,20 @@
8676 "portable", 8675 "portable",
8677 "shim" 8676 "shim"
8678 ], 8677 ],
8679 "time": "2019-02-06T07:57:58+00:00" 8678 "time": "2019-08-06T08:03:45+00:00"
8680 }, 8679 },
8681 { 8680 {
8682 "name": "symfony/polyfill-util", 8681 "name": "symfony/polyfill-util",
8683 "version": "v1.11.0", 8682 "version": "v1.12.0",
8684 "source": { 8683 "source": {
8685 "type": "git", 8684 "type": "git",
8686 "url": "https://github.com/symfony/polyfill-util.git", 8685 "url": "https://github.com/symfony/polyfill-util.git",
8687 "reference": "b46c6cae28a3106735323f00a0c38eccf2328897" 8686 "reference": "4317de1386717b4c22caed7725350a8887ab205c"
8688 }, 8687 },
8689 "dist": { 8688 "dist": {
8690 "type": "zip", 8689 "type": "zip",
8691 "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897", 8690 "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c",
8692 "reference": "b46c6cae28a3106735323f00a0c38eccf2328897", 8691 "reference": "4317de1386717b4c22caed7725350a8887ab205c",
8693 "shasum": "" 8692 "shasum": ""
8694 }, 8693 },
8695 "require": { 8694 "require": {
@@ -8698,7 +8697,7 @@
8698 "type": "library", 8697 "type": "library",
8699 "extra": { 8698 "extra": {
8700 "branch-alias": { 8699 "branch-alias": {
8701 "dev-master": "1.11-dev" 8700 "dev-master": "1.12-dev"
8702 } 8701 }
8703 }, 8702 },
8704 "autoload": { 8703 "autoload": {
@@ -8728,7 +8727,7 @@
8728 "polyfill", 8727 "polyfill",
8729 "shim" 8728 "shim"
8730 ], 8729 ],
8731 "time": "2019-02-08T14:16:39+00:00" 8730 "time": "2019-08-06T08:03:45+00:00"
8732 }, 8731 },
8733 { 8732 {
8734 "name": "symfony/swiftmailer-bundle", 8733 "name": "symfony/swiftmailer-bundle",
@@ -9120,23 +9119,21 @@
9120 }, 9119 },
9121 { 9120 {
9122 "name": "wallabag/php-mobi", 9121 "name": "wallabag/php-mobi",
9123 "version": "1.0.1", 9122 "version": "1.1.0",
9124 "source": { 9123 "source": {
9125 "type": "git", 9124 "type": "git",
9126 "url": "https://github.com/wallabag/php-mobi.git", 9125 "url": "https://github.com/wallabag/php-mobi.git",
9127 "reference": "1cd7d022fe6be838535d6bba917d19cc48dcf487" 9126 "reference": "bfe9c18d038e5ca24664cfdab107a645ac57c9b5"
9128 }, 9127 },
9129 "dist": { 9128 "dist": {
9130 "type": "zip", 9129 "type": "zip",
9131 "url": "https://api.github.com/repos/wallabag/php-mobi/zipball/1cd7d022fe6be838535d6bba917d19cc48dcf487", 9130 "url": "https://api.github.com/repos/wallabag/php-mobi/zipball/bfe9c18d038e5ca24664cfdab107a645ac57c9b5",
9132 "reference": "1cd7d022fe6be838535d6bba917d19cc48dcf487", 9131 "reference": "bfe9c18d038e5ca24664cfdab107a645ac57c9b5",
9133 "shasum": "" 9132 "shasum": ""
9134 }, 9133 },
9135 "require": { 9134 "require": {
9136 "php": ">=5.3.0" 9135 "php": ">=5.3.0",
9137 }, 9136 "symfony/polyfill-mbstring": "^1.12"
9138 "replace": {
9139 "wallabag/phpmobi": "*"
9140 }, 9137 },
9141 "type": "library", 9138 "type": "library",
9142 "autoload": { 9139 "autoload": {
@@ -9150,19 +9147,19 @@
9150 ], 9147 ],
9151 "authors": [ 9148 "authors": [
9152 { 9149 {
9153 "name": "Nicolas Lœuillet",
9154 "email": "nicolas@loeuillet.org",
9155 "homepage": "http://www.cdetc.fr"
9156 },
9157 {
9158 "name": "Sander Kromwijk", 9150 "name": "Sander Kromwijk",
9159 "role": "Original developer", 9151 "role": "Original developer",
9160 "email": "s.kromwijk@gmail.co" 9152 "email": "s.kromwijk@gmail.co"
9153 },
9154 {
9155 "name": "Nicolas Lœuillet",
9156 "email": "nicolas@loeuillet.org",
9157 "homepage": "http://www.cdetc.fr"
9161 } 9158 }
9162 ], 9159 ],
9163 "description": "A Mobipocket file (.mobi) creator in PHP.", 9160 "description": "A Mobipocket file (.mobi) creator in PHP.",
9164 "homepage": "https://github.com/wallabag/phpMobi", 9161 "homepage": "https://github.com/wallabag/php-mobi",
9165 "time": "2015-10-16T08:42:42+00:00" 9162 "time": "2019-08-08T12:26:23+00:00"
9166 }, 9163 },
9167 { 9164 {
9168 "name": "wallabag/tcpdf", 9165 "name": "wallabag/tcpdf",
@@ -10176,16 +10173,16 @@
10176 }, 10173 },
10177 { 10174 {
10178 "name": "nette/di", 10175 "name": "nette/di",
10179 "version": "v3.0.0", 10176 "version": "v3.0.1",
10180 "source": { 10177 "source": {
10181 "type": "git", 10178 "type": "git",
10182 "url": "https://github.com/nette/di.git", 10179 "url": "https://github.com/nette/di.git",
10183 "reference": "19d83539245aaacb59470828919182411061841f" 10180 "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d"
10184 }, 10181 },
10185 "dist": { 10182 "dist": {
10186 "type": "zip", 10183 "type": "zip",
10187 "url": "https://api.github.com/repos/nette/di/zipball/19d83539245aaacb59470828919182411061841f", 10184 "url": "https://api.github.com/repos/nette/di/zipball/4aff517a1c6bb5c36fa09733d4cea089f529de6d",
10188 "reference": "19d83539245aaacb59470828919182411061841f", 10185 "reference": "4aff517a1c6bb5c36fa09733d4cea089f529de6d",
10189 "shasum": "" 10186 "shasum": ""
10190 }, 10187 },
10191 "require": { 10188 "require": {
@@ -10245,7 +10242,7 @@
10245 "nette", 10242 "nette",
10246 "static" 10243 "static"
10247 ], 10244 ],
10248 "time": "2019-04-03T19:35:46+00:00" 10245 "time": "2019-08-07T12:11:33+00:00"
10249 }, 10246 },
10250 { 10247 {
10251 "name": "nette/finder", 10248 "name": "nette/finder",
@@ -11222,7 +11219,6 @@
11222 "minimum-stability": "dev", 11219 "minimum-stability": "dev",
11223 "stability-flags": { 11220 "stability-flags": {
11224 "grandt/phpepub": 20, 11221 "grandt/phpepub": 20,
11225 "craue/config-bundle": 20,
11226 "predis/predis": 20 11222 "predis/predis": 20
11227 }, 11223 },
11228 "prefer-stable": true, 11224 "prefer-stable": true,
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 50e19f0c..f73e0696 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -2,7 +2,6 @@
2 2
3namespace Wallabag\CoreBundle\Command; 3namespace Wallabag\CoreBundle\Command;
4 4
5use Craue\ConfigBundle\Entity\Setting;
6use FOS\UserBundle\Event\UserEvent; 5use FOS\UserBundle\Event\UserEvent;
7use FOS\UserBundle\FOSUserEvents; 6use FOS\UserBundle\FOSUserEvents;
8use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; 7use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
@@ -13,6 +12,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
13use Symfony\Component\Console\Output\OutputInterface; 12use Symfony\Component\Console\Output\OutputInterface;
14use Symfony\Component\Console\Question\Question; 13use Symfony\Component\Console\Question\Question;
15use Symfony\Component\Console\Style\SymfonyStyle; 14use Symfony\Component\Console\Style\SymfonyStyle;
15use Wallabag\CoreBundle\Entity\InternalSetting;
16 16
17class InstallCommand extends ContainerAwareCommand 17class InstallCommand extends ContainerAwareCommand
18{ 18{
@@ -276,10 +276,10 @@ class InstallCommand extends ContainerAwareCommand
276 $em = $this->getContainer()->get('doctrine.orm.entity_manager'); 276 $em = $this->getContainer()->get('doctrine.orm.entity_manager');
277 277
278 // cleanup before insert new stuff 278 // cleanup before insert new stuff
279 $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute(); 279 $em->createQuery('DELETE FROM WallabagCoreBundle:InternalSetting')->execute();
280 280
281 foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) { 281 foreach ($this->getContainer()->getParameter('wallabag_core.default_internal_settings') as $setting) {
282 $newSetting = new Setting(); 282 $newSetting = new InternalSetting();
283 $newSetting->setName($setting['name']); 283 $newSetting->setName($setting['name']);
284 $newSetting->setValue($setting['value']); 284 $newSetting->setValue($setting['value']);
285 $newSetting->setSection($setting['section']); 285 $newSetting->setSection($setting['section']);
diff --git a/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php
index cc7d1f59..b052d1d5 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/SettingFixtures.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/InternalSettingFixtures.php
@@ -2,13 +2,13 @@
2 2
3namespace Wallabag\CoreBundle\DataFixtures; 3namespace Wallabag\CoreBundle\DataFixtures;
4 4
5use Craue\ConfigBundle\Entity\Setting;
6use Doctrine\Bundle\FixturesBundle\Fixture; 5use Doctrine\Bundle\FixturesBundle\Fixture;
7use Doctrine\Common\Persistence\ObjectManager; 6use Doctrine\Common\Persistence\ObjectManager;
8use Symfony\Component\DependencyInjection\ContainerAwareInterface; 7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
9use Symfony\Component\DependencyInjection\ContainerInterface; 8use Symfony\Component\DependencyInjection\ContainerInterface;
9use Wallabag\CoreBundle\Entity\InternalSetting;
10 10
11class SettingFixtures extends Fixture implements ContainerAwareInterface 11class InternalSettingFixtures extends Fixture implements ContainerAwareInterface
12{ 12{
13 /** 13 /**
14 * @var ContainerInterface 14 * @var ContainerInterface
@@ -26,7 +26,7 @@ class SettingFixtures extends Fixture implements ContainerAwareInterface
26 public function load(ObjectManager $manager) 26 public function load(ObjectManager $manager)
27 { 27 {
28 foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) { 28 foreach ($this->container->getParameter('wallabag_core.default_internal_settings') as $setting) {
29 $newSetting = new Setting(); 29 $newSetting = new InternalSetting();
30 $newSetting->setName($setting['name']); 30 $newSetting->setName($setting['name']);
31 $newSetting->setValue($setting['value']); 31 $newSetting->setValue($setting['value']);
32 $newSetting->setSection($setting['section']); 32 $newSetting->setSection($setting['section']);
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index 5181d91d..35be9655 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -17,7 +17,6 @@ use Wallabag\UserBundle\Entity\User;
17 * @ORM\Index(name="config_feed_token", columns={"feed_token"}, options={"lengths"={255}}), 17 * @ORM\Index(name="config_feed_token", columns={"feed_token"}, options={"lengths"={255}}),
18 * } 18 * }
19 * ) 19 * )
20 * @ORM\Entity
21 */ 20 */
22class Config 21class Config
23{ 22{
diff --git a/src/Wallabag/CoreBundle/Entity/InternalSetting.php b/src/Wallabag/CoreBundle/Entity/InternalSetting.php
new file mode 100644
index 00000000..df8bd3be
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/InternalSetting.php
@@ -0,0 +1,36 @@
1<?php
2
3namespace Wallabag\CoreBundle\Entity;
4
5use Craue\ConfigBundle\Entity\BaseSetting;
6use Doctrine\ORM\Mapping as ORM;
7
8/**
9 * InternalSetting.
10 *
11 * Re-define setting so we can override length attribute to fix utf8mb4 issue.
12 *
13 * @ORM\Entity(repositoryClass="Craue\ConfigBundle\Repository\SettingRepository")
14 * @ORM\Table(name="`internal_setting`")
15 * @ORM\AttributeOverrides({
16 * @ORM\AttributeOverride(name="name",
17 * column=@ORM\Column(
18 * length = 191
19 * )
20 * ),
21 * @ORM\AttributeOverride(name="section",
22 * column=@ORM\Column(
23 * length = 191
24 * )
25 * )
26 * })
27 */
28class InternalSetting extends BaseSetting
29{
30 /**
31 * @var string|null
32 *
33 * @ORM\Column(name="value", type="string", nullable=true, length=191)
34 */
35 protected $value;
36}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:25:13 +0000