diff --git a/composer.lock b/composer.lock index 2fbbb5b2c..296984db9 100644 --- a/composer.lock +++ b/composer.lock @@ -1718,20 +1718,20 @@ }, { "name": "pagerfanta/pagerfanta", - "version": "v2.0.1", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/whiteoctober/Pagerfanta.git", - "reference": "15770d9d7f6e8e07af568aed104a51f869591e73" + "reference": "8276a078563e719be16d12480dbd28e47ac094fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/15770d9d7f6e8e07af568aed104a51f869591e73", - "reference": "15770d9d7f6e8e07af568aed104a51f869591e73", + "url": "https://api.github.com/repos/whiteoctober/Pagerfanta/zipball/8276a078563e719be16d12480dbd28e47ac094fa", + "reference": "8276a078563e719be16d12480dbd28e47ac094fa", "shasum": "" }, "require": { - "php": ">=7.0" + "php": "^7.0" }, "require-dev": { "doctrine/orm": "~2.3", @@ -1740,7 +1740,7 @@ "jmikola/geojson": "~1.0", "mandango/mandango": "~1.0@dev", "mandango/mondator": "~1.0@dev", - "phpunit/phpunit": "^5.7|^6", + "phpunit/phpunit": "^6.5", "propel/propel": "~2.0@dev", "propel/propel1": "~1.6", "ruflin/elastica": "~1.3", @@ -1762,8 +1762,8 @@ } }, "autoload": { - "psr-0": { - "Pagerfanta\\": "src/" + "psr-4": { + "Pagerfanta\\": "src/Pagerfanta/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1776,14 +1776,14 @@ "email": "pablodip@gmail.com" } ], - "description": "Pagination for PHP 5.3", + "description": "Pagination for PHP", "keywords": [ "page", "pagination", "paginator", "paging" ], - "time": "2018-05-17T09:23:52+00:00" + "time": "2019-03-11T08:58:08+00:00" }, { "name": "psr/cache", @@ -2094,25 +2094,28 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.1.3", + "version": "v6.2.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4" + "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8ddcb66ac10c392d3beb54829eef8ac1438595f4", - "reference": "8ddcb66ac10c392d3beb54829eef8ac1438595f4", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707", + "reference": "6fa3232ff9d3f8237c0fae4b7ff05e1baa4cd707", "shasum": "" }, "require": { "egulias/email-validator": "~2.0", - "php": ">=7.0.0" + "php": ">=7.0.0", + "symfony/polyfill-iconv": "^1.0", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { "mockery/mockery": "~0.9.1", - "symfony/phpunit-bridge": "~3.3@dev" + "symfony/phpunit-bridge": "^3.4.19|^4.1.8" }, "suggest": { "ext-intl": "Needed to support internationalized email addresses", @@ -2121,7 +2124,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "6.2-dev" } }, "autoload": { @@ -2149,7 +2152,7 @@ "mail", "mailer" ], - "time": "2018-09-11T07:12:52+00:00" + "time": "2019-03-10T07:52:41+00:00" }, { "name": "symfony/asset", @@ -3687,6 +3690,65 @@ ], "time": "2018-08-06T14:22:27+00:00" }, + { + "name": "symfony/polyfill-iconv", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-iconv.git", + "reference": "97001cfc283484c9691769f51cdf25259037eba2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/97001cfc283484c9691769f51cdf25259037eba2", + "reference": "97001cfc283484c9691769f51cdf25259037eba2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-iconv": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Iconv\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Iconv extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "iconv", + "polyfill", + "portable", + "shim" + ], + "time": "2018-09-21T06:26:08+00:00" + }, { "name": "symfony/polyfill-intl-icu", "version": "v1.10.0", @@ -3745,6 +3807,68 @@ ], "time": "2018-08-06T14:22:27+00:00" }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "89de1d44f2c059b266f22c9cc9124ddc4cd0987a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/89de1d44f2c059b266f22c9cc9124ddc4cd0987a", + "reference": "89de1d44f2c059b266f22c9cc9124ddc4cd0987a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.9" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "time": "2018-09-30T16:36:12+00:00" + }, { "name": "symfony/polyfill-mbstring", "version": "v1.10.0", @@ -4789,16 +4913,16 @@ }, { "name": "symfony/webpack-encore-bundle", - "version": "v1.2.1", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/symfony/webpack-encore-bundle.git", - "reference": "436f4d3e8e6c8b05ef1a6d9090ed4c82b6849bc5" + "reference": "e23e9d32abd7fb62b84ad0ff62b235b517c61bc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/webpack-encore-bundle/zipball/436f4d3e8e6c8b05ef1a6d9090ed4c82b6849bc5", - "reference": "436f4d3e8e6c8b05ef1a6d9090ed4c82b6849bc5", + "url": "https://api.github.com/repos/symfony/webpack-encore-bundle/zipball/e23e9d32abd7fb62b84ad0ff62b235b517c61bc4", + "reference": "e23e9d32abd7fb62b84ad0ff62b235b517c61bc4", "shasum": "" }, "require": { @@ -4839,7 +4963,7 @@ } ], "description": "Integration with your Symfony app & Webpack Encore!", - "time": "2019-03-03T20:01:33+00:00" + "time": "2019-03-04T15:09:28+00:00" }, { "name": "symfony/yaml", @@ -5045,16 +5169,16 @@ }, { "name": "twig/twig", - "version": "v2.6.2", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7" + "reference": "70c59531da43afe598c66135e39cac39475a2f51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7d7342c8a4059fefb9b8d07db0cc14007021f9b7", - "reference": "7d7342c8a4059fefb9b8d07db0cc14007021f9b7", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/70c59531da43afe598c66135e39cac39475a2f51", + "reference": "70c59531da43afe598c66135e39cac39475a2f51", "shasum": "" }, "require": { @@ -5070,7 +5194,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -5108,20 +5232,20 @@ "keywords": [ "templating" ], - "time": "2019-01-14T15:00:48+00:00" + "time": "2019-03-12T18:48:26+00:00" }, { "name": "white-october/pagerfanta-bundle", - "version": "v1.2.3", + "version": "v1.2.4", "source": { "type": "git", "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git", - "reference": "3a2f39fecde9b8aefe7c9cbd0baf06bc72ef3e5e" + "reference": "19bf14bf8c72e4205c9ca97028436701fe3991a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/3a2f39fecde9b8aefe7c9cbd0baf06bc72ef3e5e", - "reference": "3a2f39fecde9b8aefe7c9cbd0baf06bc72ef3e5e", + "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/19bf14bf8c72e4205c9ca97028436701fe3991a6", + "reference": "19bf14bf8c72e4205c9ca97028436701fe3991a6", "shasum": "" }, "require": { @@ -5166,7 +5290,7 @@ "page", "paging" ], - "time": "2018-12-05T16:58:18+00:00" + "time": "2019-02-14T08:42:52+00:00" }, { "name": "zendframework/zend-code", diff --git a/src/Twig/SourceCodeExtension.php b/src/Twig/SourceCodeExtension.php index 847ad4b0b..a99efe1d9 100644 --- a/src/Twig/SourceCodeExtension.php +++ b/src/Twig/SourceCodeExtension.php @@ -13,7 +13,7 @@ use Twig\Environment; use Twig\Extension\AbstractExtension; -use Twig\Template; +use Twig\TemplateWrapper; use Twig\TwigFunction; /** @@ -92,7 +92,7 @@ private function getCallableReflector(callable $callable): \ReflectionFunctionAb return new \ReflectionFunction($callable); } - private function getTemplateSource(Template $template): array + private function getTemplateSource(TemplateWrapper $template): array { $templateSource = $template->getSourceContext(); diff --git a/symfony.lock b/symfony.lock index 95d0c2116..4daa151a0 100644 --- a/symfony.lock +++ b/symfony.lock @@ -290,9 +290,15 @@ "symfony/polyfill-ctype": { "version": "1.9-dev" }, + "symfony/polyfill-iconv": { + "version": "v1.10.0" + }, "symfony/polyfill-intl-icu": { "version": "1.9-dev" }, + "symfony/polyfill-intl-idn": { + "version": "v1.10.0" + }, "symfony/polyfill-mbstring": { "version": "1.9-dev" },