Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 20:37:03 +02:00
Code Issues Packages Projects Releases Activity

Negotiation update to fix #2513

Browse Source
This commit is contained in:
Andy Miller
2020-03-04 10:57:43 -07:00
parent 40bc980084
commit 62f39fe39c
3 changed files with 92 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -3,6 +3,8 @@
1. [](#new)
* Added `Pages::reset()` method
1. [](#improved)
* Updated Negotiation library to address issues [#2513](https://github.com/getgrav/grav/issues/2513)
1. [](#bugfix)
* Fixed issue with search plugins not being able to switch between page translations
* Fixed issues with `Pages::baseRoute()` not picking up active language reliably

2
composer.json
View File

@@ -52,7 +52,7 @@
"composer/ca-bundle": "^1.0",
"dragonmantank/cron-expression": "^1.2",
"phive/twig-extensions-deferred": "^1.0",
"willdurand/negotiation": "^2.3"
"willdurand/negotiation": "2.x-dev"
},
"require-dev": {
"codeception/codeception": "^2.4",

177
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": "6fa1c3a012660bd9c614bcce56af871f",
"content-hash": "943b834ae47996a8d736ba463bdf4c0a",
"packages": [
{
"name": "antoligy/dom-string-iterators",
@@ -2045,16 +2045,16 @@
},
{
"name": "symfony/polyfill-ctype",
"version": "v1.13.1",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
"reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
"reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38",
"shasum": ""
},
"require": {
@@ -2066,7 +2066,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"autoload": {
@@ -2099,20 +2099,20 @@
"polyfill",
"portable"
],
"time": "2019-11-27T13:56:44+00:00"
"time": "2020-01-13T11:15:53+00:00"
},
{
"name": "symfony/polyfill-iconv",
"version": "v1.13.1",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36"
"reference": "926832ce51059bb58211b7b2080a88e0c3b5328e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/a019efccc03f1a335af6b4f20c30f5ea8060be36",
"reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/926832ce51059bb58211b7b2080a88e0c3b5328e",
"reference": "926832ce51059bb58211b7b2080a88e0c3b5328e",
"shasum": ""
},
"require": {
@@ -2124,7 +2124,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"autoload": {
@@ -2158,20 +2158,20 @@
"portable",
"shim"
],
"time": "2019-11-27T13:56:44+00:00"
"time": "2020-01-13T11:15:53+00:00"
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.13.1",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f"
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f",
"reference": "7b4aab9743c30be783b73de055d24a39cf4b954f",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2",
"reference": "34094cfa9abe1f0f14f48f490772db7a775559f2",
"shasum": ""
},
"require": {
@@ -2183,7 +2183,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"autoload": {
@@ -2217,20 +2217,20 @@
"portable",
"shim"
],
"time": "2019-11-27T14:18:11+00:00"
"time": "2020-01-13T11:15:53+00:00"
},
{
"name": "symfony/polyfill-php72",
"version": "v1.13.1",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
"reference": "66fea50f6cb37a35eea048d75a7d99a45b586038"
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038",
"reference": "66fea50f6cb37a35eea048d75a7d99a45b586038",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
"reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf",
"shasum": ""
},
"require": {
@@ -2239,7 +2239,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"autoload": {
@@ -2272,20 +2272,20 @@
"portable",
"shim"
],
"time": "2019-11-27T13:56:44+00:00"
"time": "2020-01-13T11:15:53+00:00"
},
{
"name": "symfony/polyfill-php73",
"version": "v1.13.1",
"version": "v1.14.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "4b0e2222c55a25b4541305a053013d5647d3a25f"
"reference": "5e66a0fa1070bf46bec4bea7962d285108edd675"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f",
"reference": "4b0e2222c55a25b4541305a053013d5647d3a25f",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675",
"reference": "5e66a0fa1070bf46bec4bea7962d285108edd675",
"shasum": ""
},
"require": {
@@ -2294,7 +2294,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.13-dev"
"dev-master": "1.14-dev"
}
},
"autoload": {
@@ -2330,7 +2330,7 @@
"portable",
"shim"
],
"time": "2019-11-27T16:25:15+00:00"
"time": "2020-01-13T11:15:53+00:00"
},
{
"name": "symfony/process",
@@ -2582,16 +2582,16 @@
},
{
"name": "willdurand/negotiation",
"version": "v2.3.1",
"version": "2.x-dev",
"source": {
"type": "git",
"url": "https://github.com/willdurand/Negotiation.git",
"reference": "03436ededa67c6e83b9b12defac15384cb399dc9"
"reference": "cf78c9ac47e8e1e141bf609c71e9e2c3a7780dcf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9",
"reference": "03436ededa67c6e83b9b12defac15384cb399dc9",
"url": "https://api.github.com/repos/willdurand/Negotiation/zipball/cf78c9ac47e8e1e141bf609c71e9e2c3a7780dcf",
"reference": "cf78c9ac47e8e1e141bf609c71e9e2c3a7780dcf",
"shasum": ""
},
"require": {
@@ -2630,22 +2630,22 @@
"header",
"negotiation"
],
"time": "2017-05-14T17:21:12+00:00"
"time": "2017-08-04T15:54:30+00:00"
}
],
"packages-dev": [
{
"name": "behat/gherkin",
"version": "v4.6.0",
"version": "v4.6.1",
"source": {
"type": "git",
"url": "https://github.com/Behat/Gherkin.git",
"reference": "ab0a02ea14893860bca00f225f5621d351a3ad07"
"reference": "25bdcaf37898b4a939fa3031d5d753ced97e4759"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/ab0a02ea14893860bca00f225f5621d351a3ad07",
"reference": "ab0a02ea14893860bca00f225f5621d351a3ad07",
"url": "https://api.github.com/repos/Behat/Gherkin/zipball/25bdcaf37898b4a939fa3031d5d753ced97e4759",
"reference": "25bdcaf37898b4a939fa3031d5d753ced97e4759",
"shasum": ""
},
"require": {
@@ -2691,7 +2691,7 @@
"gherkin",
"parser"
],
"time": "2019-01-16T14:22:17+00:00"
"time": "2020-02-27T11:29:57+00:00"
},
{
"name": "codeception/codeception",
@@ -2860,16 +2860,16 @@
},
{
"name": "composer/xdebug-handler",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "cbe23383749496fe0f373345208b79568e4bc248"
"reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
"reference": "cbe23383749496fe0f373345208b79568e4bc248",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"shasum": ""
},
"require": {
@@ -2900,7 +2900,7 @@
"Xdebug",
"performance"
],
"time": "2019-11-06T16:40:04+00:00"
"time": "2020-03-01T12:26:26+00:00"
},
{
"name": "doctrine/instantiator",
@@ -2963,12 +2963,12 @@
"version": "1.7.1",
"source": {
"type": "git",
"url": "https://github.com/facebook/php-webdriver.git",
"url": "https://github.com/php-webdriver/php-webdriver-archive.git",
"reference": "e43de70f3c7166169d0f14a374505392734160e5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facebook/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5",
"url": "https://api.github.com/repos/php-webdriver/php-webdriver-archive/zipball/e43de70f3c7166169d0f14a374505392734160e5",
"reference": "e43de70f3c7166169d0f14a374505392734160e5",
"shasum": ""
},
@@ -3498,16 +3498,16 @@
},
{
"name": "nette/neon",
"version": "v3.1.0",
"version": "v3.1.2",
"source": {
"type": "git",
"url": "https://github.com/nette/neon.git",
"reference": "0a18fc88801a14d66587932de133eeca01f7ce8e"
"reference": "3c3dcbc6bf6c80dc97b1fc4ba9a22ae67930fc0e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/neon/zipball/0a18fc88801a14d66587932de133eeca01f7ce8e",
"reference": "0a18fc88801a14d66587932de133eeca01f7ce8e",
"url": "https://api.github.com/repos/nette/neon/zipball/3c3dcbc6bf6c80dc97b1fc4ba9a22ae67930fc0e",
"reference": "3c3dcbc6bf6c80dc97b1fc4ba9a22ae67930fc0e",
"shasum": ""
},
"require": {
@@ -3534,8 +3534,8 @@
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause",
"GPL-2.0",
"GPL-3.0"
"GPL-2.0-only",
"GPL-3.0-only"
],
"authors": [
{
@@ -3548,7 +3548,7 @@
}
],
"description": "🍸 Nette NEON: encodes and decodes NEON file format.",
"homepage": "http://ne-on.org",
"homepage": "https://ne-on.org",
"keywords": [
"export",
"import",
@@ -3556,7 +3556,7 @@
"nette",
"yaml"
],
"time": "2019-12-27T04:00:04+00:00"
"time": "2020-03-04T11:47:04+00:00"
},
{
"name": "nette/php-generator",
@@ -3620,16 +3620,16 @@
},
{
"name": "nette/robot-loader",
"version": "v3.2.1",
"version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/nette/robot-loader.git",
"reference": "d2a100e1f5cab390c78bc88709abbc91249c3993"
"reference": "38e8a270567a4ad9fe716b40fcda5a6580afa3c0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/robot-loader/zipball/d2a100e1f5cab390c78bc88709abbc91249c3993",
"reference": "d2a100e1f5cab390c78bc88709abbc91249c3993",
"url": "https://api.github.com/repos/nette/robot-loader/zipball/38e8a270567a4ad9fe716b40fcda5a6580afa3c0",
"reference": "38e8a270567a4ad9fe716b40fcda5a6580afa3c0",
"shasum": ""
},
"require": {
@@ -3657,8 +3657,8 @@
"notification-url": "https://packagist.org/downloads/",
"license": [
"BSD-3-Clause",
"GPL-2.0",
"GPL-3.0"
"GPL-2.0-only",
"GPL-3.0-only"
],
"authors": [
{
@@ -3679,7 +3679,7 @@
"nette",
"trait"
],
"time": "2019-12-26T22:32:02+00:00"
"time": "2020-02-20T22:17:50+00:00"
},
{
"name": "nette/schema",
@@ -5310,16 +5310,16 @@
},
{
"name": "symfony/browser-kit",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/browser-kit.git",
"reference": "45cae6dd8683d2de56df7ec23638e9429c70135f"
"reference": "090ce406505149d6852a7c03b0346dec3b8cf612"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/45cae6dd8683d2de56df7ec23638e9429c70135f",
"reference": "45cae6dd8683d2de56df7ec23638e9429c70135f",
"url": "https://api.github.com/repos/symfony/browser-kit/zipball/090ce406505149d6852a7c03b0346dec3b8cf612",
"reference": "090ce406505149d6852a7c03b0346dec3b8cf612",
"shasum": ""
},
"require": {
@@ -5365,20 +5365,20 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T13:00:46+00:00"
"time": "2020-02-23T10:00:59+00:00"
},
{
"name": "symfony/css-selector",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "a167b1860995b926d279f9bb538f873e3bfa3465"
"reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/a167b1860995b926d279f9bb538f873e3bfa3465",
"reference": "a167b1860995b926d279f9bb538f873e3bfa3465",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
"reference": "d0a6dd288fa8848dcc3d1f58b94de6a7cc5d2d22",
"shasum": ""
},
"require": {
@@ -5418,20 +5418,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T13:00:46+00:00"
"time": "2020-02-04T09:01:01+00:00"
},
{
"name": "symfony/dom-crawler",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "b66fe8ccc850ea11c4cd31677706c1219768bea1"
"reference": "11dcf08f12f29981bf770f097a5d64d65bce5929"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/b66fe8ccc850ea11c4cd31677706c1219768bea1",
"reference": "b66fe8ccc850ea11c4cd31677706c1219768bea1",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/11dcf08f12f29981bf770f097a5d64d65bce5929",
"reference": "11dcf08f12f29981bf770f097a5d64d65bce5929",
"shasum": ""
},
"require": {
@@ -5479,20 +5479,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T13:00:46+00:00"
"time": "2020-02-29T10:05:28+00:00"
},
{
"name": "symfony/finder",
"version": "v4.4.4",
"version": "v4.4.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "3a50be43515590faf812fbd7708200aabc327ec3"
"reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3",
"reference": "3a50be43515590faf812fbd7708200aabc327ec3",
"url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
"reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
"shasum": ""
},
"require": {
@@ -5528,7 +5528,7 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2020-01-04T13:00:46+00:00"
"time": "2020-02-14T07:42:58+00:00"
},
{
"name": "theseer/tokenizer",
@@ -5618,16 +5618,16 @@
},
{
"name": "webmozart/assert",
"version": "1.6.0",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/webmozart/assert.git",
"reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
"reference": "aed98a490f9a8f78468232db345ab9cf606cf598"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
"reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
"url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598",
"reference": "aed98a490f9a8f78468232db345ab9cf606cf598",
"shasum": ""
},
"require": {
@@ -5662,12 +5662,13 @@
"check",
"validate"
],
"time": "2019-11-24T13:36:37+00:00"
"time": "2020-02-14T12:15:55+00:00"
}
],
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
"willdurand/negotiation": 20,
"victorjonsson/markdowndocs": 20
},
"prefer-stable": false,