aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json2
-rw-r--r--composer.lock457
-rw-r--r--src/Wallabag/CoreBundle/Controller/FeedController.php2
-rw-r--r--src/Wallabag/CoreBundle/Twig/WallabagExtension.php23
-rw-r--r--src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php17
-rw-r--r--tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php4
6 files changed, 352 insertions, 153 deletions
diff --git a/composer.json b/composer.json
index 44ac3474..46dc409b 100644
--- a/composer.json
+++ b/composer.json
@@ -78,7 +78,7 @@
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": "dev-utf8mb4",
81 "mnapoli/piwik-twig-extension": "^1.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",
84 "php-amqplib/rabbitmq-bundle": "^1.14", 84 "php-amqplib/rabbitmq-bundle": "^1.14",
diff --git a/composer.lock b/composer.lock
index bdbd268d..8ff8fba8 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": "7e872d70c69629db503d9b8ed18e0f40", 7 "content-hash": "7b43c6d21bc5016660c4e95aa0fdbc12",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "bdunogier/guzzle-site-authenticator", 10 "name": "bdunogier/guzzle-site-authenticator",
@@ -153,62 +153,6 @@
153 "time": "2019-04-09T12:31:48+00:00" 153 "time": "2019-04-09T12:31:48+00:00"
154 }, 154 },
155 { 155 {
156 "name": "composer/ca-bundle",
157 "version": "1.1.4",
158 "source": {
159 "type": "git",
160 "url": "https://github.com/composer/ca-bundle.git",
161 "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d"
162 },
163 "dist": {
164 "type": "zip",
165 "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
166 "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d",
167 "shasum": ""
168 },
169 "require": {
170 "ext-openssl": "*",
171 "ext-pcre": "*",
172 "php": "^5.3.2 || ^7.0"
173 },
174 "require-dev": {
175 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
176 "psr/log": "^1.0",
177 "symfony/process": "^2.5 || ^3.0 || ^4.0"
178 },
179 "type": "library",
180 "extra": {
181 "branch-alias": {
182 "dev-master": "1.x-dev"
183 }
184 },
185 "autoload": {
186 "psr-4": {
187 "Composer\\CaBundle\\": "src"
188 }
189 },
190 "notification-url": "https://packagist.org/downloads/",
191 "license": [
192 "MIT"
193 ],
194 "authors": [
195 {
196 "name": "Jordi Boggiano",
197 "email": "j.boggiano@seld.be",
198 "homepage": "http://seld.be"
199 }
200 ],
201 "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
202 "keywords": [
203 "cabundle",
204 "cacert",
205 "certificate",
206 "ssl",
207 "tls"
208 ],
209 "time": "2019-01-28T09:30:10+00:00"
210 },
211 {
212 "name": "craue/config-bundle", 156 "name": "craue/config-bundle",
213 "version": "dev-utf8mb4", 157 "version": "dev-utf8mb4",
214 "source": { 158 "source": {
@@ -3725,16 +3669,16 @@
3725 }, 3669 },
3726 { 3670 {
3727 "name": "j0k3r/graby-site-config", 3671 "name": "j0k3r/graby-site-config",
3728 "version": "1.0.84", 3672 "version": "1.0.85",
3729 "source": { 3673 "source": {
3730 "type": "git", 3674 "type": "git",
3731 "url": "https://github.com/j0k3r/graby-site-config.git", 3675 "url": "https://github.com/j0k3r/graby-site-config.git",
3732 "reference": "37ae71639d3844d022ea402a1f87af7e28d12cac" 3676 "reference": "64e6092f583ecc55db0b9e8e33162a4fca2f6659"
3733 }, 3677 },
3734 "dist": { 3678 "dist": {
3735 "type": "zip", 3679 "type": "zip",
3736 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/37ae71639d3844d022ea402a1f87af7e28d12cac", 3680 "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/64e6092f583ecc55db0b9e8e33162a4fca2f6659",
3737 "reference": "37ae71639d3844d022ea402a1f87af7e28d12cac", 3681 "reference": "64e6092f583ecc55db0b9e8e33162a4fca2f6659",
3738 "shasum": "" 3682 "shasum": ""
3739 }, 3683 },
3740 "require": { 3684 "require": {
@@ -3761,7 +3705,7 @@
3761 } 3705 }
3762 ], 3706 ],
3763 "description": "Graby site config files", 3707 "description": "Graby site config files",
3764 "time": "2019-05-23T07:28:03+00:00" 3708 "time": "2019-06-07T20:24:21+00:00"
3765 }, 3709 },
3766 { 3710 {
3767 "name": "j0k3r/httplug-ssrf-plugin", 3711 "name": "j0k3r/httplug-ssrf-plugin",
@@ -4618,34 +4562,34 @@
4618 }, 4562 },
4619 { 4563 {
4620 "name": "liip/theme-bundle", 4564 "name": "liip/theme-bundle",
4621 "version": "1.6.1", 4565 "version": "1.7.0",
4622 "source": { 4566 "source": {
4623 "type": "git", 4567 "type": "git",
4624 "url": "https://github.com/liip/LiipThemeBundle.git", 4568 "url": "https://github.com/liip/LiipThemeBundle.git",
4625 "reference": "f40637ce0523a4e0968e203c09a46acfa4b95d4d" 4569 "reference": "362394821ff8dcc90b06272e289e7dafe4dab52a"
4626 }, 4570 },
4627 "dist": { 4571 "dist": {
4628 "type": "zip", 4572 "type": "zip",
4629 "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/f40637ce0523a4e0968e203c09a46acfa4b95d4d", 4573 "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/362394821ff8dcc90b06272e289e7dafe4dab52a",
4630 "reference": "f40637ce0523a4e0968e203c09a46acfa4b95d4d", 4574 "reference": "362394821ff8dcc90b06272e289e7dafe4dab52a",
4631 "shasum": "" 4575 "shasum": ""
4632 }, 4576 },
4633 "require": { 4577 "require": {
4634 "php": "^5.3.9|^7.0", 4578 "php": "^7.0",
4635 "psr/log": "~1.0", 4579 "psr/log": "~1.0",
4636 "symfony/finder": "^2.7|^3.0|^4.0", 4580 "symfony/finder": "^3.0|^4.0",
4637 "symfony/framework-bundle": "^2.7|^3.0|^4.0", 4581 "symfony/framework-bundle": "^3.0|^4.0",
4638 "symfony/templating": "^2.7|^3.0|^4.0", 4582 "symfony/templating": "^3.0|^4.0",
4639 "symfony/twig-bundle": "^2.7|^3.0|^4.0", 4583 "symfony/twig-bundle": "^3.0|^4.0",
4640 "twig/twig": "^1.27|^2.0" 4584 "twig/twig": "^1.34|^2.4"
4641 }, 4585 },
4642 "conflict": { 4586 "conflict": {
4643 "sebastian/comparator": "1.2.3" 4587 "sebastian/comparator": "1.2.3"
4644 }, 4588 },
4645 "require-dev": { 4589 "require-dev": {
4646 "phpunit/phpunit": "^4.8.35|^6.0", 4590 "phpunit/phpunit": "^6.0",
4647 "symfony/console": "^2.7|^3.0|^4.0", 4591 "symfony/console": "^3.0|^4.0",
4648 "symfony/expression-language": "^2.7|^3.0|^4.0" 4592 "symfony/expression-language": "^3.0|^4.0"
4649 }, 4593 },
4650 "type": "symfony-bundle", 4594 "type": "symfony-bundle",
4651 "extra": { 4595 "extra": {
@@ -4677,7 +4621,7 @@
4677 "themes", 4621 "themes",
4678 "theming" 4622 "theming"
4679 ], 4623 ],
4680 "time": "2018-10-08T07:20:20+00:00" 4624 "time": "2019-06-19T12:53:08+00:00"
4681 }, 4625 },
4682 { 4626 {
4683 "name": "masterminds/html5", 4627 "name": "masterminds/html5",
@@ -4839,24 +4783,25 @@
4839 }, 4783 },
4840 { 4784 {
4841 "name": "mnapoli/piwik-twig-extension", 4785 "name": "mnapoli/piwik-twig-extension",
4842 "version": "1.0.0", 4786 "version": "2.0.0",
4843 "source": { 4787 "source": {
4844 "type": "git", 4788 "type": "git",
4845 "url": "https://github.com/mnapoli/PiwikTwigExtension.git", 4789 "url": "https://github.com/mnapoli/PiwikTwigExtension.git",
4846 "reference": "5171ab7221830a9d377add03dd60dbe6bd7b331f" 4790 "reference": "95cafbaca13e436b1939fe0e70079f6db893fd51"
4847 }, 4791 },
4848 "dist": { 4792 "dist": {
4849 "type": "zip", 4793 "type": "zip",
4850 "url": "https://api.github.com/repos/mnapoli/PiwikTwigExtension/zipball/5171ab7221830a9d377add03dd60dbe6bd7b331f", 4794 "url": "https://api.github.com/repos/mnapoli/PiwikTwigExtension/zipball/95cafbaca13e436b1939fe0e70079f6db893fd51",
4851 "reference": "5171ab7221830a9d377add03dd60dbe6bd7b331f", 4795 "reference": "95cafbaca13e436b1939fe0e70079f6db893fd51",
4852 "shasum": "" 4796 "shasum": ""
4853 }, 4797 },
4854 "require": { 4798 "require": {
4855 "php": ">=5.4", 4799 "php": ">=7.0",
4856 "twig/twig": "~1.10" 4800 "twig/twig": "~2.10"
4857 }, 4801 },
4858 "require-dev": { 4802 "require-dev": {
4859 "phpunit/phpunit": "~4.0" 4803 "php-coveralls/php-coveralls": "^2.0",
4804 "symfony/phpunit-bridge": "^4.2"
4860 }, 4805 },
4861 "type": "library", 4806 "type": "library",
4862 "autoload": { 4807 "autoload": {
@@ -4868,7 +4813,7 @@
4868 "license": [ 4813 "license": [
4869 "MIT" 4814 "MIT"
4870 ], 4815 ],
4871 "time": "2014-09-16T06:51:19+00:00" 4816 "time": "2019-06-21T10:24:22+00:00"
4872 }, 4817 },
4873 { 4818 {
4874 "name": "monolog/monolog", 4819 "name": "monolog/monolog",
@@ -7127,21 +7072,21 @@
7127 }, 7072 },
7128 { 7073 {
7129 "name": "sensio/distribution-bundle", 7074 "name": "sensio/distribution-bundle",
7130 "version": "v5.0.24", 7075 "version": "v5.0.25",
7131 "source": { 7076 "source": {
7132 "type": "git", 7077 "type": "git",
7133 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", 7078 "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
7134 "reference": "59eac70f15f97ee945924948a6f5e2f6f86b7a4b" 7079 "reference": "80a38234bde8321fb92aa0b8c27978a272bb4baf"
7135 }, 7080 },
7136 "dist": { 7081 "dist": {
7137 "type": "zip", 7082 "type": "zip",
7138 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/59eac70f15f97ee945924948a6f5e2f6f86b7a4b", 7083 "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/80a38234bde8321fb92aa0b8c27978a272bb4baf",
7139 "reference": "59eac70f15f97ee945924948a6f5e2f6f86b7a4b", 7084 "reference": "80a38234bde8321fb92aa0b8c27978a272bb4baf",
7140 "shasum": "" 7085 "shasum": ""
7141 }, 7086 },
7142 "require": { 7087 "require": {
7143 "php": ">=5.3.9", 7088 "php": ">=5.3.9",
7144 "sensiolabs/security-checker": "~5.0", 7089 "sensiolabs/security-checker": "~5.0|~6.0",
7145 "symfony/class-loader": "~2.3|~3.0", 7090 "symfony/class-loader": "~2.3|~3.0",
7146 "symfony/config": "~2.3|~3.0", 7091 "symfony/config": "~2.3|~3.0",
7147 "symfony/dependency-injection": "~2.3|~3.0", 7092 "symfony/dependency-injection": "~2.3|~3.0",
@@ -7175,7 +7120,7 @@
7175 "configuration", 7120 "configuration",
7176 "distribution" 7121 "distribution"
7177 ], 7122 ],
7178 "time": "2018-12-14T17:36:15+00:00" 7123 "time": "2019-06-18T15:43:58+00:00"
7179 }, 7124 },
7180 { 7125 {
7181 "name": "sensio/framework-extra-bundle", 7126 "name": "sensio/framework-extra-bundle",
@@ -7252,22 +7197,24 @@
7252 }, 7197 },
7253 { 7198 {
7254 "name": "sensiolabs/security-checker", 7199 "name": "sensiolabs/security-checker",
7255 "version": "v5.0.3", 7200 "version": "v6.0.1",
7256 "source": { 7201 "source": {
7257 "type": "git", 7202 "type": "git",
7258 "url": "https://github.com/sensiolabs/security-checker.git", 7203 "url": "https://github.com/sensiolabs/security-checker.git",
7259 "reference": "46be3f58adac13084497961e10eed9a7fb4d44d1" 7204 "reference": "ce8d0552dcb8d3677ab9adb6d19a5837949bfec4"
7260 }, 7205 },
7261 "dist": { 7206 "dist": {
7262 "type": "zip", 7207 "type": "zip",
7263 "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/46be3f58adac13084497961e10eed9a7fb4d44d1", 7208 "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/ce8d0552dcb8d3677ab9adb6d19a5837949bfec4",
7264 "reference": "46be3f58adac13084497961e10eed9a7fb4d44d1", 7209 "reference": "ce8d0552dcb8d3677ab9adb6d19a5837949bfec4",
7265 "shasum": "" 7210 "shasum": ""
7266 }, 7211 },
7267 "require": { 7212 "require": {
7268 "composer/ca-bundle": "^1.0", 7213 "php": ">=7.1.3",
7269 "php": ">=5.5.9", 7214 "symfony/console": "^2.8|^3.4|^4.2",
7270 "symfony/console": "~2.7|~3.0|~4.0" 7215 "symfony/http-client": "^4.3",
7216 "symfony/mime": "^4.3",
7217 "symfony/polyfill-ctype": "^1.11"
7271 }, 7218 },
7272 "bin": [ 7219 "bin": [
7273 "security-checker" 7220 "security-checker"
@@ -7275,7 +7222,7 @@
7275 "type": "library", 7222 "type": "library",
7276 "extra": { 7223 "extra": {
7277 "branch-alias": { 7224 "branch-alias": {
7278 "dev-master": "5.0-dev" 7225 "dev-master": "6.0-dev"
7279 } 7226 }
7280 }, 7227 },
7281 "autoload": { 7228 "autoload": {
@@ -7294,7 +7241,7 @@
7294 } 7241 }
7295 ], 7242 ],
7296 "description": "A security checker for your composer.lock", 7243 "description": "A security checker for your composer.lock",
7297 "time": "2018-12-19T17:14:59+00:00" 7244 "time": "2019-06-08T06:46:26+00:00"
7298 }, 7245 },
7299 { 7246 {
7300 "name": "sentry/sdk", 7247 "name": "sentry/sdk",
@@ -7331,16 +7278,16 @@
7331 }, 7278 },
7332 { 7279 {
7333 "name": "sentry/sentry", 7280 "name": "sentry/sentry",
7334 "version": "2.1.0", 7281 "version": "2.1.1",
7335 "source": { 7282 "source": {
7336 "type": "git", 7283 "type": "git",
7337 "url": "https://github.com/getsentry/sentry-php.git", 7284 "url": "https://github.com/getsentry/sentry-php.git",
7338 "reference": "1f1704806820c16dcefcbf2e80b920024fda2234" 7285 "reference": "8e27e6c5fcf6f01fc2e5235dd14cc0b2b347d793"
7339 }, 7286 },
7340 "dist": { 7287 "dist": {
7341 "type": "zip", 7288 "type": "zip",
7342 "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/1f1704806820c16dcefcbf2e80b920024fda2234", 7289 "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/8e27e6c5fcf6f01fc2e5235dd14cc0b2b347d793",
7343 "reference": "1f1704806820c16dcefcbf2e80b920024fda2234", 7290 "reference": "8e27e6c5fcf6f01fc2e5235dd14cc0b2b347d793",
7344 "shasum": "" 7291 "shasum": ""
7345 }, 7292 },
7346 "require": { 7293 "require": {
@@ -7406,7 +7353,7 @@
7406 "logging", 7353 "logging",
7407 "sentry" 7354 "sentry"
7408 ], 7355 ],
7409 "time": "2019-05-22T07:44:47+00:00" 7356 "time": "2019-06-13T11:27:23+00:00"
7410 }, 7357 },
7411 { 7358 {
7412 "name": "sentry/sentry-symfony", 7359 "name": "sentry/sentry-symfony",
@@ -7782,31 +7729,209 @@
7782 "time": "2019-04-21T09:21:45+00:00" 7729 "time": "2019-04-21T09:21:45+00:00"
7783 }, 7730 },
7784 { 7731 {
7732 "name": "symfony/http-client",
7733 "version": "v4.3.1",
7734 "source": {
7735 "type": "git",
7736 "url": "https://github.com/symfony/http-client.git",
7737 "reference": "c453b1bb8e8a8b79c9db65a1bd86822f8c6e2bb7"
7738 },
7739 "dist": {
7740 "type": "zip",
7741 "url": "https://api.github.com/repos/symfony/http-client/zipball/c453b1bb8e8a8b79c9db65a1bd86822f8c6e2bb7",
7742 "reference": "c453b1bb8e8a8b79c9db65a1bd86822f8c6e2bb7",
7743 "shasum": ""
7744 },
7745 "require": {
7746 "php": "^7.1.3",
7747 "psr/log": "^1.0",
7748 "symfony/http-client-contracts": "^1.1.3",
7749 "symfony/polyfill-php73": "^1.11"
7750 },
7751 "provide": {
7752 "psr/http-client-implementation": "1.0",
7753 "symfony/http-client-implementation": "1.1"
7754 },
7755 "require-dev": {
7756 "nyholm/psr7": "^1.0",
7757 "psr/http-client": "^1.0",
7758 "symfony/http-kernel": "^4.3",
7759 "symfony/process": "^4.2"
7760 },
7761 "type": "library",
7762 "extra": {
7763 "branch-alias": {
7764 "dev-master": "4.3-dev"
7765 }
7766 },
7767 "autoload": {
7768 "psr-4": {
7769 "Symfony\\Component\\HttpClient\\": ""
7770 },
7771 "exclude-from-classmap": [
7772 "/Tests/"
7773 ]
7774 },
7775 "notification-url": "https://packagist.org/downloads/",
7776 "license": [
7777 "MIT"
7778 ],
7779 "authors": [
7780 {
7781 "name": "Nicolas Grekas",
7782 "email": "p@tchwork.com"
7783 },
7784 {
7785 "name": "Symfony Community",
7786 "homepage": "https://symfony.com/contributors"
7787 }
7788 ],
7789 "description": "Symfony HttpClient component",
7790 "homepage": "https://symfony.com",
7791 "time": "2019-06-05T13:19:12+00:00"
7792 },
7793 {
7794 "name": "symfony/http-client-contracts",
7795 "version": "v1.1.5",
7796 "source": {
7797 "type": "git",
7798 "url": "https://github.com/symfony/http-client-contracts.git",
7799 "reference": "e1924aea9c70ae3e69fff05afa3cb8ce541bf3bb"
7800 },
7801 "dist": {
7802 "type": "zip",
7803 "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/e1924aea9c70ae3e69fff05afa3cb8ce541bf3bb",
7804 "reference": "e1924aea9c70ae3e69fff05afa3cb8ce541bf3bb",
7805 "shasum": ""
7806 },
7807 "require": {
7808 "php": "^7.1.3"
7809 },
7810 "suggest": {
7811 "symfony/http-client-implementation": ""
7812 },
7813 "type": "library",
7814 "extra": {
7815 "branch-alias": {
7816 "dev-master": "1.1-dev"
7817 }
7818 },
7819 "autoload": {
7820 "psr-4": {
7821 "Symfony\\Contracts\\HttpClient\\": ""
7822 }
7823 },
7824 "notification-url": "https://packagist.org/downloads/",
7825 "license": [
7826 "MIT"
7827 ],
7828 "authors": [
7829 {
7830 "name": "Nicolas Grekas",
7831 "email": "p@tchwork.com"
7832 },
7833 {
7834 "name": "Symfony Community",
7835 "homepage": "https://symfony.com/contributors"
7836 }
7837 ],
7838 "description": "Generic abstractions related to HTTP clients",
7839 "homepage": "https://symfony.com",
7840 "keywords": [
7841 "abstractions",
7842 "contracts",
7843 "decoupling",
7844 "interfaces",
7845 "interoperability",
7846 "standards"
7847 ],
7848 "time": "2019-06-17T17:43:54+00:00"
7849 },
7850 {
7851 "name": "symfony/mime",
7852 "version": "v4.3.1",
7853 "source": {
7854 "type": "git",
7855 "url": "https://github.com/symfony/mime.git",
7856 "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b"
7857 },
7858 "dist": {
7859 "type": "zip",
7860 "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
7861 "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
7862 "shasum": ""
7863 },
7864 "require": {
7865 "php": "^7.1.3",
7866 "symfony/polyfill-intl-idn": "^1.10",
7867 "symfony/polyfill-mbstring": "^1.0"
7868 },
7869 "require-dev": {
7870 "egulias/email-validator": "^2.0",
7871 "symfony/dependency-injection": "~3.4|^4.1"
7872 },
7873 "type": "library",
7874 "extra": {
7875 "branch-alias": {
7876 "dev-master": "4.3-dev"
7877 }
7878 },
7879 "autoload": {
7880 "psr-4": {
7881 "Symfony\\Component\\Mime\\": ""
7882 },
7883 "exclude-from-classmap": [
7884 "/Tests/"
7885 ]
7886 },
7887 "notification-url": "https://packagist.org/downloads/",
7888 "license": [
7889 "MIT"
7890 ],
7891 "authors": [
7892 {
7893 "name": "Fabien Potencier",
7894 "email": "fabien@symfony.com"
7895 },
7896 {
7897 "name": "Symfony Community",
7898 "homepage": "https://symfony.com/contributors"
7899 }
7900 ],
7901 "description": "A library to manipulate MIME messages",
7902 "homepage": "https://symfony.com",
7903 "keywords": [
7904 "mime",
7905 "mime-type"
7906 ],
7907 "time": "2019-06-04T09:22:54+00:00"
7908 },
7909 {
7785 "name": "symfony/monolog-bundle", 7910 "name": "symfony/monolog-bundle",
7786 "version": "v3.3.1", 7911 "version": "v3.4.0",
7787 "source": { 7912 "source": {
7788 "type": "git", 7913 "type": "git",
7789 "url": "https://github.com/symfony/monolog-bundle.git", 7914 "url": "https://github.com/symfony/monolog-bundle.git",
7790 "reference": "572e143afc03419a75ab002c80a2fd99299195ff" 7915 "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d"
7791 }, 7916 },
7792 "dist": { 7917 "dist": {
7793 "type": "zip", 7918 "type": "zip",
7794 "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/572e143afc03419a75ab002c80a2fd99299195ff", 7919 "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7fbecb371c1c614642c93c6b2cbcdf723ae8809d",
7795 "reference": "572e143afc03419a75ab002c80a2fd99299195ff", 7920 "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d",
7796 "shasum": "" 7921 "shasum": ""
7797 }, 7922 },
7798 "require": { 7923 "require": {
7799 "monolog/monolog": "~1.22", 7924 "monolog/monolog": "~1.22",
7800 "php": ">=5.6", 7925 "php": ">=5.6",
7801 "symfony/config": "~2.7|~3.3|~4.0", 7926 "symfony/config": "~3.4|~4.0",
7802 "symfony/dependency-injection": "~2.7|~3.4.10|^4.0.10", 7927 "symfony/dependency-injection": "~3.4.10|^4.0.10",
7803 "symfony/http-kernel": "~2.7|~3.3|~4.0", 7928 "symfony/http-kernel": "~3.4|~4.0",
7804 "symfony/monolog-bridge": "~2.7|~3.3|~4.0" 7929 "symfony/monolog-bridge": "~3.4|~4.0"
7805 }, 7930 },
7806 "require-dev": { 7931 "require-dev": {
7807 "symfony/console": "~2.7|~3.3|~4.0", 7932 "symfony/console": "~3.4|~4.0",
7808 "symfony/phpunit-bridge": "^3.3|^4.0", 7933 "symfony/phpunit-bridge": "^3.4.19|^4.0",
7809 "symfony/yaml": "~2.7|~3.3|~4.0" 7934 "symfony/yaml": "~3.4|~4.0"
7810 }, 7935 },
7811 "type": "symfony-bundle", 7936 "type": "symfony-bundle",
7812 "extra": { 7937 "extra": {
@@ -7842,7 +7967,7 @@
7842 "log", 7967 "log",
7843 "logging" 7968 "logging"
7844 ], 7969 ],
7845 "time": "2018-11-04T09:58:13+00:00" 7970 "time": "2019-06-20T12:18:19+00:00"
7846 }, 7971 },
7847 { 7972 {
7848 "name": "symfony/polyfill-apcu", 7973 "name": "symfony/polyfill-apcu",
@@ -7945,7 +8070,7 @@
7945 }, 8070 },
7946 { 8071 {
7947 "name": "Gert de Pagter", 8072 "name": "Gert de Pagter",
7948 "email": "BackEndTea@gmail.com" 8073 "email": "backendtea@gmail.com"
7949 } 8074 }
7950 ], 8075 ],
7951 "description": "Symfony polyfill for ctype functions", 8076 "description": "Symfony polyfill for ctype functions",
@@ -8367,6 +8492,64 @@
8367 "time": "2019-02-06T07:57:58+00:00" 8492 "time": "2019-02-06T07:57:58+00:00"
8368 }, 8493 },
8369 { 8494 {
8495 "name": "symfony/polyfill-php73",
8496 "version": "v1.11.0",
8497 "source": {
8498 "type": "git",
8499 "url": "https://github.com/symfony/polyfill-php73.git",
8500 "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd"
8501 },
8502 "dist": {
8503 "type": "zip",
8504 "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd",
8505 "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd",
8506 "shasum": ""
8507 },
8508 "require": {
8509 "php": ">=5.3.3"
8510 },
8511 "type": "library",
8512 "extra": {
8513 "branch-alias": {
8514 "dev-master": "1.11-dev"
8515 }
8516 },
8517 "autoload": {
8518 "psr-4": {
8519 "Symfony\\Polyfill\\Php73\\": ""
8520 },
8521 "files": [
8522 "bootstrap.php"
8523 ],
8524 "classmap": [
8525 "Resources/stubs"
8526 ]
8527 },
8528 "notification-url": "https://packagist.org/downloads/",
8529 "license": [
8530 "MIT"
8531 ],
8532 "authors": [
8533 {
8534 "name": "Nicolas Grekas",
8535 "email": "p@tchwork.com"
8536 },
8537 {
8538 "name": "Symfony Community",
8539 "homepage": "https://symfony.com/contributors"
8540 }
8541 ],
8542 "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
8543 "homepage": "https://symfony.com",
8544 "keywords": [
8545 "compatibility",
8546 "polyfill",
8547 "portable",
8548 "shim"
8549 ],
8550 "time": "2019-02-06T07:57:58+00:00"
8551 },
8552 {
8370 "name": "symfony/polyfill-util", 8553 "name": "symfony/polyfill-util",
8371 "version": "v1.11.0", 8554 "version": "v1.11.0",
8372 "source": { 8555 "source": {
@@ -8420,16 +8603,16 @@
8420 }, 8603 },
8421 { 8604 {
8422 "name": "symfony/swiftmailer-bundle", 8605 "name": "symfony/swiftmailer-bundle",
8423 "version": "v3.2.6", 8606 "version": "v3.2.8",
8424 "source": { 8607 "source": {
8425 "type": "git", 8608 "type": "git",
8426 "url": "https://github.com/symfony/swiftmailer-bundle.git", 8609 "url": "https://github.com/symfony/swiftmailer-bundle.git",
8427 "reference": "7a83160b50a2479d37eb74ba71577380b9afe4f5" 8610 "reference": "cb125b3648f132fb8070b55393f20cb310907d3b"
8428 }, 8611 },
8429 "dist": { 8612 "dist": {
8430 "type": "zip", 8613 "type": "zip",
8431 "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/7a83160b50a2479d37eb74ba71577380b9afe4f5", 8614 "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/cb125b3648f132fb8070b55393f20cb310907d3b",
8432 "reference": "7a83160b50a2479d37eb74ba71577380b9afe4f5", 8615 "reference": "cb125b3648f132fb8070b55393f20cb310907d3b",
8433 "shasum": "" 8616 "shasum": ""
8434 }, 8617 },
8435 "require": { 8618 "require": {
@@ -8439,6 +8622,9 @@
8439 "symfony/dependency-injection": "~2.7|~3.3|~4.0", 8622 "symfony/dependency-injection": "~2.7|~3.3|~4.0",
8440 "symfony/http-kernel": "~2.7|~3.3|~4.0" 8623 "symfony/http-kernel": "~2.7|~3.3|~4.0"
8441 }, 8624 },
8625 "conflict": {
8626 "twig/twig": "<1.41|<2.10"
8627 },
8442 "require-dev": { 8628 "require-dev": {
8443 "symfony/console": "~2.7|~3.3|~4.0", 8629 "symfony/console": "~2.7|~3.3|~4.0",
8444 "symfony/framework-bundle": "~2.7|~3.3|~4.0", 8630 "symfony/framework-bundle": "~2.7|~3.3|~4.0",
@@ -8478,7 +8664,7 @@
8478 ], 8664 ],
8479 "description": "Symfony SwiftmailerBundle", 8665 "description": "Symfony SwiftmailerBundle",
8480 "homepage": "http://symfony.com", 8666 "homepage": "http://symfony.com",
8481 "time": "2019-04-18T15:52:54+00:00" 8667 "time": "2019-06-18T15:27:04+00:00"
8482 }, 8668 },
8483 { 8669 {
8484 "name": "symfony/symfony", 8670 "name": "symfony/symfony",
@@ -8738,21 +8924,22 @@
8738 }, 8924 },
8739 { 8925 {
8740 "name": "twig/twig", 8926 "name": "twig/twig",
8741 "version": "v1.42.1", 8927 "version": "v2.11.3",
8742 "source": { 8928 "source": {
8743 "type": "git", 8929 "type": "git",
8744 "url": "https://github.com/twigphp/Twig.git", 8930 "url": "https://github.com/twigphp/Twig.git",
8745 "reference": "671347603760a88b1e7288aaa9378f33687d7edf" 8931 "reference": "699ed2342557c88789a15402de5eb834dedd6792"
8746 }, 8932 },
8747 "dist": { 8933 "dist": {
8748 "type": "zip", 8934 "type": "zip",
8749 "url": "https://api.github.com/repos/twigphp/Twig/zipball/671347603760a88b1e7288aaa9378f33687d7edf", 8935 "url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792",
8750 "reference": "671347603760a88b1e7288aaa9378f33687d7edf", 8936 "reference": "699ed2342557c88789a15402de5eb834dedd6792",
8751 "shasum": "" 8937 "shasum": ""
8752 }, 8938 },
8753 "require": { 8939 "require": {
8754 "php": ">=5.4.0", 8940 "php": "^7.0",
8755 "symfony/polyfill-ctype": "^1.8" 8941 "symfony/polyfill-ctype": "^1.8",
8942 "symfony/polyfill-mbstring": "^1.3"
8756 }, 8943 },
8757 "require-dev": { 8944 "require-dev": {
8758 "psr/container": "^1.0", 8945 "psr/container": "^1.0",
@@ -8762,7 +8949,7 @@
8762 "type": "library", 8949 "type": "library",
8763 "extra": { 8950 "extra": {
8764 "branch-alias": { 8951 "branch-alias": {
8765 "dev-master": "1.42-dev" 8952 "dev-master": "2.11-dev"
8766 } 8953 }
8767 }, 8954 },
8768 "autoload": { 8955 "autoload": {
@@ -8800,7 +8987,7 @@
8800 "keywords": [ 8987 "keywords": [
8801 "templating" 8988 "templating"
8802 ], 8989 ],
8803 "time": "2019-06-04T11:31:08+00:00" 8990 "time": "2019-06-18T15:37:11+00:00"
8804 }, 8991 },
8805 { 8992 {
8806 "name": "wallabag/php-mobi", 8993 "name": "wallabag/php-mobi",
@@ -10472,16 +10659,16 @@
10472 }, 10659 },
10473 { 10660 {
10474 "name": "phpstan/phpdoc-parser", 10661 "name": "phpstan/phpdoc-parser",
10475 "version": "0.3.4", 10662 "version": "0.3.5",
10476 "source": { 10663 "source": {
10477 "type": "git", 10664 "type": "git",
10478 "url": "https://github.com/phpstan/phpdoc-parser.git", 10665 "url": "https://github.com/phpstan/phpdoc-parser.git",
10479 "reference": "ab518a5fc8f1d90f58bd2c5552ba915e2c477b66" 10666 "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4"
10480 }, 10667 },
10481 "dist": { 10668 "dist": {
10482 "type": "zip", 10669 "type": "zip",
10483 "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ab518a5fc8f1d90f58bd2c5552ba915e2c477b66", 10670 "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/8c4ef2aefd9788238897b678a985e1d5c8df6db4",
10484 "reference": "ab518a5fc8f1d90f58bd2c5552ba915e2c477b66", 10671 "reference": "8c4ef2aefd9788238897b678a985e1d5c8df6db4",
10485 "shasum": "" 10672 "shasum": ""
10486 }, 10673 },
10487 "require": { 10674 "require": {
@@ -10515,7 +10702,7 @@
10515 "MIT" 10702 "MIT"
10516 ], 10703 ],
10517 "description": "PHPDoc parser with support for nullable, intersection and generic types", 10704 "description": "PHPDoc parser with support for nullable, intersection and generic types",
10518 "time": "2019-05-28T11:40:00+00:00" 10705 "time": "2019-06-07T19:13:52+00:00"
10519 }, 10706 },
10520 { 10707 {
10521 "name": "phpstan/phpstan", 10708 "name": "phpstan/phpstan",
diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php
index 8d422a90..9f671735 100644
--- a/src/Wallabag/CoreBundle/Controller/FeedController.php
+++ b/src/Wallabag/CoreBundle/Controller/FeedController.php
@@ -176,7 +176,7 @@ class FeedController extends Controller
176 $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false); 176 $pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
177 $entries = new Pagerfanta($pagerAdapter); 177 $entries = new Pagerfanta($pagerAdapter);
178 178
179 $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.Feed_limit'); 179 $perPage = $user->getConfig()->getFeedLimit() ?: $this->getParameter('wallabag_core.feed_limit');
180 $entries->setMaxPerPage($perPage); 180 $entries->setMaxPerPage($perPage);
181 181
182 $url = $this->generateUrl( 182 $url = $this->generateUrl(
diff --git a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
index 536185d4..02f17f50 100644
--- a/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
+++ b/src/Wallabag/CoreBundle/Twig/WallabagExtension.php
@@ -4,10 +4,14 @@ namespace Wallabag\CoreBundle\Twig;
4 4
5use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; 5use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
6use Symfony\Component\Translation\TranslatorInterface; 6use Symfony\Component\Translation\TranslatorInterface;
7use Twig\Extension\AbstractExtension;
8use Twig\Extension\GlobalsInterface;
9use Twig\TwigFilter;
10use Twig\TwigFunction;
7use Wallabag\CoreBundle\Repository\EntryRepository; 11use Wallabag\CoreBundle\Repository\EntryRepository;
8use Wallabag\CoreBundle\Repository\TagRepository; 12use Wallabag\CoreBundle\Repository\TagRepository;
9 13
10class WallabagExtension extends \Twig_Extension implements \Twig_Extension_GlobalsInterface 14class WallabagExtension extends AbstractExtension implements GlobalsInterface
11{ 15{
12 private $tokenStorage; 16 private $tokenStorage;
13 private $entryRepository; 17 private $entryRepository;
@@ -24,21 +28,26 @@ class WallabagExtension extends \Twig_Extension implements \Twig_Extension_Globa
24 $this->translator = $translator; 28 $this->translator = $translator;
25 } 29 }
26 30
31 public function getGlobals()
32 {
33 return [];
34 }
35
27 public function getFilters() 36 public function getFilters()
28 { 37 {
29 return [ 38 return [
30 new \Twig_SimpleFilter('removeWww', [$this, 'removeWww']), 39 new TwigFilter('removeWww', [$this, 'removeWww']),
31 new \Twig_SimpleFilter('removeScheme', [$this, 'removeScheme']), 40 new TwigFilter('removeScheme', [$this, 'removeScheme']),
32 new \Twig_SimpleFilter('removeSchemeAndWww', [$this, 'removeSchemeAndWww']), 41 new TwigFilter('removeSchemeAndWww', [$this, 'removeSchemeAndWww']),
33 ]; 42 ];
34 } 43 }
35 44
36 public function getFunctions() 45 public function getFunctions()
37 { 46 {
38 return [ 47 return [
39 new \Twig_SimpleFunction('count_entries', [$this, 'countEntries']), 48 new TwigFunction('count_entries', [$this, 'countEntries']),
40 new \Twig_SimpleFunction('count_tags', [$this, 'countTags']), 49 new TwigFunction('count_tags', [$this, 'countTags']),
41 new \Twig_SimpleFunction('display_stats', [$this, 'displayStats']), 50 new TwigFunction('display_stats', [$this, 'displayStats']),
42 ]; 51 ];
43 } 52 }
44 53
diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
index 2797efde..b25ba685 100644
--- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
+++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
@@ -4,6 +4,7 @@ namespace Wallabag\UserBundle\Mailer;
4 4
5use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; 5use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface;
6use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; 6use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
7use Twig\Environment;
7 8
8/** 9/**
9 * Custom mailer for TwoFactorBundle email. 10 * Custom mailer for TwoFactorBundle email.
@@ -21,7 +22,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
21 /** 22 /**
22 * Twig to render the html's email. 23 * Twig to render the html's email.
23 * 24 *
24 * @var \Twig_Environment 25 * @var Environment
25 */ 26 */
26 private $twig; 27 private $twig;
27 28
@@ -56,14 +57,14 @@ class AuthCodeMailer implements AuthCodeMailerInterface
56 /** 57 /**
57 * Initialize the auth code mailer with the SwiftMailer object. 58 * Initialize the auth code mailer with the SwiftMailer object.
58 * 59 *
59 * @param \Swift_Mailer $mailer 60 * @param \Swift_Mailer $mailer
60 * @param \Twig_Environment $twig 61 * @param Environment $twig
61 * @param string $senderEmail 62 * @param string $senderEmail
62 * @param string $senderName 63 * @param string $senderName
63 * @param string $supportUrl wallabag support url 64 * @param string $supportUrl wallabag support url
64 * @param string $wallabagUrl wallabag instance url 65 * @param string $wallabagUrl wallabag instance url
65 */ 66 */
66 public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) 67 public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
67 { 68 {
68 $this->mailer = $mailer; 69 $this->mailer = $mailer;
69 $this->twig = $twig; 70 $this->twig = $twig;
diff --git a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
index 1713c10c..4f93a92c 100644
--- a/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
+++ b/tests/Wallabag/UserBundle/Mailer/AuthCodeMailerTest.php
@@ -3,6 +3,8 @@
3namespace Tests\Wallabag\UserBundle\Mailer; 3namespace Tests\Wallabag\UserBundle\Mailer;
4 4
5use PHPUnit\Framework\TestCase; 5use PHPUnit\Framework\TestCase;
6use Twig\Environment;
7use Twig\Loader\ArrayLoader;
6use Wallabag\UserBundle\Entity\User; 8use Wallabag\UserBundle\Entity\User;
7use Wallabag\UserBundle\Mailer\AuthCodeMailer; 9use Wallabag\UserBundle\Mailer\AuthCodeMailer;
8 10
@@ -27,7 +29,7 @@ class AuthCodeMailerTest extends TestCase
27{% block body_text %}text body {{ support_url }}{% endblock %} 29{% block body_text %}text body {{ support_url }}{% endblock %}
28TWIG; 30TWIG;
29 31
30 $this->twig = new \Twig_Environment(new \Twig_Loader_Array(['WallabagUserBundle:TwoFactor:email_auth_code.html.twig' => $twigTemplate])); 32 $this->twig = new Environment(new ArrayLoader(['WallabagUserBundle:TwoFactor:email_auth_code.html.twig' => $twigTemplate]));
31 } 33 }
32 34
33 public function testSendEmail() 35 public function testSendEmail()
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 20:48:57 +0000