diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js index a497628b2..e1ee92234 100644 --- a/app/Resources/static/themes/_global/js/bookmarklet.js +++ b/app/Resources/static/themes/_global/js/bookmarklet.js @@ -1,5 +1,4 @@ -top['bookmarklet-url@wallabag.org'] = - 'bag it!' + - '' + - ''; +top['bookmarklet-url@wallabag.org'] = 'bag it!' + + '' + + ''; diff --git a/app/config/webpack/dev.js b/app/config/webpack/dev.js index 67281f323..1c614f1a0 100644 --- a/app/config/webpack/dev.js +++ b/app/config/webpack/dev.js @@ -1,7 +1,6 @@ const { merge } = require('webpack-merge'); -const webpack = require('webpack'); -const commonConfig = require('./common.js'); const ESLintPlugin = require('eslint-webpack-plugin'); +const commonConfig = require('./common'); module.exports = merge(commonConfig, { devtool: 'eval-source-map', @@ -52,7 +51,7 @@ module.exports = merge(commonConfig, { }, { test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/, - use: 'url-loader', + type: 'asset/inline', }, ], }, diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js index d860f81cb..458a0190c 100644 --- a/app/config/webpack/prod.js +++ b/app/config/webpack/prod.js @@ -5,7 +5,7 @@ const MiniCssExtractPlugin = require('mini-css-extract-plugin'); const { WebpackManifestPlugin } = require('webpack-manifest-plugin'); const TerserPlugin = require('terser-webpack-plugin'); -const commonConfig = require('./common.js'); +const commonConfig = require('./common'); module.exports = merge(commonConfig, { output: { @@ -78,7 +78,7 @@ module.exports = merge(commonConfig, { include: /node_modules/, type: 'asset/resource', generator: { - filename: 'img/[name][ext]' + filename: 'img/[name][ext]', }, }, { @@ -86,16 +86,14 @@ module.exports = merge(commonConfig, { exclude: /node_modules/, type: 'asset/resource', generator: { - filename: content => { - return content.filename.replace('app/Resources/static/', '') - } - } + filename: (content) => content.filename.replace('app/Resources/static/', ''), + }, }, { test: /\.(eot|ttf|woff|woff2)$/, type: 'asset/resource', generator: { - filename: 'fonts/[name][ext]' + filename: 'fonts/[name][ext]', }, }, ], diff --git a/composer.lock b/composer.lock index 0aaf8eee2..99209adcc 100644 --- a/composer.lock +++ b/composer.lock @@ -145,16 +145,16 @@ }, { "name": "beberlei/assert", - "version": "v3.3.1", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/beberlei/assert.git", - "reference": "5e721d7e937ca3ba2cdec1e1adf195f9e5188372" + "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/assert/zipball/5e721d7e937ca3ba2cdec1e1adf195f9e5188372", - "reference": "5e721d7e937ca3ba2cdec1e1adf195f9e5188372", + "url": "https://api.github.com/repos/beberlei/assert/zipball/cb70015c04be1baee6f5f5c953703347c0ac1655", + "reference": "cb70015c04be1baee6f5f5c953703347c0ac1655", "shasum": "" }, "require": { @@ -206,9 +206,9 @@ ], "support": { "issues": "https://github.com/beberlei/assert/issues", - "source": "https://github.com/beberlei/assert/tree/v3.3.1" + "source": "https://github.com/beberlei/assert/tree/v3.3.2" }, - "time": "2021-04-18T20:11:03+00:00" + "time": "2021-12-16T21:41:27+00:00" }, { "name": "behat/transliterator", @@ -327,16 +327,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.2", + "version": "1.11.99.4", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" + "reference": "b174585d1fe49ceed21928a945138948cb394600" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", - "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/b174585d1fe49ceed21928a945138948cb394600", + "reference": "b174585d1fe49ceed21928a945138948cb394600", "shasum": "" }, "require": { @@ -380,7 +380,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.4" }, "funding": [ { @@ -396,7 +396,7 @@ "type": "tidelift" } ], - "time": "2021-05-24T07:46:03+00:00" + "time": "2021-09-13T08:41:34+00:00" }, { "name": "craue/config-bundle", @@ -712,26 +712,26 @@ }, { "name": "doctrine/collections", - "version": "1.6.7", + "version": "1.6.8", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a" + "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/55f8b799269a1a472457bd1a41b4f379d4cfba4a", - "reference": "55f8b799269a1a472457bd1a41b4f379d4cfba4a", + "url": "https://api.github.com/repos/doctrine/collections/zipball/1958a744696c6bb3bb0d28db2611dc11610e78af", + "reference": "1958a744696c6bb3bb0d28db2611dc11610e78af", "shasum": "" }, "require": { "php": "^7.1.3 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpstan/phpstan-shim": "^0.9.2", - "phpunit/phpunit": "^7.0", - "vimeo/psalm": "^3.8.1" + "doctrine/coding-standard": "^9.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", + "vimeo/psalm": "^4.2.1" }, "type": "library", "autoload": { @@ -775,9 +775,9 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.6.7" + "source": "https://github.com/doctrine/collections/tree/1.6.8" }, - "time": "2020-07-27T17:53:49+00:00" + "time": "2021-08-10T18:51:53+00:00" }, { "name": "doctrine/common", @@ -882,16 +882,16 @@ }, { "name": "doctrine/dbal", - "version": "2.13.2", + "version": "2.13.6", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4" + "reference": "67ef6d0327ccbab1202b39e0222977a47ed3ef2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/8dd39d2ead4409ce652fd4f02621060f009ea5e4", - "reference": "8dd39d2ead4409ce652fd4f02621060f009ea5e4", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/67ef6d0327ccbab1202b39e0222977a47ed3ef2f", + "reference": "67ef6d0327ccbab1202b39e0222977a47ed3ef2f", "shasum": "" }, "require": { @@ -903,13 +903,14 @@ }, "require-dev": { "doctrine/coding-standard": "9.0.0", - "jetbrains/phpstorm-stubs": "2020.2", - "phpstan/phpstan": "0.12.81", - "phpunit/phpunit": "^7.5.20|^8.5|9.5.5", - "squizlabs/php_codesniffer": "3.6.0", + "jetbrains/phpstorm-stubs": "2021.1", + "phpstan/phpstan": "1.2.0", + "phpunit/phpunit": "^7.5.20|^8.5|9.5.10", + "psalm/plugin-phpunit": "0.16.1", + "squizlabs/php_codesniffer": "3.6.1", "symfony/cache": "^4.4", "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", - "vimeo/psalm": "4.6.4" + "vimeo/psalm": "4.13.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -970,7 +971,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.13.2" + "source": "https://github.com/doctrine/dbal/tree/2.13.6" }, "funding": [ { @@ -986,7 +987,7 @@ "type": "tidelift" } ], - "time": "2021-06-18T21:48:39+00:00" + "time": "2021-11-26T20:11:05+00:00" }, { "name": "doctrine/deprecations", @@ -2000,16 +2001,16 @@ }, { "name": "egulias/email-validator", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "c81f18a3efb941d8c4d2e025f6183b5c6d697307" + "reference": "ee0db30118f661fb166bcffbf5d82032df484697" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/c81f18a3efb941d8c4d2e025f6183b5c6d697307", - "reference": "c81f18a3efb941d8c4d2e025f6183b5c6d697307", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ee0db30118f661fb166bcffbf5d82032df484697", + "reference": "ee0db30118f661fb166bcffbf5d82032df484697", "shasum": "" }, "require": { @@ -2056,7 +2057,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/3.1.1" + "source": "https://github.com/egulias/EmailValidator/tree/3.1.2" }, "funding": [ { @@ -2064,7 +2065,7 @@ "type": "github" } ], - "time": "2021-04-01T18:37:14+00:00" + "time": "2021-10-11T09:18:27+00:00" }, { "name": "fig/link-util", @@ -2182,28 +2183,28 @@ }, { "name": "friendsofsymfony/jsrouting-bundle", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle.git", - "reference": "d56600542504148bf2faa2b6bd7571a6adf6799e" + "reference": "c978fabc6a21a77052ff3fe927b41111ec944f0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSJsRoutingBundle/zipball/d56600542504148bf2faa2b6bd7571a6adf6799e", - "reference": "d56600542504148bf2faa2b6bd7571a6adf6799e", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSJsRoutingBundle/zipball/c978fabc6a21a77052ff3fe927b41111ec944f0d", + "reference": "c978fabc6a21a77052ff3fe927b41111ec944f0d", "shasum": "" }, "require": { "php": "^7.1|^8.0", - "symfony/console": "~3.3|^4.0|^5.0", - "symfony/framework-bundle": "~3.3|^4.0|^5.0", - "symfony/serializer": "~3.3|^4.0|^5.0", - "willdurand/jsonp-callback-validator": "~1.0" + "symfony/console": "~3.4|^4.4.20|^5.0", + "symfony/framework-bundle": "~3.4|^4.4.20|^5.0", + "symfony/serializer": "~3.4|^4.4.20|^5.0", + "willdurand/jsonp-callback-validator": "~1.1" }, "require-dev": { - "symfony/expression-language": "~3.3|^4.0|^5.0", - "symfony/phpunit-bridge": "^5.1" + "symfony/expression-language": "~3.4|^4.4.20|^5.0", + "symfony/phpunit-bridge": "^5.3" }, "type": "symfony-bundle", "extra": { @@ -2242,9 +2243,9 @@ ], "support": { "issues": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/issues", - "source": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/tree/2.7.0" + "source": "https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/tree/2.8.0" }, - "time": "2020-11-20T10:38:12+00:00" + "time": "2021-12-15T08:51:04+00:00" }, { "name": "friendsofsymfony/oauth-server-bundle", @@ -2939,16 +2940,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.4.1", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d", - "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { @@ -2960,7 +2961,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -2976,10 +2977,25 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", @@ -2988,22 +3004,36 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.1" + "source": "https://github.com/guzzle/promises/tree/1.5.1" }, - "time": "2021-03-07T09:25:29+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", + "version": "1.8.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", + "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85", "shasum": "" }, "require": { @@ -3040,13 +3070,34 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -3063,9 +3114,23 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.2" + "source": "https://github.com/guzzle/psr7/tree/1.8.3" }, - "time": "2021-04-26T09:17:50+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2021-10-05T13:56:00+00:00" }, { "name": "guzzlehttp/ringphp", @@ -3266,6 +3331,7 @@ "issues": "https://github.com/hoaproject/Compiler/issues", "source": "https://central.hoa-project.net/Resource/Library/Compiler" }, + "abandoned": true, "time": "2017-08-08T07:44:07+00:00" }, { @@ -3337,6 +3403,7 @@ "issues": "https://github.com/hoaproject/Consistency/issues", "source": "https://central.hoa-project.net/Resource/Library/Consistency" }, + "abandoned": true, "time": "2017-05-02T12:18:12+00:00" }, { @@ -3401,6 +3468,7 @@ "issues": "https://github.com/hoaproject/Event/issues", "source": "https://central.hoa-project.net/Resource/Library/Event" }, + "abandoned": true, "time": "2017-01-13T15:30:50+00:00" }, { @@ -3463,6 +3531,7 @@ "issues": "https://github.com/hoaproject/Exception/issues", "source": "https://central.hoa-project.net/Resource/Library/Exception" }, + "abandoned": true, "time": "2017-01-16T07:53:27+00:00" }, { @@ -3533,6 +3602,7 @@ "issues": "https://github.com/hoaproject/File/issues", "source": "https://central.hoa-project.net/Resource/Library/File" }, + "abandoned": true, "time": "2017-07-11T07:42:15+00:00" }, { @@ -3595,6 +3665,7 @@ "issues": "https://github.com/hoaproject/Iterator/issues", "source": "https://central.hoa-project.net/Resource/Library/Iterator" }, + "abandoned": true, "time": "2017-01-10T10:34:47+00:00" }, { @@ -3668,6 +3739,7 @@ "issues": "https://github.com/hoaproject/Math/issues", "source": "https://central.hoa-project.net/Resource/Library/Math" }, + "abandoned": true, "time": "2017-05-16T08:02:17+00:00" }, { @@ -3736,6 +3808,7 @@ "issues": "https://github.com/hoaproject/Protocol/issues", "source": "https://central.hoa-project.net/Resource/Library/Protocol" }, + "abandoned": true, "time": "2017-01-14T12:26:10+00:00" }, { @@ -3800,6 +3873,7 @@ "issues": "https://github.com/hoaproject/Regex/issues", "source": "https://central.hoa-project.net/Resource/Library/Regex" }, + "abandoned": true, "time": "2017-01-13T16:10:24+00:00" }, { @@ -3866,6 +3940,7 @@ "issues": "https://github.com/hoaproject/Ruler/issues", "source": "https://central.hoa-project.net/Resource/Library/Ruler" }, + "abandoned": true, "time": "2017-05-16T07:52:21+00:00" }, { @@ -3938,6 +4013,7 @@ "issues": "https://github.com/hoaproject/Stream/issues", "source": "https://central.hoa-project.net/Resource/Library/Stream" }, + "abandoned": true, "time": "2017-02-21T16:01:06+00:00" }, { @@ -4006,6 +4082,7 @@ "issues": "https://github.com/hoaproject/Ustring/issues", "source": "https://central.hoa-project.net/Resource/Library/Ustring" }, + "abandoned": true, "time": "2017-01-16T07:08:25+00:00" }, { @@ -4069,6 +4146,7 @@ "issues": "https://github.com/hoaproject/Visitor/issues", "source": "https://central.hoa-project.net/Resource/Library/Visitor" }, + "abandoned": true, "time": "2017-01-16T07:02:03+00:00" }, { @@ -4129,6 +4207,7 @@ "issues": "https://github.com/hoaproject/Zformat/issues", "source": "https://central.hoa-project.net/Resource/Library/Zformat" }, + "abandoned": true, "time": "2017-01-10T10:39:54+00:00" }, { @@ -4283,22 +4362,23 @@ }, { "name": "j0k3r/graby", - "version": "2.3.0", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/j0k3r/graby.git", - "reference": "d92a6565b8644ecc623fc791e5e01e0187da99f0" + "reference": "93b7c6304b7917e9cc413b046d6ed16ec27e8d20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby/zipball/d92a6565b8644ecc623fc791e5e01e0187da99f0", - "reference": "d92a6565b8644ecc623fc791e5e01e0187da99f0", + "url": "https://api.github.com/repos/j0k3r/graby/zipball/93b7c6304b7917e9cc413b046d6ed16ec27e8d20", + "reference": "93b7c6304b7917e9cc413b046d6ed16ec27e8d20", "shasum": "" }, "require": { "ext-curl": "*", "ext-tidy": "*", "fossar/htmlawed": "^1.2.7", + "guzzlehttp/psr7": "^1.5.0", "http-interop/http-factory-guzzle": "^1.0", "j0k3r/graby-site-config": "^1.0.110", "j0k3r/httplug-ssrf-plugin": "^2.0", @@ -4311,7 +4391,7 @@ "php-http/message": "^1.9", "simplepie/simplepie": "^1.5", "smalot/pdfparser": "^1.0", - "symfony/options-resolver": "^3.4|^4.0|^5.0", + "symfony/options-resolver": "^3.4|^4.4|^5.3", "true/punycode": "^2.1" }, "require-dev": { @@ -4323,7 +4403,7 @@ "phpstan/phpstan": "^0.12", "phpstan/phpstan-deprecation-rules": "^0.12", "phpstan/phpstan-phpunit": "^0.12", - "symfony/phpunit-bridge": "^5.1" + "symfony/phpunit-bridge": "^5.3" }, "type": "library", "extra": { @@ -4355,7 +4435,7 @@ "description": "Graby helps you extract article content from web pages", "support": { "issues": "https://github.com/j0k3r/graby/issues", - "source": "https://github.com/j0k3r/graby/tree/2.3.0" + "source": "https://github.com/j0k3r/graby/tree/2.3.3" }, "funding": [ { @@ -4363,28 +4443,28 @@ "type": "github" } ], - "time": "2021-06-01T15:01:40+00:00" + "time": "2021-12-13T05:38:00+00:00" }, { "name": "j0k3r/graby-site-config", - "version": "1.0.134", + "version": "1.0.142", "source": { "type": "git", "url": "https://github.com/j0k3r/graby-site-config.git", - "reference": "bec9ca2777bc0b3816ce3534971f3d3b41dca890" + "reference": "adf8cd8202b0f0c5242e61d894c8c2f61ba6550b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/bec9ca2777bc0b3816ce3534971f3d3b41dca890", - "reference": "bec9ca2777bc0b3816ce3534971f3d3b41dca890", + "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/adf8cd8202b0f0c5242e61d894c8c2f61ba6550b", + "reference": "adf8cd8202b0f0c5242e61d894c8c2f61ba6550b", "shasum": "" }, "require": { - "symfony/finder": "~2.6|~3.0|~4.0|~5.0" + "symfony/finder": "~2.6|~3.0|~4.0|~5.0|~6.0" }, "require-dev": { "liip/rmt": "1.2.*", - "symfony/phpunit-bridge": "^4.3|^5.0" + "symfony/phpunit-bridge": "^6.0" }, "type": "library", "autoload": { @@ -4405,9 +4485,9 @@ "description": "Graby site config files", "support": { "issues": "https://github.com/j0k3r/graby-site-config/issues", - "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.134" + "source": "https://github.com/j0k3r/graby-site-config/tree/1.0.142" }, - "time": "2021-07-28T14:43:50+00:00" + "time": "2022-01-03T09:24:11+00:00" }, { "name": "j0k3r/httplug-ssrf-plugin", @@ -4481,16 +4561,16 @@ }, { "name": "j0k3r/php-readability", - "version": "1.2.7", + "version": "1.2.9", "source": { "type": "git", "url": "https://github.com/j0k3r/php-readability.git", - "reference": "9a490fac078b0f773c9848af1c6d76336a073a8d" + "reference": "c506b7ebd7afe77cd6e4e24c0871991fd430b646" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/9a490fac078b0f773c9848af1c6d76336a073a8d", - "reference": "9a490fac078b0f773c9848af1c6d76336a073a8d", + "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/c506b7ebd7afe77cd6e4e24c0871991fd430b646", + "reference": "c506b7ebd7afe77cd6e4e24c0871991fd430b646", "shasum": "" }, "require": { @@ -4502,7 +4582,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "^2.14", "monolog/monolog": "^1.24|^2.1", - "symfony/phpunit-bridge": "^4.2.3" + "symfony/phpunit-bridge": "^4.4|^5.3" }, "suggest": { "ext-tidy": "Used to clean up given HTML and to avoid problems with bad HTML structure." @@ -4552,7 +4632,7 @@ ], "support": { "issues": "https://github.com/j0k3r/php-readability/issues", - "source": "https://github.com/j0k3r/php-readability/tree/1.2.7" + "source": "https://github.com/j0k3r/php-readability/tree/1.2.9" }, "funding": [ { @@ -4560,7 +4640,7 @@ "type": "github" } ], - "time": "2021-03-09T10:14:29+00:00" + "time": "2021-11-29T20:06:47+00:00" }, { "name": "javibravo/simpleue", @@ -4734,16 +4814,16 @@ }, { "name": "jms/metadata", - "version": "2.5.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "b5c52549807b2d855b3d7e36ec164c00eb547338" + "reference": "c3a3214354b5a765a19875f7b7c5ebcd94e462e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/b5c52549807b2d855b3d7e36ec164c00eb547338", - "reference": "b5c52549807b2d855b3d7e36ec164c00eb547338", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/c3a3214354b5a765a19875f7b7c5ebcd94e462e5", + "reference": "c3a3214354b5a765a19875f7b7c5ebcd94e462e5", "shasum": "" }, "require": { @@ -4792,31 +4872,31 @@ ], "support": { "issues": "https://github.com/schmittjoh/metadata/issues", - "source": "https://github.com/schmittjoh/metadata/tree/2.5.0" + "source": "https://github.com/schmittjoh/metadata/tree/2.6.1" }, - "time": "2021-03-07T19:20:09+00:00" + "time": "2021-11-22T12:27:42+00:00" }, { "name": "jms/serializer", - "version": "3.13.0", + "version": "3.17.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "06909ae3766b0f0ff93f585c3fc407ab7c7942aa" + "reference": "190f64b051795d447ec755acbfdb1bff330a6707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/06909ae3766b0f0ff93f585c3fc407ab7c7942aa", - "reference": "06909ae3766b0f0ff93f585c3fc407ab7c7942aa", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/190f64b051795d447ec755acbfdb1bff330a6707", + "reference": "190f64b051795d447ec755acbfdb1bff330a6707", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", + "doctrine/annotations": "^1.13", "doctrine/instantiator": "^1.0.3", "doctrine/lexer": "^1.1", - "jms/metadata": "^2.0", + "jms/metadata": "^2.6", "php": "^7.2||^8.0", - "phpstan/phpdoc-parser": "^0.4 || ^0.5" + "phpstan/phpdoc-parser": "^0.4 || ^0.5 || ^1.0" }, "require-dev": { "doctrine/coding-standard": "^8.1", @@ -4826,16 +4906,17 @@ "ext-pdo_sqlite": "*", "jackalope/jackalope-doctrine-dbal": "^1.1.5", "ocramius/proxy-manager": "^1.0|^2.0", - "phpstan/phpstan": "^0.12.65", - "phpunit/phpunit": "^8.0||^9.0", + "phpbench/phpbench": "^1.0", + "phpstan/phpstan": "^1.0.2", + "phpunit/phpunit": "^8.5.21||^9.0", "psr/container": "^1.0", - "symfony/dependency-injection": "^3.0|^4.0|^5.0", - "symfony/expression-language": "^3.0|^4.0|^5.0", - "symfony/filesystem": "^3.0|^4.0|^5.0", - "symfony/form": "^3.0|^4.0|^5.0", - "symfony/translation": "^3.0|^4.0|^5.0", - "symfony/validator": "^3.1.9|^4.0|^5.0", - "symfony/yaml": "^3.3|^4.0|^5.0", + "symfony/dependency-injection": "^3.0|^4.0|^5.0|^6.0", + "symfony/expression-language": "^3.2|^4.0|^5.0|^6.0", + "symfony/filesystem": "^3.0|^4.0|^5.0|^6.0", + "symfony/form": "^3.0|^4.0|^5.0|^6.0", + "symfony/translation": "^3.0|^4.0|^5.0|^6.0", + "symfony/validator": "^3.1.9|^4.0|^5.0|^6.0", + "symfony/yaml": "^3.3|^4.0|^5.0|^6.0", "twig/twig": "~1.34|~2.4|^3.0" }, "suggest": { @@ -4846,7 +4927,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.12-dev" + "dev-master": "3.x-dev" } }, "autoload": { @@ -4879,7 +4960,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/serializer/issues", - "source": "https://github.com/schmittjoh/serializer/tree/3.13.0" + "source": "https://github.com/schmittjoh/serializer/tree/3.17.1" }, "funding": [ { @@ -4887,20 +4968,20 @@ "type": "github" } ], - "time": "2021-07-05T11:46:58+00:00" + "time": "2021-12-28T20:59:55+00:00" }, { "name": "jms/serializer-bundle", - "version": "3.9.1", + "version": "3.10.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "2fbf2385668dd715d030567fd41e181bbf41fb42" + "reference": "1a030ecaf913b7a895eeaab04191cd7ff1810b46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/2fbf2385668dd715d030567fd41e181bbf41fb42", - "reference": "2fbf2385668dd715d030567fd41e181bbf41fb42", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/1a030ecaf913b7a895eeaab04191cd7ff1810b46", + "reference": "1a030ecaf913b7a895eeaab04191cd7ff1810b46", "shasum": "" }, "require": { @@ -4965,7 +5046,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/JMSSerializerBundle/issues", - "source": "https://github.com/schmittjoh/JMSSerializerBundle/tree/3.9.1" + "source": "https://github.com/schmittjoh/JMSSerializerBundle/tree/3.10.0" }, "funding": [ { @@ -4973,7 +5054,7 @@ "type": "github" } ], - "time": "2021-03-23T12:21:23+00:00" + "time": "2021-08-06T12:12:38+00:00" }, { "name": "kphoen/rulerz", @@ -5797,16 +5878,16 @@ }, { "name": "michelf/php-markdown", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/michelf/php-markdown.git", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c" + "reference": "5024d623c1a057dcd2d076d25b7d270a1d0d55f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/c83178d49e372ca967d1a8c77ae4e051b3a3c75c", - "reference": "c83178d49e372ca967d1a8c77ae4e051b3a3c75c", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/5024d623c1a057dcd2d076d25b7d270a1d0d55f3", + "reference": "5024d623c1a057dcd2d076d25b7d270a1d0d55f3", "shasum": "" }, "require": { @@ -5844,9 +5925,9 @@ ], "support": { "issues": "https://github.com/michelf/php-markdown/issues", - "source": "https://github.com/michelf/php-markdown/tree/1.9.0" + "source": "https://github.com/michelf/php-markdown/tree/1.9.1" }, - "time": "2019-12-02T02:32:27+00:00" + "time": "2021-11-24T02:52:38+00:00" }, { "name": "mnapoli/piwik-twig-extension", @@ -6649,16 +6730,16 @@ }, { "name": "php-http/discovery", - "version": "1.14.0", + "version": "1.14.1", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "778f722e29250c1fac0bbdef2c122fa5d038c9eb" + "reference": "de90ab2b41d7d61609f504e031339776bc8c7223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/778f722e29250c1fac0bbdef2c122fa5d038c9eb", - "reference": "778f722e29250c1fac0bbdef2c122fa5d038c9eb", + "url": "https://api.github.com/repos/php-http/discovery/zipball/de90ab2b41d7d61609f504e031339776bc8c7223", + "reference": "de90ab2b41d7d61609f504e031339776bc8c7223", "shasum": "" }, "require": { @@ -6711,9 +6792,9 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.14.0" + "source": "https://github.com/php-http/discovery/tree/1.14.1" }, - "time": "2021-06-01T14:30:21+00:00" + "time": "2021-09-18T07:57:46+00:00" }, { "name": "php-http/guzzle5-adapter", @@ -7011,16 +7092,16 @@ }, { "name": "php-http/message", - "version": "1.11.2", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/php-http/message.git", - "reference": "295c82867d07261f2fa4b3a26677519fc6f7f5f6" + "reference": "39eb7548be982a81085fe5a6e2a44268cd586291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/message/zipball/295c82867d07261f2fa4b3a26677519fc6f7f5f6", - "reference": "295c82867d07261f2fa4b3a26677519fc6f7f5f6", + "url": "https://api.github.com/repos/php-http/message/zipball/39eb7548be982a81085fe5a6e2a44268cd586291", + "reference": "39eb7548be982a81085fe5a6e2a44268cd586291", "shasum": "" }, "require": { @@ -7079,9 +7160,9 @@ ], "support": { "issues": "https://github.com/php-http/message/issues", - "source": "https://github.com/php-http/message/tree/1.11.2" + "source": "https://github.com/php-http/message/tree/1.12.0" }, - "time": "2021-08-03T11:52:11+00:00" + "time": "2021-08-29T09:13:12+00:00" }, { "name": "php-http/message-factory", @@ -7253,16 +7334,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.9", + "version": "3.0.12", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "a127a5133804ff2f47ae629dd529b129da616ad7" + "reference": "89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a127a5133804ff2f47ae629dd529b129da616ad7", - "reference": "a127a5133804ff2f47ae629dd529b129da616ad7", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb", + "reference": "89bfb45bd8b1abc3b37e910d57f5dbd3174f40fb", "shasum": "" }, "require": { @@ -7344,7 +7425,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.9" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.12" }, "funding": [ { @@ -7360,20 +7441,20 @@ "type": "tidelift" } ], - "time": "2021-06-14T06:54:45+00:00" + "time": "2021-11-28T23:46:03+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "0.5.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "ea0b17460ec38e20d7eb64e7ec49b5d44af5d28c" + "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ea0b17460ec38e20d7eb64e7ec49b5d44af5d28c", - "reference": "ea0b17460ec38e20d7eb64e7ec49b5d44af5d28c", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e", + "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e", "shasum": "" }, "require": { @@ -7382,15 +7463,15 @@ "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12.87", - "phpstan/phpstan-strict-rules": "^0.12.5", + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.5-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -7407,9 +7488,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/0.5.5" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0" }, - "time": "2021-06-11T13:24:46+00:00" + "time": "2021-09-16T20:46:02+00:00" }, { "name": "phpzip/phpzip", @@ -7613,16 +7694,16 @@ }, { "name": "predis/predis", - "version": "v1.1.9", + "version": "v1.1.10", "source": { "type": "git", "url": "https://github.com/predis/predis.git", - "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259" + "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/predis/predis/zipball/c50c3393bb9f47fa012d0cdfb727a266b0818259", - "reference": "c50c3393bb9f47fa012d0cdfb727a266b0818259", + "url": "https://api.github.com/repos/predis/predis/zipball/a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e", + "reference": "a2fb02d738bedadcffdbb07efa3a5e7bd57f8d6e", "shasum": "" }, "require": { @@ -7667,7 +7748,7 @@ ], "support": { "issues": "https://github.com/predis/predis/issues", - "source": "https://github.com/predis/predis/tree/v1.1.9" + "source": "https://github.com/predis/predis/tree/v1.1.10" }, "funding": [ { @@ -7675,7 +7756,7 @@ "type": "github" } ], - "time": "2021-10-05T19:02:38+00:00" + "time": "2022-01-05T17:46:08+00:00" }, { "name": "psr/cache", @@ -8252,6 +8333,7 @@ "issues": "https://github.com/scheb/two-factor-bundle/issues", "source": "https://github.com/scheb/two-factor-bundle/tree/v4.18.4" }, + "abandoned": "scheb/2fa-bundle", "time": "2020-10-30T19:24:18+00:00" }, { @@ -8698,16 +8780,16 @@ }, { "name": "simplepie/simplepie", - "version": "1.5.6", + "version": "1.5.8", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6" + "reference": "d1d80f37264c9f1ed7fa3434eca14d179cb689b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6", - "reference": "1c68e14ca3ac84346b6e6fe3c5eedf725d0f92c6", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/d1d80f37264c9f1ed7fa3434eca14d179cb689b1", + "reference": "d1d80f37264c9f1ed7fa3434eca14d179cb689b1", "shasum": "" }, "require": { @@ -8717,7 +8799,7 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.4.3 || ~6.5" + "yoast/phpunit-polyfills": "^1.0.1" }, "suggest": { "ext-curl": "", @@ -8763,22 +8845,22 @@ ], "support": { "issues": "https://github.com/simplepie/simplepie/issues", - "source": "https://github.com/simplepie/simplepie/tree/1.5.6" + "source": "https://github.com/simplepie/simplepie/tree/1.5.8" }, - "time": "2020-10-14T07:17:22+00:00" + "time": "2021-12-24T02:53:50+00:00" }, { "name": "smalot/pdfparser", - "version": "v1.0.2", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/smalot/pdfparser.git", - "reference": "35c88120b7a6edebb54037a3bb15c5de3a5c8a24" + "reference": "43e436f32fd0e3d1f808c3b1768975c598c9a7df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smalot/pdfparser/zipball/35c88120b7a6edebb54037a3bb15c5de3a5c8a24", - "reference": "35c88120b7a6edebb54037a3bb15c5de3a5c8a24", + "url": "https://api.github.com/repos/smalot/pdfparser/zipball/43e436f32fd0e3d1f808c3b1768975c598c9a7df", + "reference": "43e436f32fd0e3d1f808c3b1768975c598c9a7df", "shasum": "" }, "require": { @@ -8813,9 +8895,9 @@ ], "support": { "issues": "https://github.com/smalot/pdfparser/issues", - "source": "https://github.com/smalot/pdfparser/tree/v1.0.2" + "source": "https://github.com/smalot/pdfparser/tree/v1.1.0" }, - "time": "2021-06-17T07:28:42+00:00" + "time": "2021-08-03T08:33:34+00:00" }, { "name": "spomky-labs/otphp", @@ -8963,16 +9045,16 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v6.2.7", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933" + "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933", - "reference": "15f7faf8508e04471f666633addacf54c0ab5933", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c", + "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c", "shasum": "" }, "require": { @@ -8984,7 +9066,7 @@ }, "require-dev": { "mockery/mockery": "^1.0", - "symfony/phpunit-bridge": "^4.4|^5.0" + "symfony/phpunit-bridge": "^4.4|^5.4" }, "suggest": { "ext-intl": "Needed to support internationalized email addresses" @@ -9022,7 +9104,7 @@ ], "support": { "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7" + "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0" }, "funding": [ { @@ -9034,20 +9116,21 @@ "type": "tidelift" } ], - "time": "2021-03-09T12:30:35+00:00" + "abandoned": "symfony/mailer", + "time": "2021-10-18T15:26:12+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8", + "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8", "shasum": "" }, "require": { @@ -9056,7 +9139,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -9085,7 +9168,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0" }, "funding": [ { @@ -9101,30 +9184,30 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2021-07-12T14:48:14+00:00" }, { "name": "symfony/http-client", - "version": "v5.3.4", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "67c177d4df8601d9a71f9d615c52171c98d22d74" + "reference": "5e344f1402584a56631c81a24ec9403e3159c790" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/67c177d4df8601d9a71f9d615c52171c98d22d74", - "reference": "67c177d4df8601d9a71f9d615c52171c98d22d74", + "url": "https://api.github.com/repos/symfony/http-client/zipball/5e344f1402584a56631c81a24ec9403e3159c790", + "reference": "5e344f1402584a56631c81a24ec9403e3159c790", "shasum": "" }, "require": { "php": ">=7.2.5", "psr/log": "^1|^2|^3", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/http-client-contracts": "^2.4", "symfony/polyfill-php73": "^1.11", "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.0|^2" + "symfony/service-contracts": "^1.0|^2|^3" }, "provide": { "php-http/async-client-implementation": "*", @@ -9141,10 +9224,10 @@ "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/http-kernel": "^4.4.13|^5.1.5", - "symfony/process": "^4.4|^5.0", - "symfony/stopwatch": "^4.4|^5.0" + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4.13|^5.1.5|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/stopwatch": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { @@ -9172,7 +9255,7 @@ "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-client/tree/v5.3.4" + "source": "https://github.com/symfony/http-client/tree/v5.4.2" }, "funding": [ { @@ -9188,20 +9271,20 @@ "type": "tidelift" } ], - "time": "2021-07-23T15:55:36+00:00" + "time": "2021-12-29T10:10:35+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4" + "reference": "ec82e57b5b714dbb69300d348bd840b345e24166" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4", - "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ec82e57b5b714dbb69300d348bd840b345e24166", + "reference": "ec82e57b5b714dbb69300d348bd840b345e24166", "shasum": "" }, "require": { @@ -9213,7 +9296,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -9250,7 +9333,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.0" }, "funding": [ { @@ -9266,25 +9349,25 @@ "type": "tidelift" } ], - "time": "2021-04-11T23:07:08+00:00" + "time": "2021-11-03T09:24:47+00:00" }, { "name": "symfony/mime", - "version": "v5.3.4", + "version": "v5.4.2", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "633e4e8afe9e529e5599d71238849a4218dd497b" + "reference": "1bfd938cf9562822c05c4d00e8f92134d3c8e42d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/633e4e8afe9e529e5599d71238849a4218dd497b", - "reference": "633e4e8afe9e529e5599d71238849a4218dd497b", + "url": "https://api.github.com/repos/symfony/mime/zipball/1bfd938cf9562822c05c4d00e8f92134d3c8e42d", + "reference": "1bfd938cf9562822c05c4d00e8f92134d3c8e42d", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", + "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-intl-idn": "^1.10", "symfony/polyfill-mbstring": "^1.0", "symfony/polyfill-php80": "^1.16" @@ -9298,10 +9381,10 @@ "require-dev": { "egulias/email-validator": "^2.1.10|^3.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", - "symfony/dependency-injection": "^4.4|^5.0", - "symfony/property-access": "^4.4|^5.1", - "symfony/property-info": "^4.4|^5.1", - "symfony/serializer": "^5.2" + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.1|^6.0", + "symfony/property-info": "^4.4|^5.1|^6.0", + "symfony/serializer": "^5.2|^6.0" }, "type": "library", "autoload": { @@ -9333,7 +9416,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v5.3.4" + "source": "https://github.com/symfony/mime/tree/v5.4.2" }, "funding": [ { @@ -9349,7 +9432,7 @@ "type": "tidelift" } ], - "time": "2021-07-21T12:40:44+00:00" + "time": "2021-12-28T17:15:56+00:00" }, { "name": "symfony/monolog-bundle", @@ -9434,7 +9517,7 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", @@ -9491,7 +9574,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-apcu/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-apcu/tree/v1.24.0" }, "funding": [ { @@ -9511,21 +9594,24 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "30885182c981ab175d4d034db0f6f469898070ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, @@ -9570,7 +9656,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" }, "funding": [ { @@ -9586,25 +9672,28 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-20T20:35:02+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933" + "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933", - "reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40", + "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-iconv": "*" + }, "suggest": { "ext-iconv": "For best performance" }, @@ -9650,7 +9739,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.24.0" }, "funding": [ { @@ -9666,20 +9755,20 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2022-01-04T09:04:05+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "4a80a521d6176870b6445cfb469c130f9cae1dda" + "reference": "c023a439b8551e320cc3c8433b198e408a623af1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/4a80a521d6176870b6445cfb469c130f9cae1dda", - "reference": "4a80a521d6176870b6445cfb469c130f9cae1dda", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/c023a439b8551e320cc3c8433b198e408a623af1", + "reference": "c023a439b8551e320cc3c8433b198e408a623af1", "shasum": "" }, "require": { @@ -9737,7 +9826,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.24.0" }, "funding": [ { @@ -9753,20 +9842,20 @@ "type": "tidelift" } ], - "time": "2021-05-24T10:04:56+00:00" + "time": "2021-10-26T17:16:04+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65" + "reference": "749045c69efb97c70d25d7463abba812e91f3a44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65", - "reference": "65bd267525e82759e7d8c4e8ceea44f398838e65", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44", + "reference": "749045c69efb97c70d25d7463abba812e91f3a44", "shasum": "" }, "require": { @@ -9824,7 +9913,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0" }, "funding": [ { @@ -9840,11 +9929,11 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-09-14T14:02:44+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -9908,7 +9997,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0" }, "funding": [ { @@ -9928,21 +10017,24 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6", - "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -9988,7 +10080,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -10004,7 +10096,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T12:26:48+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { "name": "symfony/polyfill-php56", @@ -10144,7 +10236,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -10200,7 +10292,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" }, "funding": [ { @@ -10220,16 +10312,16 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010" + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010", - "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5", + "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5", "shasum": "" }, "require": { @@ -10279,7 +10371,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0" }, "funding": [ { @@ -10295,20 +10387,20 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-06-05T21:20:04+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.23.1", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be" + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be", - "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9", + "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9", "shasum": "" }, "require": { @@ -10362,7 +10454,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0" }, "funding": [ { @@ -10378,25 +10470,28 @@ "type": "tidelift" } ], - "time": "2021-07-28T13:41:28+00:00" + "time": "2021-09-13T13:58:33+00:00" }, { "name": "symfony/polyfill-uuid", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-uuid.git", - "reference": "9165effa2eb8a31bb3fa608df9d529920d21ddd9" + "reference": "7529922412d23ac44413d0f308861d50cf68d3ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9165effa2eb8a31bb3fa608df9d529920d21ddd9", - "reference": "9165effa2eb8a31bb3fa608df9d529920d21ddd9", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/7529922412d23ac44413d0f308861d50cf68d3ee", + "reference": "7529922412d23ac44413d0f308861d50cf68d3ee", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-uuid": "*" + }, "suggest": { "ext-uuid": "For best performance" }, @@ -10441,7 +10536,7 @@ "uuid" ], "support": { - "source": "https://github.com/symfony/polyfill-uuid/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.24.0" }, "funding": [ { @@ -10457,25 +10552,29 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2021-10-20T20:35:02+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", + "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc", "shasum": "" }, "require": { "php": ">=7.2.5", - "psr/container": "^1.1" + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1" + }, + "conflict": { + "ext-psr": "<1.1|>=2" }, "suggest": { "symfony/service-implementation": "" @@ -10483,7 +10582,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -10520,7 +10619,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v2.5.0" }, "funding": [ { @@ -10536,7 +10635,7 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2021-11-04T16:48:04+00:00" }, { "name": "symfony/swiftmailer-bundle", @@ -11102,26 +11201,27 @@ }, { "name": "twig/twig", - "version": "v2.14.6", + "version": "v2.14.10", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "27e5cf2b05e3744accf39d4c68a3235d9966d260" + "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/27e5cf2b05e3744accf39d4c68a3235d9966d260", - "reference": "27e5cf2b05e3744accf39d4c68a3235d9966d260", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/95fb194cd4dd6ac373a27af2bde2bad5d3f27aba", + "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=7.1.3", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9" + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, "type": "library", "extra": { @@ -11165,7 +11265,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.6" + "source": "https://github.com/twigphp/Twig/tree/v2.14.10" }, "funding": [ { @@ -11177,7 +11277,7 @@ "type": "tidelift" } ], - "time": "2021-05-16T12:12:47+00:00" + "time": "2022-01-03T21:13:26+00:00" }, { "name": "wallabag/php-mobi", @@ -11299,34 +11399,35 @@ }, { "name": "willdurand/hateoas", - "version": "3.7.0", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/willdurand/Hateoas.git", - "reference": "63e255bb762fd6fa79d973d99ac669daab56c638" + "reference": "2f37b8823328a9ee170f2af7880ce02f9fabe019" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/63e255bb762fd6fa79d973d99ac669daab56c638", - "reference": "63e255bb762fd6fa79d973d99ac669daab56c638", + "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/2f37b8823328a9ee170f2af7880ce02f9fabe019", + "reference": "2f37b8823328a9ee170f2af7880ce02f9fabe019", "shasum": "" }, "require": { - "doctrine/annotations": "~1.0", + "doctrine/annotations": "^1.13.2", "jms/metadata": "^2.0", "jms/serializer": "^3.2", "php": "^7.2 | ^8.0", - "symfony/expression-language": "~3.0 || ~4.0 || ~5.0" + "symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0" }, "require-dev": { "doctrine/coding-standard": "^5.0 | ^8.0", "doctrine/persistence": "^1.3.4", - "pagerfanta/pagerfanta": "~1.0", - "phpspec/prophecy-phpunit": "^2.0", - "phpunit/phpunit": "^7 | ^9", - "symfony/routing": "~3.0 || ~4.0 || ~5.0", - "symfony/yaml": "~3.0 || ~4.0 || ~5.0", - "twig/twig": "^1.34 || ^2.0 || ^3.0" + "pagerfanta/core": "^2.4 || ^3.0", + "phpdocumentor/type-resolver": "^1.5.1", + "phpspec/prophecy-phpunit": "^2.0.1", + "phpunit/phpunit": "^7 | ^9.5.10", + "symfony/routing": "~3.0 || ~4.0 || ~5.0 || ~6.0", + "symfony/yaml": "~3.0 || ~4.0 || ~5.0 || ~6.0", + "twig/twig": "^1.43 || ^2.13 || ^3.0" }, "suggest": { "symfony/routing": "To use the SymfonyRouteFactory.", @@ -11365,35 +11466,36 @@ "description": "A PHP library to support implementing representations for HATEOAS REST web services", "support": { "issues": "https://github.com/willdurand/Hateoas/issues", - "source": "https://github.com/willdurand/Hateoas/tree/3.7.0" + "source": "https://github.com/willdurand/Hateoas/tree/3.8.0" }, - "time": "2021-01-12T22:07:17+00:00" + "time": "2021-12-18T21:29:42+00:00" }, { "name": "willdurand/hateoas-bundle", - "version": "2.2.0", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/willdurand/BazingaHateoasBundle.git", - "reference": "278e9e65cf78386320380d7d7d6ce659b7c6fd35" + "reference": "e1faa8f86dfea873fe1683acbbfac1f756ca70ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/278e9e65cf78386320380d7d7d6ce659b7c6fd35", - "reference": "278e9e65cf78386320380d7d7d6ce659b7c6fd35", + "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/e1faa8f86dfea873fe1683acbbfac1f756ca70ef", + "reference": "e1faa8f86dfea873fe1683acbbfac1f756ca70ef", "shasum": "" }, "require": { - "jms/serializer-bundle": "^3.1", + "jms/serializer-bundle": "^3.1 || ^4.0", "php": "^7.2 || ^8.0", - "symfony/expression-language": "~3.0 || ~4.0 || ~5.0", - "symfony/framework-bundle": "~3.0 || ~4.0 || ~5.0", + "symfony/expression-language": "~3.0 || ~4.0 || ~5.0 || ~6.0", + "symfony/framework-bundle": "~3.0 || ~4.0 || ~5.0 || ~6.0", "willdurand/hateoas": "^3.5" }, "require-dev": { + "doctrine/annotations": "^1.13.2", "doctrine/coding-standard": "^8.0", "phpunit/phpunit": "^8.5 || ^9.5", - "symfony/stopwatch": "~3.0 || ~4.0 || ~5.0", + "symfony/stopwatch": "~3.0 || ~4.0 || ~5.0 || ~6.0", "twig/twig": "~1.12|~2.0" }, "type": "symfony-bundle", @@ -11424,9 +11526,9 @@ ], "support": { "issues": "https://github.com/willdurand/BazingaHateoasBundle/issues", - "source": "https://github.com/willdurand/BazingaHateoasBundle/tree/2.2.0" + "source": "https://github.com/willdurand/BazingaHateoasBundle/tree/2.4.0" }, - "time": "2021-03-21T20:07:17+00:00" + "time": "2021-11-06T22:20:09+00:00" }, { "name": "willdurand/jsonp-callback-validator", @@ -11531,17 +11633,88 @@ ], "packages-dev": [ { - "name": "composer/semver", - "version": "3.2.5", + "name": "composer/pcre", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/composer/semver.git", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9" + "url": "https://github.com/composer/pcre.git", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9", - "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9", + "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2", + "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/1.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-12-06T15:17:27+00:00" + }, + { + "name": "composer/semver", + "version": "3.2.7", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/deac27056b57e46faf136fae7b449eeaa71661ee", + "reference": "deac27056b57e46faf136fae7b449eeaa71661ee", "shasum": "" }, "require": { @@ -11593,7 +11766,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.2.5" + "source": "https://github.com/composer/semver/tree/3.2.7" }, "funding": [ { @@ -11609,29 +11782,31 @@ "type": "tidelift" } ], - "time": "2021-05-24T12:41:47+00:00" + "time": "2022-01-04T09:57:54+00:00" }, { "name": "composer/xdebug-handler", - "version": "2.0.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339" + "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339", - "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", + "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a", "shasum": "" }, "require": { + "composer/pcre": "^1", "php": "^5.3.2 || ^7.0 || ^8.0", "psr/log": "^1 || ^2 || ^3" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0" }, "type": "library", "autoload": { @@ -11657,7 +11832,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/2.0.2" + "source": "https://github.com/composer/xdebug-handler/tree/2.0.4" }, "funding": [ { @@ -11673,7 +11848,7 @@ "type": "tidelift" } ], - "time": "2021-07-31T17:03:58+00:00" + "time": "2022-01-04T17:06:45+00:00" }, { "name": "dama/doctrine-test-bundle", @@ -11740,16 +11915,16 @@ }, { "name": "doctrine/data-fixtures", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "51d3d4880d28951fff42a635a2389f8c63baddc5" + "reference": "f18adf13f6c81c67a88360dca359ad474523f8e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/51d3d4880d28951fff42a635a2389f8c63baddc5", - "reference": "51d3d4880d28951fff42a635a2389f8c63baddc5", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/f18adf13f6c81c67a88360dca359ad474523f8e3", + "reference": "f18adf13f6c81c67a88360dca359ad474523f8e3", "shasum": "" }, "require": { @@ -11761,8 +11936,8 @@ "doctrine/phpcr-odm": "<1.3.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "doctrine/dbal": "^2.5.4", + "doctrine/coding-standard": "^9.0", + "doctrine/dbal": "^2.5.4 || ^3.0", "doctrine/mongodb-odm": "^1.3.0 || ^2.0.0", "doctrine/orm": "^2.7.0", "ext-sqlite3": "*", @@ -11797,7 +11972,7 @@ ], "support": { "issues": "https://github.com/doctrine/data-fixtures/issues", - "source": "https://github.com/doctrine/data-fixtures/tree/1.5.0" + "source": "https://github.com/doctrine/data-fixtures/tree/1.5.1" }, "funding": [ { @@ -11813,20 +11988,20 @@ "type": "tidelift" } ], - "time": "2021-01-23T10:20:43+00:00" + "time": "2021-09-20T21:51:43+00:00" }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "870189619a7770f468ffb0b80925302e065a3b34" + "reference": "31ba202bebce0b66fe830f49f96228dcdc1503e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/870189619a7770f468ffb0b80925302e065a3b34", - "reference": "870189619a7770f468ffb0b80925302e065a3b34", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/31ba202bebce0b66fe830f49f96228dcdc1503e7", + "reference": "31ba202bebce0b66fe830f49f96228dcdc1503e7", "shasum": "" }, "require": { @@ -11835,16 +12010,18 @@ "doctrine/orm": "^2.6.0", "doctrine/persistence": "^1.3.7|^2.0", "php": "^7.1 || ^8.0", - "symfony/config": "^3.4|^4.3|^5.0", - "symfony/console": "^3.4|^4.3|^5.0", - "symfony/dependency-injection": "^3.4|^4.3|^5.0", - "symfony/doctrine-bridge": "^3.4|^4.1|^5.0", - "symfony/http-kernel": "^3.4|^4.3|^5.0" + "symfony/config": "^3.4|^4.3|^5.0|^6.0", + "symfony/console": "^3.4|^4.3|^5.0|^6.0", + "symfony/dependency-injection": "^3.4.47|^4.3|^5.0|^6.0", + "symfony/doctrine-bridge": "^3.4|^4.1|^5.0|^6.0", + "symfony/http-kernel": "^3.4|^4.3|^5.0|^6.0" }, "require-dev": { - "doctrine/coding-standard": "^6.0", + "doctrine/coding-standard": "^8.0", + "phpstan/phpstan": "^0.12.99", "phpunit/phpunit": "^7.4 || ^8.0 || ^9.2", - "symfony/phpunit-bridge": "^4.1|^5.0" + "symfony/phpunit-bridge": "^4.1|^5.0|^6.0", + "vimeo/psalm": "^4.10" }, "type": "symfony-bundle", "autoload": { @@ -11878,7 +12055,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineFixturesBundle/issues", - "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.0" + "source": "https://github.com/doctrine/DoctrineFixturesBundle/tree/3.4.1" }, "funding": [ { @@ -11894,20 +12071,20 @@ "type": "tidelift" } ], - "time": "2020-11-14T09:36:49+00:00" + "time": "2021-10-28T05:46:28+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.19.1", + "version": "v2.19.3", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "1fa4af92841f67362c053728989b262fba8eb1ec" + "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1fa4af92841f67362c053728989b262fba8eb1ec", - "reference": "1fa4af92841f67362c053728989b262fba8eb1ec", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", + "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", "shasum": "" }, "require": { @@ -11995,7 +12172,7 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", - "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.1" + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" }, "funding": [ { @@ -12003,7 +12180,7 @@ "type": "github" } ], - "time": "2021-08-02T17:52:09+00:00" + "time": "2021-11-15T17:17:55+00:00" }, { "name": "m6web/redis-mock", @@ -12167,23 +12344,23 @@ }, { "name": "php-http/mock-client", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/php-http/mock-client.git", - "reference": "1f89dc2dcfcf7c2aa69a2045fd05d67c52f8b612" + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/mock-client/zipball/1f89dc2dcfcf7c2aa69a2045fd05d67c52f8b612", - "reference": "1f89dc2dcfcf7c2aa69a2045fd05d67c52f8b612", + "url": "https://api.github.com/repos/php-http/mock-client/zipball/a797c2a9122cccafcce14773b8a24d2808a9ab44", + "reference": "a797c2a9122cccafcce14773b8a24d2808a9ab44", "shasum": "" }, "require": { "php": "^7.1 || ^8.0", - "php-http/client-common": "^1.9 || ^2.0", + "php-http/client-common": "^2.0", "php-http/discovery": "^1.0", - "php-http/httplug": "^1.0 || ^2.0", + "php-http/httplug": "^2.0", "php-http/message-factory": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", @@ -12192,7 +12369,8 @@ }, "provide": { "php-http/async-client-implementation": "1.0", - "php-http/client-implementation": "1.0" + "php-http/client-implementation": "1.0", + "psr/http-client-implementation": "1.0" }, "require-dev": { "phpspec/phpspec": "^5.1 || ^6.0" @@ -12200,7 +12378,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -12228,9 +12406,9 @@ ], "support": { "issues": "https://github.com/php-http/mock-client/issues", - "source": "https://github.com/php-http/mock-client/tree/1.4.1" + "source": "https://github.com/php-http/mock-client/tree/1.5.0" }, - "time": "2020-07-14T08:01:01+00:00" + "time": "2021-08-25T07:01:14+00:00" }, { "name": "phpstan/extension-installer", diff --git a/package.json b/package.json index e2c304172..ac868a213 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "autoprefixer": "^10.4.1", "babel-loader": "^8.2.3", "css-loader": "^6.5.1", - "eslint": "^7.27.0", - "eslint-config-airbnb-base": "^14.2.1", + "eslint": "^8.6.0", + "eslint-config-airbnb-base": "^15.0.0", "eslint-plugin-import": "^2.25.4", "eslint-webpack-plugin": "^3.1.1", "file-loader": "^6.2.0", @@ -60,6 +60,7 @@ "stylelint-config-standard": "^24.0.0", "stylelint-scss": "^4.1.0", "stylelint-webpack-plugin": "^3.1.0", + "terser-webpack-plugin": "^5.3.0", "url-loader": "^4.1.1", "webpack": "^5.65.0", "webpack-cli": "^4.9.1", diff --git a/web/js/fos_js_routes.js b/web/js/fos_js_routes.js index b856aecc4..cc82a1873 100644 --- a/web/js/fos_js_routes.js +++ b/web/js/fos_js_routes.js @@ -1 +1,140 @@ -fos.Router.setData({"base_url":"","routes":{"import_chrome":{"tokens":[["text","\/import\/chrome"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_firefox":{"tokens":[["text","\/import\/firefox"]],"defaults":[],"requirements":[],"hosttokens":[]},"import":{"tokens":[["text","\/import\/"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_instapaper":{"tokens":[["text","\/import\/instapaper"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_pinboard":{"tokens":[["text","\/import\/pinboard"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_pocket":{"tokens":[["text","\/import\/pocket"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_pocket_auth":{"tokens":[["text","\/import\/pocket\/auth"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_pocket_callback":{"tokens":[["text","\/import\/pocket\/callback"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_readability":{"tokens":[["text","\/import\/readability"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_wallabag_v1":{"tokens":[["text","\/import\/wallabag-v1"]],"defaults":[],"requirements":[],"hosttokens":[]},"import_wallabag_v2":{"tokens":[["text","\/import\/wallabag-v2"]],"defaults":[],"requirements":[],"hosttokens":[]},"user_new":{"tokens":[["text","\/users\/new"]],"defaults":[],"requirements":[],"hosttokens":[]},"developer":{"tokens":[["text","\/developer"]],"defaults":[],"requirements":[],"hosttokens":[]},"developer_create_client":{"tokens":[["text","\/developer\/client\/create"]],"defaults":[],"requirements":[],"hosttokens":[]},"developer_delete_client":{"tokens":[["variable","\/","\\d+","id"],["text","\/developer\/client\/delete"]],"defaults":[],"requirements":{"id":"\\d+"},"hosttokens":[]},"developer_howto_firstapp":{"tokens":[["text","\/developer\/howto\/first-app"]],"defaults":[],"requirements":[],"hosttokens":[]},"config":{"tokens":[["text","\/config"]],"defaults":[],"requirements":[],"hosttokens":[]},"delete_tagging_rule":{"tokens":[["variable","\/","\\d+","id"],["text","\/tagging-rule\/delete"]],"defaults":[],"requirements":{"id":"\\d+"},"hosttokens":[]},"edit_tagging_rule":{"tokens":[["variable","\/","\\d+","id"],["text","\/tagging-rule\/edit"]],"defaults":[],"requirements":{"id":"\\d+"},"hosttokens":[]},"config_reset":{"tokens":[["variable","\/","[^\/]++","type"],["text","\/reset"]],"defaults":[],"requirements":{"id":"annotations|tags|entries"},"hosttokens":[]},"new_entry":{"tokens":[["text","\/new-entry"]],"defaults":[],"requirements":[],"hosttokens":[]},"new":{"tokens":[["text","\/new"]],"defaults":[],"requirements":[],"hosttokens":[]},"all":{"tokens":[["variable","\/","[^\/]++","page"],["text","\/all\/list"]],"defaults":{"page":"1"},"requirements":[],"hosttokens":[]},"archive":{"tokens":[["variable","\/","[^\/]++","page"],["text","\/archive\/list"]],"defaults":{"page":"1"},"requirements":[],"hosttokens":[]},"starred":{"tokens":[["variable","\/","[^\/]++","page"],["text","\/starred\/list"]],"defaults":{"page":"1"},"requirements":[],"hosttokens":[]},"archive_entry":{"tokens":[["variable","\/","\\d+","id"],["text","\/archive"]],"defaults":[],"requirements":{"id":"\\d+"},"hosttokens":[]},"untagged":{"tokens":[["variable","\/","[^\/]++","page"],["text","\/untagged\/list"]],"defaults":{"page":"1"},"requirements":[],"hosttokens":[]},"archive_rss":{"tokens":[["text","\/archive.xml"],["variable","\/","[^\/]++","token"],["variable","\/","[^\/]++","username"]],"defaults":[],"requirements":[],"hosttokens":[]},"starred_rss":{"tokens":[["text","\/starred.xml"],["variable","\/","[^\/]++","token"],["variable","\/","[^\/]++","username"]],"defaults":[],"requirements":[],"hosttokens":[]},"howto":{"tokens":[["text","\/howto"]],"defaults":[],"requirements":[],"hosttokens":[]},"new_tag":{"tokens":[["variable","\/","\\d+","entry"],["text","\/new-tag"]],"defaults":[],"requirements":{"entry":"\\d+"},"hosttokens":[]},"remove_tag":{"tokens":[["variable","\/","\\d+","tag"],["variable","\/","\\d+","entry"],["text","\/remove-tag"]],"defaults":[],"requirements":{"entry":"\\d+","tag":"\\d+"},"hosttokens":[]},"tag":{"tokens":[["text","\/tag\/list"]],"defaults":[],"requirements":[],"hosttokens":[]},"tag_entries":{"tokens":[["variable","\/","[^\/]++","page"],["variable","\/","[^\/]++","slug"],["text","\/tag\/list"]],"defaults":{"page":"1"},"requirements":[],"hosttokens":[]},"api_get_entries_tags":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["text","\/tags"],["variable","\/","[^\/]++","entry"],["text","\/api\/entries"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"api_post_entries_tags":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["text","\/tags"],["variable","\/","[^\/]++","entry"],["text","\/api\/entries"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"api_delete_entries_tags":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["variable","\/","[^\/\\.]++","tag"],["text","\/tags"],["variable","\/","[^\/]++","entry"],["text","\/api\/entries"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"api_get_tags":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["text","\/api\/tags"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"api_delete_tag_label":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["text","\/api\/tag\/label"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"api_delete_tags_label":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["text","\/api\/tags\/label"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"api_delete_tag":{"tokens":[["variable",".","xml|json|txt|csv|pdf|epub|mobi|html","_format"],["variable","\/","[^\/\\.]++","tag"],["text","\/api\/tags"]],"defaults":{"_format":"json"},"requirements":{"_format":"xml|json|txt|csv|pdf|epub|mobi|html"},"hosttokens":[]},"homepage":{"tokens":[["variable","\/","\\d+","page"]],"defaults":{"page":1},"requirements":{"page":"\\d+"},"hosttokens":[]},"fos_user_security_logout":{"tokens":[["text","\/logout"]],"defaults":[],"requirements":[],"hosttokens":[]},"craue_config_settings_modify":{"tokens":[["text","\/settings"]],"defaults":[],"requirements":[],"hosttokens":[]}},"prefix":"","host":"localhost","scheme":"http"}); \ No newline at end of file +fos.Router.setData({ + base_url: '', + routes: { + import_chrome: { + tokens: [['text', '/import/chrome']], defaults: [], requirements: [], hosttokens: [], + }, + import_firefox: { + tokens: [['text', '/import/firefox']], defaults: [], requirements: [], hosttokens: [], + }, + import: { + tokens: [['text', '/import/']], defaults: [], requirements: [], hosttokens: [], + }, + import_instapaper: { + tokens: [['text', '/import/instapaper']], defaults: [], requirements: [], hosttokens: [], + }, + import_pinboard: { + tokens: [['text', '/import/pinboard']], defaults: [], requirements: [], hosttokens: [], + }, + import_pocket: { + tokens: [['text', '/import/pocket']], defaults: [], requirements: [], hosttokens: [], + }, + import_pocket_auth: { + tokens: [['text', '/import/pocket/auth']], defaults: [], requirements: [], hosttokens: [], + }, + import_pocket_callback: { + tokens: [['text', '/import/pocket/callback']], defaults: [], requirements: [], hosttokens: [], + }, + import_readability: { + tokens: [['text', '/import/readability']], defaults: [], requirements: [], hosttokens: [], + }, + import_wallabag_v1: { + tokens: [['text', '/import/wallabag-v1']], defaults: [], requirements: [], hosttokens: [], + }, + import_wallabag_v2: { + tokens: [['text', '/import/wallabag-v2']], defaults: [], requirements: [], hosttokens: [], + }, + user_new: { + tokens: [['text', '/users/new']], defaults: [], requirements: [], hosttokens: [], + }, + developer: { + tokens: [['text', '/developer']], defaults: [], requirements: [], hosttokens: [], + }, + developer_create_client: { + tokens: [['text', '/developer/client/create']], defaults: [], requirements: [], hosttokens: [], + }, + developer_delete_client: { + tokens: [['variable', '/', '\\d+', 'id'], ['text', '/developer/client/delete']], defaults: [], requirements: { id: '\\d+' }, hosttokens: [], + }, + developer_howto_firstapp: { + tokens: [['text', '/developer/howto/first-app']], defaults: [], requirements: [], hosttokens: [], + }, + config: { + tokens: [['text', '/config']], defaults: [], requirements: [], hosttokens: [], + }, + delete_tagging_rule: { + tokens: [['variable', '/', '\\d+', 'id'], ['text', '/tagging-rule/delete']], defaults: [], requirements: { id: '\\d+' }, hosttokens: [], + }, + edit_tagging_rule: { + tokens: [['variable', '/', '\\d+', 'id'], ['text', '/tagging-rule/edit']], defaults: [], requirements: { id: '\\d+' }, hosttokens: [], + }, + config_reset: { + tokens: [['variable', '/', '[^/]++', 'type'], ['text', '/reset']], defaults: [], requirements: { id: 'annotations|tags|entries' }, hosttokens: [], + }, + new_entry: { + tokens: [['text', '/new-entry']], defaults: [], requirements: [], hosttokens: [], + }, + new: { + tokens: [['text', '/new']], defaults: [], requirements: [], hosttokens: [], + }, + all: { + tokens: [['variable', '/', '[^/]++', 'page'], ['text', '/all/list']], defaults: { page: '1' }, requirements: [], hosttokens: [], + }, + archive: { + tokens: [['variable', '/', '[^/]++', 'page'], ['text', '/archive/list']], defaults: { page: '1' }, requirements: [], hosttokens: [], + }, + starred: { + tokens: [['variable', '/', '[^/]++', 'page'], ['text', '/starred/list']], defaults: { page: '1' }, requirements: [], hosttokens: [], + }, + archive_entry: { + tokens: [['variable', '/', '\\d+', 'id'], ['text', '/archive']], defaults: [], requirements: { id: '\\d+' }, hosttokens: [], + }, + untagged: { + tokens: [['variable', '/', '[^/]++', 'page'], ['text', '/untagged/list']], defaults: { page: '1' }, requirements: [], hosttokens: [], + }, + archive_rss: { + tokens: [['text', '/archive.xml'], ['variable', '/', '[^/]++', 'token'], ['variable', '/', '[^/]++', 'username']], defaults: [], requirements: [], hosttokens: [], + }, + starred_rss: { + tokens: [['text', '/starred.xml'], ['variable', '/', '[^/]++', 'token'], ['variable', '/', '[^/]++', 'username']], defaults: [], requirements: [], hosttokens: [], + }, + howto: { + tokens: [['text', '/howto']], defaults: [], requirements: [], hosttokens: [], + }, + new_tag: { + tokens: [['variable', '/', '\\d+', 'entry'], ['text', '/new-tag']], defaults: [], requirements: { entry: '\\d+' }, hosttokens: [], + }, + remove_tag: { + tokens: [['variable', '/', '\\d+', 'tag'], ['variable', '/', '\\d+', 'entry'], ['text', '/remove-tag']], defaults: [], requirements: { entry: '\\d+', tag: '\\d+' }, hosttokens: [], + }, + tag: { + tokens: [['text', '/tag/list']], defaults: [], requirements: [], hosttokens: [], + }, + tag_entries: { + tokens: [['variable', '/', '[^/]++', 'page'], ['variable', '/', '[^/]++', 'slug'], ['text', '/tag/list']], defaults: { page: '1' }, requirements: [], hosttokens: [], + }, + api_get_entries_tags: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['text', '/tags'], ['variable', '/', '[^/]++', 'entry'], ['text', '/api/entries']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + api_post_entries_tags: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['text', '/tags'], ['variable', '/', '[^/]++', 'entry'], ['text', '/api/entries']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + api_delete_entries_tags: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['variable', '/', '[^/\\.]++', 'tag'], ['text', '/tags'], ['variable', '/', '[^/]++', 'entry'], ['text', '/api/entries']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + api_get_tags: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['text', '/api/tags']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + api_delete_tag_label: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['text', '/api/tag/label']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + api_delete_tags_label: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['text', '/api/tags/label']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + api_delete_tag: { + tokens: [['variable', '.', 'xml|json|txt|csv|pdf|epub|mobi|html', '_format'], ['variable', '/', '[^/\\.]++', 'tag'], ['text', '/api/tags']], defaults: { _format: 'json' }, requirements: { _format: 'xml|json|txt|csv|pdf|epub|mobi|html' }, hosttokens: [], + }, + homepage: { + tokens: [['variable', '/', '\\d+', 'page']], defaults: { page: 1 }, requirements: { page: '\\d+' }, hosttokens: [], + }, + fos_user_security_logout: { + tokens: [['text', '/logout']], defaults: [], requirements: [], hosttokens: [], + }, + craue_config_settings_modify: { + tokens: [['text', '/settings']], defaults: [], requirements: [], hosttokens: [], + }, + }, + prefix: '', + host: 'localhost', + scheme: 'http', +}); diff --git a/web/wallassets/baggy.js b/web/wallassets/baggy.js index 858171a7f..8e0ff03e1 100644 --- a/web/wallassets/baggy.js +++ b/web/wallassets/baggy.js @@ -1,2 +1,2 @@ -(()=>{var e={5641:(e,t,n)=>{"use strict";n(8186)(n(262));var r=n(9731),i=n(9999);t.gV=r.App,n(1849),n(5587),t.notification=n(3612),t.storage=n(4623),t.ui=n(5443);var o=n.g.wgxpath;null!=o&&"function"==typeof o.install&&o.install();var a=n.g.annotator},9731:(e,t,n)=>{"use strict";var r=n(280),i=n(2702).Promise,o=n(1849),a=n(5587),s=n(3612),l=n(1258),T=n(4623);function c(){this.modules=[],this.registry=new l.Registry,this._started=!1,this.registry.registerUtility(s.defaultNotifier,"notifier"),this.include(o.acl),this.include(a.simple),this.include(T.noop)}c.prototype.include=function(e,t){var n=e(t);return"function"==typeof n.configure&&n.configure(this.registry),this.modules.push(n),this},c.prototype.start=function(){if(!this._started){this._started=!0;var e=this,t=this.registry;return this.authz=t.getUtility("authorizationPolicy"),this.ident=t.getUtility("identityPolicy"),this.notify=t.getUtility("notifier"),this.annotations=new T.StorageAdapter(t.getUtility("storage"),(function(){return e.runHook.apply(e,arguments)})),this.runHook("start",[this])}},c.prototype.destroy=function(){return this.runHook("destroy")},c.prototype.runHook=function(e,t){for(var n=[],r=0,o=this.modules.length;r{"use strict";var n;t.acl=function(){var e=new n;return{configure:function(t){t.registerUtility(e,"authorizationPolicy")}}},(n=t.AclAuthzPolicy=function(){}).prototype.permits=function(e,t,n){var r=this.authorizedUserId(n),i=t.permissions;if(i){var o=i[e];if(null==o)return!0;for(var a=0,s=o.length;a{"use strict";var n;t.simple=function(){var e=new n;return{configure:function(t){t.registerUtility(e,"identityPolicy")},beforeAnnotationCreated:function(t){t.user=e.who()}}},n=function(){this.identity=null},t.SimpleIdentityPolicy=n,n.prototype.who=function(){return this.identity}},3612:(e,t,n)=>{"use strict";var r=n(9999),i=r.$,o="info",a={show:"annotator-notice-show",info:"annotator-notice-info",success:"annotator-notice-success",error:"annotator-notice-error"};function s(e,t){null==t&&(t=o);var s=i("
")[0],l=!1,T=function(){l||(l=!0,i(s).removeClass(a.show).removeClass(a[t]),setTimeout((function(){i(s).remove()}),500))};return i(s).addClass(a.show).addClass(a[t]).html(r.escapeHtml(e||"")).appendTo(n.g.document.body),i(s).on("click",T),setTimeout(T,5e3),{close:T}}t.banner=s,t.defaultNotifier=s,t.INFO=o,t.SUCCESS="success",t.ERROR="error"},1258:(e,t)=>{"use strict";function n(){this.utilities={}}function r(e){this.name="LookupError",this.message='No utility registered for interface "'+e+'".'}n.prototype.registerUtility=function(e,t){this.utilities[t]=e},n.prototype.getUtility=function(e){var t=this.queryUtility(e);if(null===t)throw new r(e);return t},n.prototype.queryUtility=function(e){var t=this.utilities[e];return null==t?null:t},r.prototype=Object.create(Error.prototype),r.prototype.constructor=r,t.LookupError=r,t.Registry=n},4623:(e,t,n)=>{"use strict";var r,i,o=n(9999),a=o.$,s=o.gettext,l=o.Promise,T=(r=-1,function(){return r+=1});function c(e,t){this.store=e,this.runHook=t}t.debug=function(){function e(e,t){var n=JSON.parse(JSON.stringify(t));console.debug("annotator.storage.debug: "+e,n)}return{create:function(t){return t.id=T(),e("create",t),t},update:function(t){return e("update",t),t},delete:function(t){return e("destroy",t),t},query:function(t){return e("query",t),{results:[],meta:{total:0}}},configure:function(e){e.registerUtility(this,"storage")}}},t.noop=function(){return{create:function(e){return void 0!==e.id&&null!==e.id||(e.id=T()),e},update:function(e){return e},delete:function(e){return e},query:function(){return{results:[]}},configure:function(e){e.registerUtility(this,"storage")}}},t.http=function(e){var t=function(){};null==e&&(e={}),e.onError=e.onError||function(e,n){console.error(e,n),t(e,"error")};var n=new i(e);return{configure:function(e){e.registerUtility(n,"storage")},start:function(e){t=e.notify}}},(i=t.HttpStorage=function e(t){this.options=a.extend(!0,{},e.options,t),this.onError=this.options.onError}).prototype.create=function(e){return this._apiRequest("create",e)},i.prototype.update=function(e){return this._apiRequest("update",e)},i.prototype.delete=function(e){return this._apiRequest("destroy",e)},i.prototype.query=function(e){return this._apiRequest("search",e).then((function(e){var t=e.rows;return delete e.rows,{results:t,meta:e}}))},i.prototype.setHeader=function(e,t){this.options.headers[e]=t},i.prototype._apiRequest=function(e,t){var n=t&&t.id,r=this._urlFor(e,n),i=this._apiRequestOptions(e,t),o=a.ajax(r,i);return o._id=n,o._action=e,o},i.prototype._apiRequestOptions=function(e,t){var n=this._methodFor(e),r=this,i={type:n,dataType:"json",error:function(){r._onError.apply(r,arguments)},headers:this.options.headers};if(!this.options.emulateHTTP||"PUT"!==n&&"DELETE"!==n||(i.headers=a.extend(i.headers,{"X-HTTP-Method-Override":n}),i.type="POST"),"search"===e)return i=a.extend(i,{data:t});var o=t&&JSON.stringify(t);return this.options.emulateJSON?(i.data={json:o},this.options.emulateHTTP&&(i.data._method=n),i):i=a.extend(i,{data:o,contentType:"application/json; charset=utf-8"})},i.prototype._urlFor=function(e,t){null==t&&(t="");var n="";return void 0!==this.options.prefix&&null!==this.options.prefix&&(n=this.options.prefix),n=(n+=this.options.urls[e]).replace(/idAnnotation/,t)},i.prototype._methodFor=function(e){return{create:"POST",update:"PUT",destroy:"DELETE",search:"GET"}[e]},i.prototype._onError=function(e){var t;"function"==typeof this.onError&&(t=400===e.status?s("The annotation store did not understand the request! (Error 400)"):401===e.status?s("You must be logged in to perform this operation! (Error 401)"):403===e.status?s("You don't have permission to perform this operation! (Error 403)"):404===e.status?s("Could not connect to the annotation store! (Error 404)"):500===e.status?s("Internal error in annotation store! (Error 500)"):s("Unknown error while speaking to annotation store!"),this.onError(t,e))},i.options={emulateHTTP:!1,emulateJSON:!1,headers:{},onError:function(e){console.error("API request failed: "+e)},prefix:"/store",urls:{create:"/annotations",update:"/annotations/idAnnotation",destroy:"/annotations/idAnnotation",search:"/search"}},c.prototype.create=function(e){return null==e&&(e={}),this._cycle(e,"create","beforeAnnotationCreated","annotationCreated")},c.prototype.update=function(e){if(void 0===e.id||null===e.id)throw new TypeError("annotation must have an id for update()");return this._cycle(e,"update","beforeAnnotationUpdated","annotationUpdated")},c.prototype.delete=function(e){if(void 0===e.id||null===e.id)throw new TypeError("annotation must have an id for delete()");return this._cycle(e,"delete","beforeAnnotationDeleted","annotationDeleted")},c.prototype.query=function(e){return l.resolve(this.store.query(e))},c.prototype.load=function(e){var t=this;return this.query(e).then((function(e){t.runHook("annotationsLoaded",[e.results])}))},c.prototype._cycle=function(e,t,n,r){var i=this;return this.runHook(n,[e]).then((function(){var n=a.extend(!0,{},e);delete n._local;var r=i.store[t](n);return l.resolve(r)})).then((function(t){for(var n in e)e.hasOwnProperty(n)&&"_local"!==n&&delete e[n];return a.extend(e,t),i.runHook(r,[e]),e}))},t.StorageAdapter=c},5443:(e,t,n)=>{t.main=n(3735).main,n(5107),n(8486),n(3826),n(7930),n(863),n(6996),n(7224),n(4233),n(3553)},5107:(e,t,n)=>{"use strict";var r=n(3553).$,i=n(9999),o=i.$,a=i.gettext,s="annotator-adder",l=r.extend({constructor:function(e){r.call(this,e),this.ignoreMouseup=!1,this.annotation=null,this.onCreate=this.options.onCreate;var t=this;this.element.on("click."+s,"button",(function(e){t._onClick(e)})).on("mousedown."+s,"button",(function(e){t._onMousedown(e)})),this.document=this.element[0].ownerDocument,o(this.document.body).on("mouseup."+s,(function(e){t._onMouseup(e)}))},destroy:function(){this.element.off("."+s),o(this.document.body).off("."+s),r.prototype.destroy.call(this)},load:function(e,t){this.annotation=e,this.show(t)},show:function(e){null!=e&&this.element.css({top:e.top,left:e.left}),r.prototype.show.call(this)},_onMousedown:function(e){e.which>1||(e.preventDefault(),this.ignoreMouseup=!0)},_onMouseup:function(e){e.which>1||this.ignoreMouseup&&e.stopImmediatePropagation()},_onClick:function(e){e.which>1||(e.preventDefault(),this.hide(),this.ignoreMouseup=!1,null!==this.annotation&&"function"==typeof this.onCreate&&this.onCreate(this.annotation,e))}});l.template=['
',' ","
"].join("\n"),l.options={onCreate:null},t.Adder=l},8486:(e,t,n)=>{"use strict";var r,i=n(3553).$,o=n(9999),a=o.$,s=o.gettext,l=o.Promise,T="annotator-editor",c=(r=-1,function(){return r+=1});function Q(e){null!=e&&"function"==typeof e.preventDefault&&e.preventDefault()}var u=t.dragTracker=function(e,t){var n=null,r=!1;function i(e){if(!r&&null!==n){var i={y:e.pageY-n.top,x:e.pageX-n.left},o=!0;"function"==typeof t&&(o=t(i)),!1!==o&&(n={top:e.pageY,left:e.pageX}),r=!0,setTimeout((function(){r=!1}),1e3/60)}}function o(){n=null,a(e.ownerDocument).off("mouseup",o).off("mousemove",i)}function s(t){t.target===e&&(n={top:t.pageY,left:t.pageX},a(e.ownerDocument).on("mouseup",o).on("mousemove",i),t.preventDefault())}return a(e).on("mousedown",s),{destroy:function(){a(e).off("mousedown",s)}}},d=t.resizer=function(e,t,n){var r=a(e);return null==n&&(n={}),u(t,(function(e){var t=r.height(),i=r.width(),o=function(e){var t=1,r=-1;return"function"==typeof n.invertedX&&n.invertedX()&&(t=-1),"function"==typeof n.invertedY&&n.invertedY()&&(r=1),{x:e.x*t,y:e.y*r}}(e);return Math.abs(o.x)>0&&r.width(i+o.x),Math.abs(o.y)>0&&r.height(t+o.y),r.height()!==t||r.width()!==i}))},p=t.mover=function(e,t){return u(t,(function(t){a(e).css({top:parseInt(a(e).css("top"),10)+t.y,left:parseInt(a(e).css("left"),10)+t.x})}))},_=t.Editor=i.extend({constructor:function(e){i.call(this,e),this.fields=[],this.annotation={},this.options.defaultFields&&this.addField({type:"textarea",label:s("Comments")+"…",load:function(e,t){a(e).find("textarea").val(t.text||"")},submit:function(e,t){t.text=a(e).find("textarea").val()}});var t=this;this.element.on("submit."+T,"form",(function(e){t._onFormSubmit(e)})).on("click."+T,".annotator-save",(function(e){t._onSaveClick(e)})).on("click."+T,".annotator-cancel",(function(e){t._onCancelClick(e)})).on("mouseover."+T,".annotator-cancel",(function(e){t._onCancelMouseover(e)})).on("keydown."+T,"textarea",(function(e){t._onTextareaKeydown(e)}))},destroy:function(){this.element.off("."+T),i.prototype.destroy.call(this)},show:function(e){null!=e&&this.element.css({top:e.top,left:e.left}),this.element.find(".annotator-save").addClass(this.classes.focus),i.prototype.show.call(this),this.element.find(":input:first").focus(),this._setupDraggables()},load:function(e,t){this.annotation=e;for(var n=0,r=this.fields.length;n');return t.element=r[0],"textarea"===t.type?n=a("",m.noCloneChecked=!!pe.cloneNode(!0).lastChild.defaultValue,pe.innerHTML="",m.option=!!pe.lastChild;var ge={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Ee(e,t){var n;return n=void 0!==e.getElementsByTagName?e.getElementsByTagName(t||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&H(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var be=/<|&#?\w+;/;function Le(e,t,n,r,i){for(var o,a,s,l,T,c,Q=t.createDocumentFragment(),u=[],d=0,p=e.length;d-1)i&&i.push(o);else if(T=se(o),a=Ee(Q.appendChild(o),"script"),T&&ye(a),n)for(c=0;o=a[c++];)he.test(o.type||"")&&n.push(o);return Q}var Se=/^([^.]*)(?:\.(.+)|)/;function ve(){return!0}function Oe(){return!1}function Ce(e,t){return e===function(){try{return g.activeElement}catch(e){}}()==("focus"===t)}function Ne(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ne(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Oe;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each((function(){S.event.add(this,t,i,r,n)}))}function Me(e,t,n){n?(X.set(e,t,!1),S.event.add(e,t,{namespace:!1,handler:function(e){var r,i,o=X.get(this,t);if(1&e.isTrigger&&this[t]){if(o.length)(S.event.special[t]||{}).delegateType&&e.stopPropagation();else if(o=s.call(arguments),X.set(this,t,o),r=n(this,t),this[t](),o!==(i=X.get(this,t))||r?X.set(this,t,!1):i={},o!==i)return e.stopImmediatePropagation(),e.preventDefault(),i&&i.value}else o.length&&(X.set(this,t,{value:S.event.trigger(S.extend(o[0],S.Event.prototype),o.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===X.get(e,t)&&S.event.add(e,t,ve)}S.event={global:{},add:function(e,t,n,r,i){var o,a,s,l,T,c,Q,u,d,p,_,m=X.get(e);if($(e))for(n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(ae,i),n.guid||(n.guid=S.guid++),(l=m.events)||(l=m.events=Object.create(null)),(a=m.handle)||(a=m.handle=function(t){return void 0!==S&&S.event.triggered!==t.type?S.event.dispatch.apply(e,arguments):void 0}),T=(t=(t||"").match(V)||[""]).length;T--;)d=_=(s=Se.exec(t[T])||[])[1],p=(s[2]||"").split(".").sort(),d&&(Q=S.event.special[d]||{},d=(i?Q.delegateType:Q.bindType)||d,Q=S.event.special[d]||{},c=S.extend({type:d,origType:_,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:p.join(".")},o),(u=l[d])||((u=l[d]=[]).delegateCount=0,Q.setup&&!1!==Q.setup.call(e,r,p,a)||e.addEventListener&&e.addEventListener(d,a)),Q.add&&(Q.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?u.splice(u.delegateCount++,0,c):u.push(c),S.event.global[d]=!0)},remove:function(e,t,n,r,i){var o,a,s,l,T,c,Q,u,d,p,_,m=X.hasData(e)&&X.get(e);if(m&&(l=m.events)){for(T=(t=(t||"").match(V)||[""]).length;T--;)if(d=_=(s=Se.exec(t[T])||[])[1],p=(s[2]||"").split(".").sort(),d){for(Q=S.event.special[d]||{},u=l[d=(r?Q.delegateType:Q.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=u.length;o--;)c=u[o],!i&&_!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(u.splice(o,1),c.selector&&u.delegateCount--,Q.remove&&Q.remove.call(e,c));a&&!u.length&&(Q.teardown&&!1!==Q.teardown.call(e,p,m.handle)||S.removeEvent(e,d,m.handle),delete l[d])}else for(d in l)S.event.remove(e,d+t[T],n,r,!0);S.isEmptyObject(l)&&X.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),l=S.event.fix(e),T=(X.get(this,"events")||Object.create(null))[l.type]||[],c=S.event.special[l.type]||{};for(s[0]=l,t=1;t=1))for(;T!==this;T=T.parentNode||this)if(1===T.nodeType&&("click"!==e.type||!0!==T.disabled)){for(o=[],a={},n=0;n-1:S.find(i,this,null,[T]).length),a[i]&&o.push(r);o.length&&s.push({elem:T,handlers:o})}return T=this,l\s*$/g;function xe(e,t){return H(e,"table")&&H(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function we(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function De(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(X.hasData(e)&&(s=X.get(e).events))for(i in X.remove(t,"handle events"),s)for(n=0,r=s[i].length;n1&&"string"==typeof p&&!m.checkClone&&Re.test(p))return e.each((function(i){var o=e.eq(i);_&&(t[0]=p.call(this,i,o.html())),Ve(o,t,n,r)}));if(u&&(o=(i=Le(t,e[0].ownerDocument,!1,e,r)).firstChild,1===i.childNodes.length&&(i=o),o||r)){for(s=(a=S.map(Ee(i,"script"),Ie)).length;Q0&&ye(a,!l&&Ee(e,"script")),s},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if($(n)){if(t=n[X.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[X.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),S.fn.extend({detach:function(e){return ke(this,e,!0)},remove:function(e){return ke(this,e)},text:function(e){return Y(this,(function(e){return void 0===e?S.text(this):this.empty().each((function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)}))}),null,e,arguments.length)},append:function(){return Ve(this,arguments,(function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||xe(this,e).appendChild(e)}))},prepend:function(){return Ve(this,arguments,(function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=xe(this,e);t.insertBefore(e,t.firstChild)}}))},before:function(){return Ve(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this)}))},after:function(){return Ve(this,arguments,(function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)}))},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(Ee(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map((function(){return S.clone(this,e,t)}))},html:function(e){return Y(this,(function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!He.test(e)&&!ge[(fe.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n=0&&(l+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-l-s-.5))||0),l}function nt(e,t,n){var r=Fe(e),i=(!m.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=je(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Be.test(a)){if(!n)return a;a="auto"}return(!m.boxSizingReliable()&&i||!m.reliableTrDimensions()&&H(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+tt(e,t,n||(i?"border":"content"),o,r,a)+"px"}function rt(e,t,n,r,i){return new rt.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=je(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=Z(t),l=Ke.test(t),T=e.style;if(l||(t=Ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:T[t];"string"===(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ce(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||l||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),m.clearCloneStyle||""!==n||0!==t.indexOf("background")||(T[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(l?T.setProperty(t,n):T[t]=n))}},css:function(e,t,n,r){var i,o,a,s=Z(t);return Ke.test(t)||(t=Ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=je(e,t,r)),"normal"===i&&t in Je&&(i=Je[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],(function(e,t){S.cssHooks[t]={get:function(e,n,r){if(n)return!$e.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?nt(e,t,r):Ue(e,Xe,(function(){return nt(e,t,r)}))},set:function(e,n,r){var i,o=Fe(e),a=!m.scrollboxSize()&&"absolute"===o.position,s=(a||r)&&"border-box"===S.css(e,"boxSizing",!1,o),l=r?tt(e,t,r,s,o):0;return s&&a&&(l-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-tt(e,t,"border",!1,o)-.5)),l&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=S.css(e,t)),et(0,n,l)}}})),S.cssHooks.marginLeft=Ye(m.reliableMarginLeft,(function(e,t){if(t)return(parseFloat(je(e,"marginLeft"))||e.getBoundingClientRect().left-Ue(e,{marginLeft:0},(function(){return e.getBoundingClientRect().left})))+"px"})),S.each({margin:"",padding:"",border:"Width"},(function(e,t){S.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(S.cssHooks[e+t].set=et)})),S.fn.extend({css:function(e,t){return Y(this,(function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a1)}}),S.Tween=rt,rt.prototype={constructor:rt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=rt.propHooks[this.prop];return e&&e.get?e.get(this):rt.propHooks._default.get(this)},run:function(e){var t,n=rt.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rt.propHooks._default.set(this),this}},rt.prototype.init.prototype=rt.prototype,rt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}},rt.propHooks.scrollTop=rt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=rt.prototype.init,S.fx.step={};var it,ot,at=/^(?:toggle|show|hide)$/,st=/queueHooks$/;function lt(){ot&&(!1===g.hidden&&r.requestAnimationFrame?r.requestAnimationFrame(lt):r.setTimeout(lt,S.fx.interval),S.fx.tick())}function Tt(){return r.setTimeout((function(){it=void 0})),it=Date.now()}function ct(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function Qt(e,t,n){for(var r,i=(ut.tweeners[t]||[]).concat(ut.tweeners["*"]),o=0,a=i.length;o1)},removeAttr:function(e){return this.each((function(){S.removeAttr(this,e)}))}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return void 0===e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!m.radioValue&&"radio"===t&&H(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(V);if(i&&1===e.nodeType)for(;n=i[r++];)e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),(function(e,t){var n=pt[t]||S.find.attr;pt[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=pt[a],pt[a]=i,i=null!=n(e,t,r)?a:null,pt[a]=o),i}}));var _t=/^(?:input|select|textarea|button)$/i,mt=/^(?:a|area)$/i;function ft(e){return(e.match(V)||[]).join(" ")}function ht(e){return e.getAttribute&&e.getAttribute("class")||""}function gt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(V)||[]}S.fn.extend({prop:function(e,t){return Y(this,S.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each((function(){delete this[S.propFix[e]||e]}))}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):_t.test(e.nodeName)||mt.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),m.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],(function(){S.propFix[this.toLowerCase()]=this})),S.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,l=0;if(f(e))return this.each((function(t){S(this).addClass(e.call(this,t,ht(this)))}));if((t=gt(e)).length)for(;n=this[l++];)if(i=ht(n),r=1===n.nodeType&&" "+ft(i)+" "){for(a=0;o=t[a++];)r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ft(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,l=0;if(f(e))return this.each((function(t){S(this).removeClass(e.call(this,t,ht(this)))}));if(!arguments.length)return this.attr("class","");if((t=gt(e)).length)for(;n=this[l++];)if(i=ht(n),r=1===n.nodeType&&" "+ft(i)+" "){for(a=0;o=t[a++];)for(;r.indexOf(" "+o+" ")>-1;)r=r.replace(" "+o+" "," ");i!==(s=ft(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):f(e)?this.each((function(n){S(this).toggleClass(e.call(this,n,ht(this),t),t)})):this.each((function(){var t,i,o,a;if(r)for(i=0,o=S(this),a=gt(e);t=a[i++];)o.hasClass(t)?o.removeClass(t):o.addClass(t);else void 0!==e&&"boolean"!==n||((t=ht(this))&&X.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":X.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;for(t=" "+e+" ";n=this[r++];)if(1===n.nodeType&&(" "+ft(ht(n))+" ").indexOf(t)>-1)return!0;return!1}});var Et=/\r/g;S.fn.extend({val:function(e){var t,n,r,i=this[0];return arguments.length?(r=f(e),this.each((function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,S(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=S.map(i,(function(e){return null==e?"":e+""}))),(t=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))}))):i?(t=S.valHooks[i.type]||S.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(Et,""):null==n?"":n:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ft(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],l=a?o+1:i.length;for(r=o<0?l:a?o:0;r-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],(function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=S.inArray(S(e).val(),t)>-1}},m.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})})),m.focusin="onfocusin"in r;var yt=/^(?:focusinfocus|focusoutblur)$/,bt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,i){var o,a,s,l,T,c,Q,u,p=[n||g],_=d.call(e,"type")?e.type:e,m=d.call(e,"namespace")?e.namespace.split("."):[];if(a=u=s=n=n||g,3!==n.nodeType&&8!==n.nodeType&&!yt.test(_+S.event.triggered)&&(_.indexOf(".")>-1&&(m=_.split("."),_=m.shift(),m.sort()),T=_.indexOf(":")<0&&"on"+_,(e=e[S.expando]?e:new S.Event(_,"object"==typeof e&&e)).isTrigger=i?2:3,e.namespace=m.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),Q=S.event.special[_]||{},i||!Q.trigger||!1!==Q.trigger.apply(n,t))){if(!i&&!Q.noBubble&&!h(n)){for(l=Q.delegateType||_,yt.test(l+_)||(a=a.parentNode);a;a=a.parentNode)p.push(a),s=a;s===(n.ownerDocument||g)&&p.push(s.defaultView||s.parentWindow||r)}for(o=0;(a=p[o++])&&!e.isPropagationStopped();)u=a,e.type=o>1?l:Q.bindType||_,(c=(X.get(a,"events")||Object.create(null))[e.type]&&X.get(a,"handle"))&&c.apply(a,t),(c=T&&a[T])&&c.apply&&$(a)&&(e.result=c.apply(a,t),!1===e.result&&e.preventDefault());return e.type=_,i||e.isDefaultPrevented()||Q._default&&!1!==Q._default.apply(p.pop(),t)||!$(n)||T&&f(n[_])&&!h(n)&&((s=n[T])&&(n[T]=null),S.event.triggered=_,e.isPropagationStopped()&&u.addEventListener(_,bt),n[_](),e.isPropagationStopped()&&u.removeEventListener(_,bt),S.event.triggered=void 0,s&&(n[T]=s)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each((function(){S.event.trigger(e,t,this)}))},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),m.focusin||S.each({focus:"focusin",blur:"focusout"},(function(e,t){var n=function(e){S.event.simulate(t,e.target,S.event.fix(e))};S.event.special[t]={setup:function(){var r=this.ownerDocument||this.document||this,i=X.access(r,t);i||r.addEventListener(e,n,!0),X.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this.document||this,i=X.access(r,t)-1;i?X.access(r,t,i):(r.removeEventListener(e,n,!0),X.remove(r,t))}}}));var Lt=r.location,St={guid:Date.now()},vt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new r.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,(function(e){return e.textContent})).join("\n"):e)),t};var Ot=/\[\]$/,Ct=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,Mt=/^(?:input|select|textarea|keygen)/i;function Ht(e,t,n,r){var i;if(Array.isArray(t))S.each(t,(function(t,i){n||Ot.test(e)?r(e,i):Ht(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)}));else if(n||"object"!==b(t))r(e,t);else for(i in t)Ht(e+"["+i+"]",t[i],n,r)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=f(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,(function(){i(this.name,this.value)}));else for(n in e)Ht(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map((function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this})).filter((function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Mt.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!me.test(e))})).map((function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,(function(e){return{name:t.name,value:e.replace(Ct,"\r\n")}})):{name:t.name,value:n.replace(Ct,"\r\n")}})).get()}});var Rt=/%20/g,At=/#.*$/,xt=/([?&])_=[^&]*/,It=/^(.*?):[ \t]*([^\r\n]*)$/gm,wt=/^(?:GET|HEAD)$/,Dt=/^\/\//,Pt={},Vt={},kt="*/".concat("*"),Bt=g.createElement("a");function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(V)||[];if(f(n))for(;r=o[i++];)"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function Ut(e,t,n,r){var i={},o=e===Vt;function a(s){var l;return i[s]=!0,S.each(e[s]||[],(function(e,s){var T=s(t,n,r);return"string"!=typeof T||o||i[T]?o?!(l=T):void 0:(t.dataTypes.unshift(T),a(T),!1)})),l}return a(t.dataTypes[0])||!i["*"]&&a("*")}function Gt(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Bt.href=Lt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Lt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Lt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":kt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Gt(Gt(e,S.ajaxSettings),t):Gt(S.ajaxSettings,e)},ajaxPrefilter:Ft(Pt),ajaxTransport:Ft(Vt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var n,i,o,a,s,l,T,c,Q,u,d=S.ajaxSetup({},t),p=d.context||d,_=d.context&&(p.nodeType||p.jquery)?S(p):S.event,m=S.Deferred(),f=S.Callbacks("once memory"),h=d.statusCode||{},E={},y={},b="canceled",L={readyState:0,getResponseHeader:function(e){var t;if(T){if(!a)for(a={};t=It.exec(o);)a[t[1].toLowerCase()+" "]=(a[t[1].toLowerCase()+" "]||[]).concat(t[2]);t=a[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return T?o:null},setRequestHeader:function(e,t){return null==T&&(e=y[e.toLowerCase()]=y[e.toLowerCase()]||e,E[e]=t),this},overrideMimeType:function(e){return null==T&&(d.mimeType=e),this},statusCode:function(e){var t;if(e)if(T)L.always(e[L.status]);else for(t in e)h[t]=[h[t],e[t]];return this},abort:function(e){var t=e||b;return n&&n.abort(t),v(0,t),this}};if(m.promise(L),d.url=((e||d.url||Lt.href)+"").replace(Dt,Lt.protocol+"//"),d.type=t.method||t.type||d.method||d.type,d.dataTypes=(d.dataType||"*").toLowerCase().match(V)||[""],null==d.crossDomain){l=g.createElement("a");try{l.href=d.url,l.href=l.href,d.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){d.crossDomain=!0}}if(d.data&&d.processData&&"string"!=typeof d.data&&(d.data=S.param(d.data,d.traditional)),Ut(Pt,d,t,L),T)return L;for(Q in(c=S.event&&d.global)&&0==S.active++&&S.event.trigger("ajaxStart"),d.type=d.type.toUpperCase(),d.hasContent=!wt.test(d.type),i=d.url.replace(At,""),d.hasContent?d.data&&d.processData&&0===(d.contentType||"").indexOf("application/x-www-form-urlencoded")&&(d.data=d.data.replace(Rt,"+")):(u=d.url.slice(i.length),d.data&&(d.processData||"string"==typeof d.data)&&(i+=(vt.test(i)?"&":"?")+d.data,delete d.data),!1===d.cache&&(i=i.replace(xt,"$1"),u=(vt.test(i)?"&":"?")+"_="+St.guid+++u),d.url=i+u),d.ifModified&&(S.lastModified[i]&&L.setRequestHeader("If-Modified-Since",S.lastModified[i]),S.etag[i]&&L.setRequestHeader("If-None-Match",S.etag[i])),(d.data&&d.hasContent&&!1!==d.contentType||t.contentType)&&L.setRequestHeader("Content-Type",d.contentType),L.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+("*"!==d.dataTypes[0]?", "+kt+"; q=0.01":""):d.accepts["*"]),d.headers)L.setRequestHeader(Q,d.headers[Q]);if(d.beforeSend&&(!1===d.beforeSend.call(p,L,d)||T))return L.abort();if(b="abort",f.add(d.complete),L.done(d.success),L.fail(d.error),n=Ut(Vt,d,t,L)){if(L.readyState=1,c&&_.trigger("ajaxSend",[L,d]),T)return L;d.async&&d.timeout>0&&(s=r.setTimeout((function(){L.abort("timeout")}),d.timeout));try{T=!1,n.send(E,v)}catch(e){if(T)throw e;v(-1,e)}}else v(-1,"No Transport");function v(e,t,a,l){var Q,u,g,E,y,b=t;T||(T=!0,s&&r.clearTimeout(s),n=void 0,o=l||"",L.readyState=e>0?4:0,Q=e>=200&&e<300||304===e,a&&(E=function(e,t,n){for(var r,i,o,a,s=e.contents,l=e.dataTypes;"*"===l[0];)l.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){l.unshift(i);break}if(l[0]in n)o=l[0];else{for(i in n){if(!l[0]||e.converters[i+" "+l[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==l[0]&&l.unshift(o),n[o]}(d,L,a)),!Q&&S.inArray("script",d.dataTypes)>-1&&S.inArray("json",d.dataTypes)<0&&(d.converters["text script"]=function(){}),E=function(e,t,n,r){var i,o,a,s,l,T={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)T[a.toLowerCase()]=e.converters[a];for(o=c.shift();o;)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(!(a=T[l+" "+o]||T["* "+o]))for(i in T)if((s=i.split(" "))[1]===o&&(a=T[l+" "+s[0]]||T["* "+s[0]])){!0===a?a=T[i]:!0!==T[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e.throws)t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}(d,E,L,Q),Q?(d.ifModified&&((y=L.getResponseHeader("Last-Modified"))&&(S.lastModified[i]=y),(y=L.getResponseHeader("etag"))&&(S.etag[i]=y)),204===e||"HEAD"===d.type?b="nocontent":304===e?b="notmodified":(b=E.state,u=E.data,Q=!(g=E.error))):(g=b,!e&&b||(b="error",e<0&&(e=0))),L.status=e,L.statusText=(t||b)+"",Q?m.resolveWith(p,[u,b,L]):m.rejectWith(p,[L,b,g]),L.statusCode(h),h=void 0,c&&_.trigger(Q?"ajaxSuccess":"ajaxError",[L,d,Q?u:g]),f.fireWith(p,[L,b]),c&&(_.trigger("ajaxComplete",[L,d]),--S.active||S.event.trigger("ajaxStop")))}return L},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],(function(e,t){S[t]=function(e,n,r,i){return f(n)&&(i=i||r,r=n,n=void 0),S.ajax(S.extend({url:e,type:t,dataType:i,data:n,success:r},S.isPlainObject(e)&&e))}})),S.ajaxPrefilter((function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")})),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(f(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map((function(){for(var e=this;e.firstElementChild;)e=e.firstElementChild;return e})).append(this)),this},wrapInner:function(e){return f(e)?this.each((function(t){S(this).wrapInner(e.call(this,t))})):this.each((function(){var t=S(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)}))},wrap:function(e){var t=f(e);return this.each((function(n){S(this).wrapAll(t?e.call(this,n):e)}))},unwrap:function(e){return this.parent(e).not("body").each((function(){S(this).replaceWith(this.childNodes)})),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new r.XMLHttpRequest}catch(e){}};var jt={0:200,1223:204},Yt=S.ajaxSettings.xhr();m.cors=!!Yt&&"withCredentials"in Yt,m.ajax=Yt=!!Yt,S.ajaxTransport((function(e){var t,n;if(m.cors||Yt&&!e.crossDomain)return{send:function(i,o){var a,s=e.xhr();if(s.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(a in e.xhrFields)s[a]=e.xhrFields[a];for(a in e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),e.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest"),i)s.setRequestHeader(a,i[a]);t=function(e){return function(){t&&(t=n=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(jt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=t(),n=s.onerror=s.ontimeout=t("error"),void 0!==s.onabort?s.onabort=n:s.onreadystatechange=function(){4===s.readyState&&r.setTimeout((function(){t&&n()}))},t=t("abort");try{s.send(e.hasContent&&e.data||null)}catch(e){if(t)throw e}},abort:function(){t&&t()}}})),S.ajaxPrefilter((function(e){e.crossDomain&&(e.contents.script=!1)})),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",(function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")})),S.ajaxTransport("script",(function(e){var t,n;if(e.crossDomain||e.scriptAttrs)return{send:function(r,i){t=S("