diff --git a/composer.lock b/composer.lock index ed4a79d9d..ad18dcb12 100644 --- a/composer.lock +++ b/composer.lock @@ -9318,26 +9318,29 @@ }, { "name": "white-october/pagerfanta-bundle", - "version": "v1.2.4", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git", - "reference": "19bf14bf8c72e4205c9ca97028436701fe3991a6" + "reference": "5421d5e79b72495b34b745d37e4d341e6fa2190d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/19bf14bf8c72e4205c9ca97028436701fe3991a6", - "reference": "19bf14bf8c72e4205c9ca97028436701fe3991a6", + "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/5421d5e79b72495b34b745d37e4d341e6fa2190d", + "reference": "5421d5e79b72495b34b745d37e4d341e6fa2190d", "shasum": "" }, "require": { "pagerfanta/pagerfanta": "^1.1.0|^2.0.0", - "php": ">=5.3", + "php": ">=5.3.3", "symfony/framework-bundle": "~2.3|~3.0|~4.0", "symfony/property-access": "~2.3|~3.0|~4.0", "symfony/translation": "~2.3|~3.0|~4.0", "symfony/twig-bundle": "~2.3|~3.0|~4.0" }, + "conflict": { + "twig/twig": "<1.34|>=2.0,<2.4" + }, "require-dev": { "phpunit/phpunit": "~3.7|~4.0|^5.0", "symfony/symfony": "~2.3|~3.0|~4.0" @@ -9372,7 +9375,7 @@ "page", "paging" ], - "time": "2019-02-14T08:42:52+00:00" + "time": "2019-11-21T17:13:04+00:00" }, { "name": "willdurand/hateoas",