diff -Nru phpmyadmin-5.1.3+dfsg1/babel.config.json phpmyadmin-5.1.4+dfsg1/babel.config.json
--- phpmyadmin-5.1.3+dfsg1/babel.config.json 2022-02-11 04:20:17.000000000 +0000
+++ phpmyadmin-5.1.4+dfsg1/babel.config.json 2022-05-11 03:26:08.000000000 +0000
@@ -1,3 +1,4 @@
{
- "presets": ["@babel/preset-env"]
+ "presets": ["@babel/preset-env"],
+ "sourceType": "script"
}
diff -Nru phpmyadmin-5.1.3+dfsg1/ChangeLog phpmyadmin-5.1.4+dfsg1/ChangeLog
--- phpmyadmin-5.1.3+dfsg1/ChangeLog 2022-02-11 04:20:17.000000000 +0000
+++ phpmyadmin-5.1.4+dfsg1/ChangeLog 2022-05-11 03:26:08.000000000 +0000
@@ -1,6 +1,26 @@
phpMyAdmin - ChangeLog
======================
+5.1.4 (2022-05-10)
+- issue #17287 Fixed sorting the database list with "statistics" enabled on "Data" column creates a PHP type error
+- issue #17368 Fix for invalid cache when losing access to config storage after it being cached
+- issue #17387 Fix session cookie not respecting the CookieSameSite configuration directive in PHP 7.2
+- issue #16769 Fix create index form accepting too many columns
+- issue #16816 Disable editing to system schemas
+- issue #16853 Add better error handling when IndexedDB is not working
+- issue Fixed incorrect escaping of special MySQL characters on some pages
+- issue #17188 Fix GIS visualization with an edited query
+- issue #17418 Remove the use of the deprecated `strftime` function in OpenDocument exports
+- issue #17111 Enable tabindex recompute on preview button while insert new rows
+- issue #17474 Fix invalid SQL generated when PRIMARY/UNIQUE key contains a POINT column
+- issue #17484 Fix setup's CSS not loading when the URL doesn't have a trailing slash
+- issue #17494 Remove jQuery SVG JavaScript dependency
+- issue #17335 Fix column visibility dropdown when the column name is too long
+- issue #17445 Fix issue when exporting using Firefox or Safari on PHP 8.1.4
+- issue Update JavaScript dependencies
+- issue #17428 Fix case where errors were thrown when browsing a table
+- issue #17508 Fix UI issue when user accounts page has the initials navigation bar
+
5.1.3 (2022-02-10)
- issue #17308 Fix broken pagination links in the navigation sidebar
- issue #17331 Fix MariaDB has no support for system variable "disabled_storage_engines"
diff -Nru phpmyadmin-5.1.3+dfsg1/composer.json phpmyadmin-5.1.4+dfsg1/composer.json
--- phpmyadmin-5.1.3+dfsg1/composer.json 2022-02-11 04:20:19.000000000 +0000
+++ phpmyadmin-5.1.4+dfsg1/composer.json 2022-05-11 03:26:09.000000000 +0000
@@ -86,7 +86,7 @@
"php-webdriver/webdriver": "^1.11",
"phpmyadmin/coding-standard": "^2.1.1",
"phpstan/extension-installer": "^1.1",
- "phpstan/phpstan": "^1.4.5",
+ "phpstan/phpstan": "^1.4.8",
"phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^7.5 || ^8.0 || ^9.0",
"pragmarx/google2fa-qrcode": "^1.0.1",
@@ -94,7 +94,7 @@
"symfony/finder": "^4.4",
"symfony/twig-bridge": "^4.4",
"tecnickcom/tcpdf": "^6.4.4",
- "vimeo/psalm": "^4.19"
+ "vimeo/psalm": "^4.22"
},
"extra": {
"branch-alias": {
@@ -102,19 +102,22 @@
}
},
"scripts": {
- "phpcbf": "phpcbf",
- "phpcs": "phpcs",
- "phpstan": "phpstan analyse",
- "psalm": "psalm",
- "phpunit": "phpunit --color=always",
+ "phpcbf": "@php phpcbf",
+ "phpcs": "@php phpcs",
+ "phpstan": "@php phpstan analyse",
+ "psalm": "@php psalm",
+ "phpunit": "@php phpunit --color=always",
"test": [
"@phpcs",
"@phpstan",
"@psalm",
"@phpunit"
],
- "update:baselines": "phpstan analyse --generate-baseline && psalm --set-baseline=psalm-baseline.xml",
- "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations"
+ "update:baselines": [
+ "@php phpstan analyse --generate-baseline",
+ "@php psalm --set-baseline=psalm-baseline.xml"
+ ],
+ "twig-lint": "@php scripts/console lint:twig templates --ansi --show-deprecations"
},
"config":{
"sort-packages": true,
diff -Nru phpmyadmin-5.1.3+dfsg1/composer.lock phpmyadmin-5.1.4+dfsg1/composer.lock
--- phpmyadmin-5.1.3+dfsg1/composer.lock 2022-02-11 04:20:17.000000000 +0000
+++ phpmyadmin-5.1.4+dfsg1/composer.lock 2022-05-11 03:26:08.000000000 +0000
@@ -4,20 +4,20 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "1a2c83ef2c26c5eb715b7581438df6a1",
+ "content-hash": "874bcc1f136099ae0b054f35062d66c8",
"packages": [
{
"name": "bacon/bacon-qr-code",
- "version": "2.0.6",
+ "version": "2.0.7",
"source": {
"type": "git",
"url": "https://github.com/Bacon/BaconQrCode.git",
- "reference": "0069435e2a01a57193b25790f105a5d3168653c1"
+ "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/0069435e2a01a57193b25790f105a5d3168653c1",
- "reference": "0069435e2a01a57193b25790f105a5d3168653c1",
+ "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c",
+ "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c",
"shasum": ""
},
"require": {
@@ -56,9 +56,9 @@
"homepage": "https://github.com/Bacon/BaconQrCode",
"support": {
"issues": "https://github.com/Bacon/BaconQrCode/issues",
- "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.6"
+ "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.7"
},
- "time": "2022-02-04T20:16:05+00:00"
+ "time": "2022-03-14T02:02:36+00:00"
},
{
"name": "code-lts/u2f-php-server",
@@ -332,27 +332,30 @@
},
{
"name": "phpmyadmin/motranslator",
- "version": "5.2.0",
+ "version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/motranslator.git",
- "reference": "cea68a8d0abf5e7fabc4179f07ef444223ddff44"
+ "reference": "87baa97809ec556c40e4cba4bdef998a2de2a003"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpmyadmin/motranslator/zipball/cea68a8d0abf5e7fabc4179f07ef444223ddff44",
- "reference": "cea68a8d0abf5e7fabc4179f07ef444223ddff44",
+ "url": "https://api.github.com/repos/phpmyadmin/motranslator/zipball/87baa97809ec556c40e4cba4bdef998a2de2a003",
+ "reference": "87baa97809ec556c40e4cba4bdef998a2de2a003",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0",
- "symfony/expression-language": "^4.0 || ^5.0"
+ "symfony/expression-language": "^4.0 || ^5.0 || ^6.0"
},
"require-dev": {
- "phpmyadmin/coding-standard": "^2.1.1",
- "phpstan/phpstan": "^0.12.56",
+ "phpmyadmin/coding-standard": "^3.0.0",
+ "phpstan/phpstan": "^1.4.6",
"phpunit/phpunit": "^7.4 || ^8 || ^9"
},
+ "suggest": {
+ "ext-apcu": "Needed for ACPu-backed translation cache"
+ },
"type": "library",
"autoload": {
"psr-4": {
@@ -382,7 +385,7 @@
"issues": "https://github.com/phpmyadmin/motranslator/issues",
"source": "https://github.com/phpmyadmin/motranslator"
},
- "time": "2021-02-05T17:05:44+00:00"
+ "time": "2022-04-26T11:24:50+00:00"
},
{
"name": "phpmyadmin/shapefile",
@@ -571,16 +574,16 @@
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.36",
+ "version": "2.0.37",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "a97547126396548c224703a267a30af1592be146"
+ "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/a97547126396548c224703a267a30af1592be146",
- "reference": "a97547126396548c224703a267a30af1592be146",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+ "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
"shasum": ""
},
"require": {
@@ -660,7 +663,7 @@
],
"support": {
"issues": "https://github.com/phpseclib/phpseclib/issues",
- "source": "https://github.com/phpseclib/phpseclib/tree/2.0.36"
+ "source": "https://github.com/phpseclib/phpseclib/tree/2.0.37"
},
"funding": [
{
@@ -676,7 +679,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-30T08:48:36+00:00"
+ "time": "2022-04-04T04:57:45+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -946,16 +949,16 @@
},
{
"name": "symfony/cache",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache.git",
- "reference": "7613787f68c5eaad98f0bd21d694e6d639b07bf0"
+ "reference": "27121284fe32a7cefc225268761ec7ce1741b9ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache/zipball/7613787f68c5eaad98f0bd21d694e6d639b07bf0",
- "reference": "7613787f68c5eaad98f0bd21d694e6d639b07bf0",
+ "url": "https://api.github.com/repos/symfony/cache/zipball/27121284fe32a7cefc225268761ec7ce1741b9ac",
+ "reference": "27121284fe32a7cefc225268761ec7ce1741b9ac",
"shasum": ""
},
"require": {
@@ -1021,7 +1024,7 @@
"psr6"
],
"support": {
- "source": "https://github.com/symfony/cache/tree/v4.4.37"
+ "source": "https://github.com/symfony/cache/tree/v4.4.41"
},
"funding": [
{
@@ -1037,20 +1040,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-26T15:03:25+00:00"
+ "time": "2022-04-25T17:25:00+00:00"
},
{
"name": "symfony/cache-contracts",
- "version": "v1.1.11",
+ "version": "v1.1.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/cache-contracts.git",
- "reference": "41c956506500bea5502022f6be81da96fb9c7626"
+ "reference": "a872a66e0bf7bac179c89bc96c7098bef1949f81"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/41c956506500bea5502022f6be81da96fb9c7626",
- "reference": "41c956506500bea5502022f6be81da96fb9c7626",
+ "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/a872a66e0bf7bac179c89bc96c7098bef1949f81",
+ "reference": "a872a66e0bf7bac179c89bc96c7098bef1949f81",
"shasum": ""
},
"require": {
@@ -1100,7 +1103,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/cache-contracts/tree/v1.1.11"
+ "source": "https://github.com/symfony/cache-contracts/tree/v1.1.12"
},
"funding": [
{
@@ -1116,20 +1119,20 @@
"type": "tidelift"
}
],
- "time": "2021-07-13T09:33:53+00:00"
+ "time": "2022-01-02T09:41:36+00:00"
},
{
"name": "symfony/config",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e"
+ "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
- "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
+ "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
+ "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
"shasum": ""
},
"require": {
@@ -1178,7 +1181,7 @@
"description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/config/tree/v4.4.37"
+ "source": "https://github.com/symfony/config/tree/v4.4.41"
},
"funding": [
{
@@ -1194,20 +1197,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-03T09:46:22+00:00"
+ "time": "2022-04-12T15:19:55+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "c00a23904b42f140087d36e1d22c88801bb39689"
+ "reference": "74c7f55de0eced4d3c9654809b1871870386a577"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c00a23904b42f140087d36e1d22c88801bb39689",
- "reference": "c00a23904b42f140087d36e1d22c88801bb39689",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/74c7f55de0eced4d3c9654809b1871870386a577",
+ "reference": "74c7f55de0eced4d3c9654809b1871870386a577",
"shasum": ""
},
"require": {
@@ -1220,7 +1223,7 @@
"symfony/config": "<4.3|>=5.0",
"symfony/finder": "<3.4",
"symfony/proxy-manager-bridge": "<3.4",
- "symfony/yaml": "<3.4"
+ "symfony/yaml": "<4.4.26"
},
"provide": {
"psr/container-implementation": "1.0",
@@ -1229,7 +1232,7 @@
"require-dev": {
"symfony/config": "^4.3",
"symfony/expression-language": "^3.4|^4.0|^5.0",
- "symfony/yaml": "^4.4|^5.0"
+ "symfony/yaml": "^4.4.26|^5.0"
},
"suggest": {
"symfony/config": "",
@@ -1264,7 +1267,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v4.4.37"
+ "source": "https://github.com/symfony/dependency-injection/tree/v4.4.41"
},
"funding": [
{
@@ -1280,20 +1283,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-24T17:17:45+00:00"
+ "time": "2022-04-12T15:19:55+00:00"
},
{
"name": "symfony/expression-language",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/expression-language.git",
- "reference": "b25f28d2bca785d0715426bdd4af873288fe1d89"
+ "reference": "2774df99a13bbf2339e1c5b1f8c47dbec8d67c2b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/expression-language/zipball/b25f28d2bca785d0715426bdd4af873288fe1d89",
- "reference": "b25f28d2bca785d0715426bdd4af873288fe1d89",
+ "url": "https://api.github.com/repos/symfony/expression-language/zipball/2774df99a13bbf2339e1c5b1f8c47dbec8d67c2b",
+ "reference": "2774df99a13bbf2339e1c5b1f8c47dbec8d67c2b",
"shasum": ""
},
"require": {
@@ -1327,7 +1330,7 @@
"description": "Provides an engine that can compile and evaluate expressions",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/expression-language/tree/v4.4.37"
+ "source": "https://github.com/symfony/expression-language/tree/v4.4.41"
},
"funding": [
{
@@ -1343,20 +1346,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-04-03T16:32:29+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v4.4.37",
+ "version": "v4.4.39",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "c59f37705c3e513ae55b2735f128f4ce363c82ec"
+ "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/c59f37705c3e513ae55b2735f128f4ce363c82ec",
- "reference": "c59f37705c3e513ae55b2735f128f4ce363c82ec",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/72a5b35fecaa670b13954e6eaf414acbe2a67b35",
+ "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35",
"shasum": ""
},
"require": {
@@ -1390,7 +1393,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/filesystem/tree/v4.4.37"
+ "source": "https://github.com/symfony/filesystem/tree/v4.4.39"
},
"funding": [
{
@@ -1406,11 +1409,11 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-02-25T10:38:15+00:00"
},
{
"name": "symfony/polyfill-ctype",
- "version": "v1.24.0",
+ "version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git",
@@ -1442,12 +1445,12 @@
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Ctype\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Ctype\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1472,7 +1475,7 @@
"portable"
],
"support": {
- "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+ "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
},
"funding": [
{
@@ -1492,7 +1495,7 @@
},
{
"name": "symfony/polyfill-mbstring",
- "version": "v1.24.0",
+ "version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
@@ -1524,12 +1527,12 @@
}
},
"autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Mbstring\\": ""
- },
"files": [
"bootstrap.php"
- ]
+ ],
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1555,7 +1558,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+ "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
},
"funding": [
{
@@ -1575,7 +1578,7 @@
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.24.0",
+ "version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
@@ -1631,7 +1634,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
},
"funding": [
{
@@ -1651,7 +1654,7 @@
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.24.0",
+ "version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
@@ -1710,7 +1713,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
},
"funding": [
{
@@ -1730,16 +1733,16 @@
},
{
"name": "symfony/polyfill-php80",
- "version": "v1.24.0",
+ "version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php80.git",
- "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
+ "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
- "reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
+ "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+ "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
"shasum": ""
},
"require": {
@@ -1793,7 +1796,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
+ "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
},
"funding": [
{
@@ -1809,11 +1812,11 @@
"type": "tidelift"
}
],
- "time": "2021-09-13T13:58:33+00:00"
+ "time": "2022-03-04T08:16:47+00:00"
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.24.0",
+ "version": "v1.25.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
@@ -1872,7 +1875,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
},
"funding": [
{
@@ -1892,16 +1895,16 @@
},
{
"name": "symfony/service-contracts",
- "version": "v1.1.11",
+ "version": "v1.1.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/service-contracts.git",
- "reference": "633df678bec3452e04a7b0337c9bcfe7354124b3"
+ "reference": "eedb374f02031714a48848758a27812f3eca317a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/service-contracts/zipball/633df678bec3452e04a7b0337c9bcfe7354124b3",
- "reference": "633df678bec3452e04a7b0337c9bcfe7354124b3",
+ "url": "https://api.github.com/repos/symfony/service-contracts/zipball/eedb374f02031714a48848758a27812f3eca317a",
+ "reference": "eedb374f02031714a48848758a27812f3eca317a",
"shasum": ""
},
"require": {
@@ -1951,7 +1954,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/service-contracts/tree/v1.1.11"
+ "source": "https://github.com/symfony/service-contracts/tree/v1.1.12"
},
"funding": [
{
@@ -1967,20 +1970,20 @@
"type": "tidelift"
}
],
- "time": "2021-11-04T13:32:43+00:00"
+ "time": "2022-03-09T13:39:03+00:00"
},
{
"name": "symfony/var-exporter",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "70efd494974592a6581ad44e962238e3f76baea4"
+ "reference": "bc5f57ae61b5e492b3f6f21be6e503dcc7b898b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/70efd494974592a6581ad44e962238e3f76baea4",
- "reference": "70efd494974592a6581ad44e962238e3f76baea4",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/bc5f57ae61b5e492b3f6f21be6e503dcc7b898b7",
+ "reference": "bc5f57ae61b5e492b3f6f21be6e503dcc7b898b7",
"shasum": ""
},
"require": {
@@ -2024,7 +2027,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v4.4.37"
+ "source": "https://github.com/symfony/var-exporter/tree/v4.4.41"
},
"funding": [
{
@@ -2040,7 +2043,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-04-25T17:40:48+00:00"
},
{
"name": "tecnickcom/tcpdf",
@@ -2116,16 +2119,16 @@
},
{
"name": "twig/twig",
- "version": "v2.14.11",
+ "version": "v2.14.13",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "66baa66f29ee30e487e05f1679903e36eb01d727"
+ "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727",
- "reference": "66baa66f29ee30e487e05f1679903e36eb01d727",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/66856cd0459df3dc97d32077a98454dc2a0ee75a",
+ "reference": "66856cd0459df3dc97d32077a98454dc2a0ee75a",
"shasum": ""
},
"require": {
@@ -2180,7 +2183,7 @@
],
"support": {
"issues": "https://github.com/twigphp/Twig/issues",
- "source": "https://github.com/twigphp/Twig/tree/v2.14.11"
+ "source": "https://github.com/twigphp/Twig/tree/v2.14.13"
},
"funding": [
{
@@ -2192,7 +2195,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-04T06:57:25+00:00"
+ "time": "2022-04-06T06:45:17+00:00"
},
{
"name": "williamdes/mariadb-mysql-kbs",
@@ -2269,16 +2272,16 @@
"packages-dev": [
{
"name": "amphp/amp",
- "version": "v2.6.1",
+ "version": "v2.6.2",
"source": {
"type": "git",
"url": "https://github.com/amphp/amp.git",
- "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae"
+ "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/amphp/amp/zipball/c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae",
- "reference": "c5fc66a78ee38d7ac9195a37bacaf940eb3f65ae",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+ "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
"shasum": ""
},
"require": {
@@ -2300,13 +2303,13 @@
}
},
"autoload": {
- "psr-4": {
- "Amp\\": "lib"
- },
"files": [
"lib/functions.php",
"lib/Internal/functions.php"
- ]
+ ],
+ "psr-4": {
+ "Amp\\": "lib"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -2331,7 +2334,7 @@
}
],
"description": "A non-blocking concurrency framework for PHP applications.",
- "homepage": "http://amphp.org/amp",
+ "homepage": "https://amphp.org/amp",
"keywords": [
"async",
"asynchronous",
@@ -2346,7 +2349,7 @@
"support": {
"irc": "irc://irc.freenode.org/amphp",
"issues": "https://github.com/amphp/amp/issues",
- "source": "https://github.com/amphp/amp/tree/v2.6.1"
+ "source": "https://github.com/amphp/amp/tree/v2.6.2"
},
"funding": [
{
@@ -2354,7 +2357,7 @@
"type": "github"
}
],
- "time": "2021-09-23T18:43:08+00:00"
+ "time": "2022-02-20T17:52:18+00:00"
},
{
"name": "amphp/byte-stream",
@@ -2579,16 +2582,16 @@
},
{
"name": "composer/semver",
- "version": "3.2.9",
+ "version": "3.3.2",
"source": {
"type": "git",
"url": "https://github.com/composer/semver.git",
- "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649"
+ "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/semver/zipball/a951f614bd64dcd26137bc9b7b2637ddcfc57649",
- "reference": "a951f614bd64dcd26137bc9b7b2637ddcfc57649",
+ "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+ "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
"shasum": ""
},
"require": {
@@ -2640,7 +2643,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues",
- "source": "https://github.com/composer/semver/tree/3.2.9"
+ "source": "https://github.com/composer/semver/tree/3.3.2"
},
"funding": [
{
@@ -2656,20 +2659,20 @@
"type": "tidelift"
}
],
- "time": "2022-02-04T13:58:43+00:00"
+ "time": "2022-04-01T19:23:25+00:00"
},
{
"name": "composer/xdebug-handler",
- "version": "2.0.4",
+ "version": "2.0.5",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a"
+ "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
- "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
+ "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
"shasum": ""
},
"require": {
@@ -2706,7 +2709,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.4"
+ "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
},
"funding": [
{
@@ -2722,7 +2725,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-04T17:06:45+00:00"
+ "time": "2022-02-24T20:20:32+00:00"
},
{
"name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -2893,29 +2896,30 @@
},
{
"name": "doctrine/instantiator",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
- "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+ "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
- "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+ "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+ "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
- "doctrine/coding-standard": "^8.0",
+ "doctrine/coding-standard": "^9",
"ext-pdo": "*",
"ext-phar": "*",
- "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
- "phpstan/phpstan": "^0.12",
- "phpstan/phpstan-phpunit": "^0.12",
- "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+ "phpbench/phpbench": "^0.16 || ^1",
+ "phpstan/phpstan": "^1.4",
+ "phpstan/phpstan-phpunit": "^1",
+ "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+ "vimeo/psalm": "^4.22"
},
"type": "library",
"autoload": {
@@ -2942,7 +2946,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
- "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+ "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
},
"funding": [
{
@@ -2958,7 +2962,7 @@
"type": "tidelift"
}
],
- "time": "2020-11-10T18:47:58+00:00"
+ "time": "2022-03-03T08:28:38+00:00"
},
{
"name": "felixfbecker/advanced-json-rpc",
@@ -3007,16 +3011,16 @@
},
{
"name": "felixfbecker/language-server-protocol",
- "version": "1.5.1",
+ "version": "v1.5.2",
"source": {
"type": "git",
"url": "https://github.com/felixfbecker/php-language-server-protocol.git",
- "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730"
+ "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
- "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730",
+ "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842",
+ "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842",
"shasum": ""
},
"require": {
@@ -3057,31 +3061,35 @@
],
"support": {
"issues": "https://github.com/felixfbecker/php-language-server-protocol/issues",
- "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/1.5.1"
+ "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2"
},
- "time": "2021-02-22T14:02:09+00:00"
+ "time": "2022-03-02T22:36:06+00:00"
},
{
"name": "myclabs/deep-copy",
- "version": "1.10.2",
+ "version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
- "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+ "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
- "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+ "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
+ "conflict": {
+ "doctrine/collections": "<1.6.8",
+ "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+ },
"require-dev": {
- "doctrine/collections": "^1.0",
- "doctrine/common": "^2.6",
- "phpunit/phpunit": "^7.1"
+ "doctrine/collections": "^1.6.8",
+ "doctrine/common": "^2.13.3 || ^3.2.2",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
},
"type": "library",
"autoload": {
@@ -3106,7 +3114,7 @@
],
"support": {
"issues": "https://github.com/myclabs/DeepCopy/issues",
- "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+ "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
},
"funding": [
{
@@ -3114,7 +3122,7 @@
"type": "tidelift"
}
],
- "time": "2020-11-13T09:40:50+00:00"
+ "time": "2022-03-03T13:19:32+00:00"
},
{
"name": "netresearch/jsonmapper",
@@ -3328,16 +3336,16 @@
},
{
"name": "paragonie/sodium_compat",
- "version": "v1.17.0",
+ "version": "v1.17.1",
"source": {
"type": "git",
"url": "https://github.com/paragonie/sodium_compat.git",
- "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321"
+ "reference": "ac994053faac18d386328c91c7900f930acadf1e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/c59cac21abbcc0df06a3dd18076450ea4797b321",
- "reference": "c59cac21abbcc0df06a3dd18076450ea4797b321",
+ "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/ac994053faac18d386328c91c7900f930acadf1e",
+ "reference": "ac994053faac18d386328c91c7900f930acadf1e",
"shasum": ""
},
"require": {
@@ -3408,9 +3416,9 @@
],
"support": {
"issues": "https://github.com/paragonie/sodium_compat/issues",
- "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.0"
+ "source": "https://github.com/paragonie/sodium_compat/tree/v1.17.1"
},
- "time": "2021-08-10T02:43:50+00:00"
+ "time": "2022-03-23T19:32:04+00:00"
},
{
"name": "phar-io/manifest",
@@ -3524,16 +3532,16 @@
},
{
"name": "php-webdriver/webdriver",
- "version": "1.12.0",
+ "version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/php-webdriver/php-webdriver.git",
- "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb"
+ "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
- "reference": "99d4856ed7dffcdf6a52eccd6551e83d8d557ceb",
+ "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
+ "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
"shasum": ""
},
"require": {
@@ -3561,12 +3569,12 @@
},
"type": "library",
"autoload": {
- "psr-4": {
- "Facebook\\WebDriver\\": "lib/"
- },
"files": [
"lib/Exception/TimeoutException.php"
- ]
+ ],
+ "psr-4": {
+ "Facebook\\WebDriver\\": "lib/"
+ }
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -3583,9 +3591,9 @@
],
"support": {
"issues": "https://github.com/php-webdriver/php-webdriver/issues",
- "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.0"
+ "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1"
},
- "time": "2021-10-14T09:30:02+00:00"
+ "time": "2022-05-03T12:16:34+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -3957,16 +3965,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.4.6",
+ "version": "1.4.10",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe"
+ "reference": "898c479c39caa727bedf4311dd294a8f4e250e72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8a7761f1c520e0dad6e04d862fdc697445457cfe",
- "reference": "8a7761f1c520e0dad6e04d862fdc697445457cfe",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/898c479c39caa727bedf4311dd294a8f4e250e72",
+ "reference": "898c479c39caa727bedf4311dd294a8f4e250e72",
"shasum": ""
},
"require": {
@@ -3980,11 +3988,6 @@
"phpstan.phar"
],
"type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.4-dev"
- }
- },
"autoload": {
"files": [
"bootstrap.php"
@@ -3997,7 +4000,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
- "source": "https://github.com/phpstan/phpstan/tree/1.4.6"
+ "source": "https://github.com/phpstan/phpstan/tree/1.4.10"
},
"funding": [
{
@@ -4017,7 +4020,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-06T12:56:13+00:00"
+ "time": "2022-03-14T10:25:45+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
@@ -5236,16 +5239,16 @@
},
{
"name": "symfony/console",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "0259f01dbf9d77badddbbf4c2abb681f24c9cac6"
+ "reference": "0e1e62083b20ccb39c2431293de060f756af905c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/0259f01dbf9d77badddbbf4c2abb681f24c9cac6",
- "reference": "0259f01dbf9d77badddbbf4c2abb681f24c9cac6",
+ "url": "https://api.github.com/repos/symfony/console/zipball/0e1e62083b20ccb39c2431293de060f756af905c",
+ "reference": "0e1e62083b20ccb39c2431293de060f756af905c",
"shasum": ""
},
"require": {
@@ -5306,7 +5309,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/console/tree/v4.4.37"
+ "source": "https://github.com/symfony/console/tree/v4.4.41"
},
"funding": [
{
@@ -5322,20 +5325,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-26T16:15:26+00:00"
+ "time": "2022-04-12T15:19:55+00:00"
},
{
"name": "symfony/finder",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "b17d76d7ed179f017aad646e858c90a2771af15d"
+ "reference": "40790bdf293b462798882ef6da72bb49a4a6633a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d",
- "reference": "b17d76d7ed179f017aad646e858c90a2771af15d",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a",
+ "reference": "40790bdf293b462798882ef6da72bb49a4a6633a",
"shasum": ""
},
"require": {
@@ -5368,7 +5371,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v4.4.37"
+ "source": "https://github.com/symfony/finder/tree/v4.4.41"
},
"funding": [
{
@@ -5384,20 +5387,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-04-14T15:36:10+00:00"
},
{
"name": "symfony/process",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "b2d924e5a4cb284f293d5092b1dbf0d364cb8b67"
+ "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/b2d924e5a4cb284f293d5092b1dbf0d364cb8b67",
- "reference": "b2d924e5a4cb284f293d5092b1dbf0d364cb8b67",
+ "url": "https://api.github.com/repos/symfony/process/zipball/9eedd60225506d56e42210a70c21bb80ca8456ce",
+ "reference": "9eedd60225506d56e42210a70c21bb80ca8456ce",
"shasum": ""
},
"require": {
@@ -5430,7 +5433,7 @@
"description": "Executes commands in sub-processes",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/process/tree/v4.4.37"
+ "source": "https://github.com/symfony/process/tree/v4.4.41"
},
"funding": [
{
@@ -5446,20 +5449,20 @@
"type": "tidelift"
}
],
- "time": "2022-01-27T17:14:04+00:00"
+ "time": "2022-04-04T10:19:07+00:00"
},
{
"name": "symfony/translation-contracts",
- "version": "v1.1.11",
+ "version": "v1.1.12",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation-contracts.git",
- "reference": "58ae23095ffdea045725dda70752566aa2908be6"
+ "reference": "c04dc8a7873a2a9196f038e99342df46b6661a29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/58ae23095ffdea045725dda70752566aa2908be6",
- "reference": "58ae23095ffdea045725dda70752566aa2908be6",
+ "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/c04dc8a7873a2a9196f038e99342df46b6661a29",
+ "reference": "c04dc8a7873a2a9196f038e99342df46b6661a29",
"shasum": ""
},
"require": {
@@ -5508,7 +5511,7 @@
"standards"
],
"support": {
- "source": "https://github.com/symfony/translation-contracts/tree/v1.1.11"
+ "source": "https://github.com/symfony/translation-contracts/tree/v1.1.12"
},
"funding": [
{
@@ -5524,20 +5527,20 @@
"type": "tidelift"
}
],
- "time": "2021-07-13T10:01:39+00:00"
+ "time": "2022-01-02T09:41:36+00:00"
},
{
"name": "symfony/twig-bridge",
- "version": "v4.4.37",
+ "version": "v4.4.41",
"source": {
"type": "git",
"url": "https://github.com/symfony/twig-bridge.git",
- "reference": "ad832919f412e464bb099a1514c28d6d53223c76"
+ "reference": "48391149d8fe7fc1b0ed2d67868f02686f8171dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ad832919f412e464bb099a1514c28d6d53223c76",
- "reference": "ad832919f412e464bb099a1514c28d6d53223c76",
+ "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/48391149d8fe7fc1b0ed2d67868f02686f8171dc",
+ "reference": "48391149d8fe7fc1b0ed2d67868f02686f8171dc",
"shasum": ""
},
"require": {
@@ -5625,7 +5628,7 @@
"description": "Provides integration for Twig with various Symfony components",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/twig-bridge/tree/v4.4.37"
+ "source": "https://github.com/symfony/twig-bridge/tree/v4.4.41"
},
"funding": [
{
@@ -5641,7 +5644,7 @@
"type": "tidelift"
}
],
- "time": "2022-01-02T09:41:36+00:00"
+ "time": "2022-04-12T15:19:55+00:00"
},
{
"name": "theseer/tokenizer",
@@ -5689,16 +5692,16 @@
},
{
"name": "vimeo/psalm",
- "version": "4.20.0",
+ "version": "4.23.0",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "f82a70e7edfc6cf2705e9374c8a0b6a974a779ed"
+ "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/f82a70e7edfc6cf2705e9374c8a0b6a974a779ed",
- "reference": "f82a70e7edfc6cf2705e9374c8a0b6a974a779ed",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/f1fe6ff483bf325c803df9f510d09a03fd796f88",
+ "reference": "f1fe6ff483bf325c803df9f510d09a03fd796f88",
"shasum": ""
},
"require": {
@@ -5723,6 +5726,7 @@
"php": "^7.1|^8",
"sebastian/diff": "^3.0 || ^4.0",
"symfony/console": "^3.4.17 || ^4.1.6 || ^5.0 || ^6.0",
+ "symfony/polyfill-php80": "^1.25",
"webmozart/path-util": "^2.3"
},
"provide": {
@@ -5789,9 +5793,9 @@
],
"support": {
"issues": "https://github.com/vimeo/psalm/issues",
- "source": "https://github.com/vimeo/psalm/tree/4.20.0"
+ "source": "https://github.com/vimeo/psalm/tree/4.23.0"
},
- "time": "2022-02-03T17:03:47+00:00"
+ "time": "2022-04-28T17:35:49+00:00"
},
{
"name": "webmozart/assert",
diff -Nru phpmyadmin-5.1.3+dfsg1/debian/autoload.php.tpl phpmyadmin-5.1.4+dfsg1/debian/autoload.php.tpl
--- phpmyadmin-5.1.3+dfsg1/debian/autoload.php.tpl 2022-02-11 23:28:27.000000000 +0000
+++ phpmyadmin-5.1.4+dfsg1/debian/autoload.php.tpl 2022-05-24 23:03:20.000000000 +0000
@@ -1,18 +1,18 @@
Wed, 25 May 2022 01:04:02 +0200
+
phpmyadmin (4:5.1.3+dfsg1-1+impish1) impish; urgency=medium
* New upstream version 5.1.3+dfsg1
-- William Desportes $cfg['Servers'][$i]['host']
will be used.
$cfg['Servers'][$i]['auth_swekey_config']
¶string
+''
New in version 3.0.0.0: This setting was named $cfg[‘Servers’][$i][‘auth_feebee_config’] and was renamed before the 3.0.0.0 release.
+Deprecated since version 4.6.4: This setting was removed because their servers are no longer working and it was not working correctly.
+Deprecated since version 4.0.10.17: This setting was removed in a maintenance release because their servers are no longer working and it was not working correctly.
+The name of the file containing swekey ids and login names for hardware +authentication. Leave empty to deactivate this feature.
+$cfg['Servers'][$i]['user']
¶After the plot is generated, you can use the -mousewheel to zoom in and out of the plot. In addition, panning +mouse wheel to zoom in and out of the plot. In addition, panning feature is enabled to navigate through the plot. You can zoom-in to a certain level of detail and use panning to locate your area of interest. Clicking on a point opens a dialogue box, displaying field @@ -1987,7 +1987,7 @@
Use the singleton instance of this class, $.svg, - to interact with the SVG functionality.
-Expects HTML like:
-<div></div>- @module SVGManager */ -function SVGManager() { - this._settings = []; // Settings to be remembered per SVG object - this._extensions = []; // List of SVG extensions added to SVGWrapper - // for each entry [0] is extension name, [1] is extension class (function) - // the function takes one parameter - the SVGWrapper instance - this.regional = []; // Localisations, indexed by language, '' for default (English) - this.regional[''] = {errorLoadingText: 'Error loading'}; - this.local = this.regional['']; // Current localisation - this._uuid = new Date().getTime(); - this._ie = !!window.ActiveXObject; -} - -$.extend(SVGManager.prototype, { - /** Class name added to elements to indicate already configured with SVG. */ - markerClassName: 'hasSVG', - /** Name of the data property for instance settings. */ - propertyName: 'svgwrapper', - - /** SVG namespace. */ - svgNS: 'http://www.w3.org/2000/svg', - /** XLink namespace. */ - xlinkNS: 'http://www.w3.org/1999/xlink', - - /** SVG wrapper class. */ - _wrapperClass: SVGWrapper, - - /* Camel-case versions of attribute names containing dashes or are reserved words. */ - _attrNames: {class_: 'class', in_: 'in', - alignmentBaseline: 'alignment-baseline', baselineShift: 'baseline-shift', - clipPath: 'clip-path', clipRule: 'clip-rule', - colorInterpolation: 'color-interpolation', - colorInterpolationFilters: 'color-interpolation-filters', - colorRendering: 'color-rendering', dominantBaseline: 'dominant-baseline', - enableBackground: 'enable-background', fillOpacity: 'fill-opacity', - fillRule: 'fill-rule', floodColor: 'flood-color', - floodOpacity: 'flood-opacity', fontFamily: 'font-family', - fontSize: 'font-size', fontSizeAdjust: 'font-size-adjust', - fontStretch: 'font-stretch', fontStyle: 'font-style', - fontVariant: 'font-variant', fontWeight: 'font-weight', - glyphOrientationHorizontal: 'glyph-orientation-horizontal', - glyphOrientationVertical: 'glyph-orientation-vertical', - horizAdvX: 'horiz-adv-x', horizOriginX: 'horiz-origin-x', - imageRendering: 'image-rendering', letterSpacing: 'letter-spacing', - lightingColor: 'lighting-color', markerEnd: 'marker-end', - markerMid: 'marker-mid', markerStart: 'marker-start', - stopColor: 'stop-color', stopOpacity: 'stop-opacity', - strikethroughPosition: 'strikethrough-position', - strikethroughThickness: 'strikethrough-thickness', - strokeDashArray: 'stroke-dasharray', strokeDashOffset: 'stroke-dashoffset', - strokeLineCap: 'stroke-linecap', strokeLineJoin: 'stroke-linejoin', - strokeMiterLimit: 'stroke-miterlimit', strokeOpacity: 'stroke-opacity', - strokeWidth: 'stroke-width', textAnchor: 'text-anchor', - textDecoration: 'text-decoration', textRendering: 'text-rendering', - underlinePosition: 'underline-position', underlineThickness: 'underline-thickness', - vertAdvY: 'vert-adv-y', vertOriginY: 'vert-origin-y', - wordSpacing: 'word-spacing', writingMode: 'writing-mode'}, - - /* Add the SVG object to its container. */ - _attachSVG: function(container, settings) { - var svg = (container.namespaceURI === this.svgNS ? container : null); - var container = (svg ? null : container); - if ($(container || svg).hasClass(this.markerClassName)) { - return; - } - if (typeof settings === 'string') { - settings = {loadURL: settings}; - } - else if (typeof settings === 'function') { - settings = {onLoad: settings}; - } - $(container || svg).addClass(this.markerClassName); - try { - if (!svg) { - svg = document.createElementNS(this.svgNS, 'svg'); - svg.setAttribute('version', '1.1'); - if (container.clientWidth > 0) { - svg.setAttribute('width', container.clientWidth); - } - if (container.clientHeight > 0) { - svg.setAttribute('height', container.clientHeight); - } - container.appendChild(svg); - } - this._afterLoad(container, svg, settings || {}); - } - catch (e) { - $(container).html('
SVG is not supported natively on this browser
'); - } - }, - - /* Post-processing once loaded. */ - _afterLoad: function(container, svg, settings) { - var settings = settings || this._settings[container.id]; - this._settings[container ? container.id : ''] = null; - var wrapper = new this._wrapperClass(svg, container); - $.data(container || svg, $.svg.propertyName, wrapper); - try { - if (settings.loadURL) { // Load URL - wrapper.load(settings.loadURL, settings); - } - if (settings.settings) { // Additional settings - wrapper.configure(settings.settings); - } - if (settings.onLoad && !settings.loadURL) { // Onload callback - settings.onLoad.apply(container || svg, [wrapper]); - } - } - catch (e) { - alert(e); - } - }, - - /** Return the SVG wrapper created for a given container. - @param container {string|Element|jQuery} Selector for the container or - the container for the SVG object or jQuery collection where first entry is the container. - @return {SVGWrapper} The corresponding SVG wrapper element, ornull
if not attached. */
- _getSVG: function(container) {
- return $(container).data(this.propertyName);
- },
-
- /** Remove the SVG functionality from a div.
- @param container {Element} The container for the SVG object. */
- _destroySVG: function(container) {
- container = $(container);
- if (!container.hasClass(this.markerClassName)) {
- return;
- }
- container.removeClass(this.markerClassName).removeData(this.propertyName);
- if (container[0].namespaceURI !== this.svgNS) {
- container.empty();
- }
- },
-
- /** Extend the SVGWrapper object with an embedded class.
- The constructor function must take a single parameter that is - a reference to the owning SVG root object. This allows the - extension to access the basic SVG functionality.
- @param name {string} The name of theSVGWrapper
attribute to access the new class.
- @param extClass {function} The extension class constructor. */
- addExtension: function(name, extClass) {
- this._extensions.push([name, extClass]);
- },
-
- /** Does this node belong to SVG?
- @param node {Element} The node to be tested.
- @return {boolean} true
if an SVG node, false
if not. */
- isSVGElem: function(node) {
- return (node.nodeType === 1 && node.namespaceURI === $.svg.svgNS);
- }
-});
-
-/** The main SVG interface, which encapsulates the SVG element.
- Obtain a reference from $().svg('get')
- @module SVGWrapper */ -function SVGWrapper(svg, container) { - this._svg = svg; // The SVG root node - this._container = container; // The containing div - for (var i = 0; i < $.svg._extensions.length; i++) { - var extension = $.svg._extensions[i]; - this[extension[0]] = new extension[1](this); - } -} - -$.extend(SVGWrapper.prototype, { - - /** Retrieve the width of the SVG object. - @return {number} The width of the SVG canvas. */ - width: function() { - return (this._container ? this._container.clientWidth : this._svg.width); - }, - - /** Retrieve the height of the SVG object. - @return {number} The height of the SVG canvas. */ - height: function() { - return (this._container ? this._container.clientHeight : this._svg.height); - }, - - /** Retrieve the root SVG element. - @return {SVGElement} The top-level SVG element. */ - root: function() { - return this._svg; - }, - - /** Configure a SVG node. - @param [node] {SVGElement} The node to configure, or the SVG root if not specified. - @param settings {object} Additional settings for the root. - @param [clear=false] {boolean}true
to remove existing attributes first,
- false
to add to what is already there.
- @return {SVGWrapper} This wrapper. */
- configure: function(node, settings, clear) {
- if (!node.nodeName) {
- clear = settings;
- settings = node;
- node = this._svg;
- }
- if (clear) {
- for (var i = node.attributes.length - 1; i >= 0; i--) {
- var attr = node.attributes.item(i);
- if (!(attr.nodeName === 'onload' || attr.nodeName === 'version' ||
- attr.nodeName.substring(0, 5) === 'xmlns')) {
- node.attributes.removeNamedItem(attr.nodeName);
- }
- }
- }
- for (var attrName in settings) {
- node.setAttribute($.svg._attrNames[attrName] || attrName, settings[attrName]);
- }
- return this;
- },
-
- /** Locate a specific element in the SVG document.
- @param id {string} The element's identifier.
- @return {SVGElement} The element reference, or null
if not found. */
- getElementById: function(id) {
- return this._svg.ownerDocument.getElementById(id);
- },
-
- /** Change the attributes for a SVG node.
- @param element {SVGElement} The node to change.
- @param settings {object} The new settings.
- @return {SVGWrapper} This wrapper. */
- change: function(element, settings) {
- if (element) {
- for (var name in settings) {
- if (settings[name] == null) {
- element.removeAttribute($.svg._attrNames[name] || name);
- }
- else {
- element.setAttribute($.svg._attrNames[name] || name, settings[name]);
- }
- }
- }
- return this;
- },
-
- /** Check for parent being absent and adjust arguments accordingly.
- @private
- @param values {string[]} The given parameters.
- @param names {string[]} The names of the parameters in order.
- @param optSettings {string[]} The names of optional parameters.
- @return {object} An object representing the named parameters. */
- _args: function(values, names, optSettings) {
- names.splice(0, 0, 'parent');
- names.splice(names.length, 0, 'settings');
- var args = {};
- var offset = 0;
- if (values[0] != null && values[0].jquery) {
- values[0] = values[0][0];
- }
- if (values[0] != null && !(typeof values[0] === 'object' && values[0].nodeName)) {
- args['parent'] = null;
- offset = 1;
- }
- for (var i = 0; i < values.length; i++) {
- args[names[i + offset]] = values[i];
- }
- if (optSettings) {
- $.each(optSettings, function(i, value) {
- if (typeof args[value] === 'object') {
- args.settings = args[value];
- args[value] = null;
- }
- });
- }
- return args;
- },
-
- /** Add a title.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param text {string} The text of the title.
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new title node. */
- title: function(parent, text, settings) {
- var args = this._args(arguments, ['text']);
- var node = this._makeNode(args.parent, 'title', args.settings || {});
- node.appendChild(this._svg.ownerDocument.createTextNode(args.text));
- return node;
- },
-
- /** Add a description.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param text {string} The text of the description.
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new description node. */
- describe: function(parent, text, settings) {
- var args = this._args(arguments, ['text']);
- var node = this._makeNode(args.parent, 'desc', args.settings || {});
- node.appendChild(this._svg.ownerDocument.createTextNode(args.text));
- return node;
- },
-
- /** Add a definitions node.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param [id] {string} The ID of this definitions (optional).
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new definitions node. */
- defs: function(parent, id, settings) {
- var args = this._args(arguments, ['id'], ['id']);
- return this._makeNode(args.parent, 'defs', $.extend((args.id ? {id: args.id} : {}), args.settings || {}));
- },
-
- /** Add a symbol definition.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param id {string} The ID of this symbol.
- @param x1 {number} The left coordinate for this symbol.
- @param y1 {number} The top coordinate for this symbol.
- @param width {number} The width of this symbol.
- @param height {number} The height of this symbol.
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new symbol node. */
- symbol: function(parent, id, x1, y1, width, height, settings) {
- var args = this._args(arguments, ['id', 'x1', 'y1', 'width', 'height']);
- return this._makeNode(args.parent, 'symbol', $.extend({id: args.id,
- viewBox: args.x1 + ' ' + args.y1 + ' ' + args.width + ' ' + args.height}, args.settings || {}));
- },
-
- /** Add a marker definition.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param id {string} The ID of this marker.
- @param refX {number} The x-coordinate for the reference point.
- @param refY {number} The y-coordinate for the reference point.
- @param mWidth {number} The marker viewport width.
- @param mHeight {number} The marker viewport height.
- @param [orient] {string|number} 'auto' or angle (degrees).
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new marker node. */
- marker: function(parent, id, refX, refY, mWidth, mHeight, orient, settings) {
- var args = this._args(arguments, ['id', 'refX', 'refY', 'mWidth', 'mHeight', 'orient'], ['orient']);
- return this._makeNode(args.parent, 'marker', $.extend(
- {id: args.id, refX: args.refX, refY: args.refY, markerWidth: args.mWidth,
- markerHeight: args.mHeight, orient: args.orient || 'auto'}, args.settings || {}));
- },
-
- /** Add a style node.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param styles {string} The CSS styles.
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new style node. */
- style: function(parent, styles, settings) {
- var args = this._args(arguments, ['styles']);
- var node = this._makeNode(args.parent, 'style', $.extend({type: 'text/css'}, args.settings || {}));
- node.appendChild(this._svg.ownerDocument.createTextNode(args.styles));
- return node;
- },
-
- /** Add a script node.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param script {string} The JavaScript code.
- @param [type='text/javascript'] {string} The MIME type for the code.
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new script node. */
- script: function(parent, script, type, settings) {
- var args = this._args(arguments, ['script', 'type'], ['type']);
- var node = this._makeNode(args.parent, 'script', $.extend(
- {type: args.type || 'text/javascript'}, args.settings || {}));
- node.appendChild(this._svg.ownerDocument.createTextNode(args.script));
- if ($.svg._ie) {
- $.globalEval(args.script);
- }
- return node;
- },
-
- /** Add a linear gradient definition.
- Specify all of x1
, y1
, x2
, y2
or none of them.
Specify all of cx
, cy
, r
,
- fx
, fy
or none of them.
Specify all of vx
, vy
, xwidth
,
- vheight
or none of them.
Specify all of vx
, vy
,
- vwidth
, vheight
or none of them.
Specify all of x
, y
, width
, height
or none of them.
Specify both of rx
and ry
or neither.
Specify both of x
and y
or neither of them.
null
.
- @param name {string} The name of the element.
- @param [settings] {object} Additional settings for this node.
- @return {SVGElement} The new node. */
- _makeNode: function(parent, name, settings) {
- parent = parent || this._svg;
- var node = this._svg.ownerDocument.createElementNS($.svg.svgNS, name);
- for (var name in settings) {
- var value = settings[name];
- if (value != null && (typeof value !== 'string' || value !== '')) {
- node.setAttribute($.svg._attrNames[name] || name, value);
- }
- }
- parent.appendChild(node);
- return node;
- },
-
- /** Add an existing SVG node to the document.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param node {SVGElement|string|jQuery} The new node to add or
- the jQuery selector for the node or the set of nodes to add.
- @return {SVGWrapper} This wrapper. */
- add: function(parent, node) {
- var args = this._args((arguments.length === 1 ? [null, parent] : arguments), ['node']);
- var svg = this;
- args.parent = args.parent || this._svg;
- args.node = (args.node.jquery ? args.node : $(args.node));
- try {
- args.parent.appendChild(args.node.cloneNode(true));
- }
- catch (e) {
- args.node.each(function() {
- var child = svg._cloneAsSVG(this);
- if (child) {
- args.parent.appendChild(child);
- }
- });
- }
- return this;
- },
-
- /** Clone an existing SVG node and add it to the document.
- @param [parent] {SVGElement|jQuery} The parent node for the new node, or SVG root if not specified.
- @param node {SVGEelement|string|jQuery} The new node to add or
- the jQuery selector for the node or the set of nodes to clone.
- @return {SVGElement[]} The collection of new nodes. */
- clone: function(parent, node) {
- var svg = this;
- var args = this._args((arguments.length === 1 ? [null, parent] : arguments), ['node']);
- args.parent = args.parent || this._svg;
- args.node = (args.node.jquery ? args.node : $(args.node));
- var newNodes = [];
- args.node.each(function() {
- var child = svg._cloneAsSVG(this);
- if (child) {
- child.id = '';
- args.parent.appendChild(child);
- newNodes.push(child);
- }
- });
- return newNodes;
- },
-
- /** SVG nodes must belong to the SVG namespace, so clone and ensure this is so.
- @private
- @param node {SVGElement} The SVG node to clone.
- @return {SVGElement} The cloned node. */
- _cloneAsSVG: function(node) {
- var newNode = null;
- if (node.nodeType === 1) { // element
- newNode = this._svg.ownerDocument.createElementNS($.svg.svgNS, this._checkName(node.nodeName));
- for (var i = 0; i < node.attributes.length; i++) {
- var attr = node.attributes.item(i);
- if (attr.nodeName !== 'xmlns' && attr.nodeValue) {
- if (attr.prefix === 'xlink') {
- newNode.setAttributeNS($.svg.xlinkNS, attr.localName || attr.baseName, attr.nodeValue);
- }
- else {
- newNode.setAttribute(this._checkName(attr.nodeName), attr.nodeValue);
- }
- }
- }
- for (var i = 0; i < node.childNodes.length; i++) {
- var child = this._cloneAsSVG(node.childNodes[i]);
- if (child) {
- newNode.appendChild(child);
- }
- }
- }
- else if (node.nodeType === 3) { // text
- if ($.trim(node.nodeValue)) {
- newNode = this._svg.ownerDocument.createTextNode(node.nodeValue);
- }
- }
- else if (node.nodeType === 4) { // CDATA
- if ($.trim(node.nodeValue)) {
- try {
- newNode = this._svg.ownerDocument.createCDATASection(node.nodeValue);
- }
- catch (e) {
- newNode = this._svg.ownerDocument.createTextNode(
- node.nodeValue.replace(/&/g, '&').replace(//g, '>'));
- }
- }
- }
- return newNode;
- },
-
- /** Node names must be lower case and without SVG namespace prefix.
- @private
- @param name {string} The name to check.
- @return {string} The corrected name. */
- _checkName: function(name) {
- name = (name.substring(0, 1) >= 'A' && name.substring(0, 1) <= 'Z' ? name.toLowerCase() : name);
- return (name.substring(0, 4) === 'svg:' ? name.substring(4) : name);
- },
-
- /** Load an external SVG document.
- @param url {string} The location of the SVG document or
- the actual SVG content (starting with '<svg
'.
- @param settings {boolean|function|object} Either addTo
below or onLoad
below or
- additional settings for the load with attributes below:
- addTo
{boolean} true
to add to what's already there,
- or false
to clear the canvas first,
- changeSize
{boolean} true
to allow the canvas size to change,
- or false
to retain the original,
- onLoad
{function} callback after the document has loaded,
- 'this
' is the container, receives SVG object and optional error message as a parameter,
- parent
{string|SVGElement|jQuery} the parent to load into,
- defaults to top-level svg element.
- @return {SVGWrapper} This wrapper. */
- load: function(url, settings) {
- settings = (typeof settings === 'boolean' ? {addTo: settings} :
- (typeof settings === 'function' ? {onLoad: settings} :
- (typeof settings === 'string' ? {parent: settings} :
- (typeof settings === 'object' && settings.nodeName ? {parent: settings} :
- (typeof settings === 'object' && settings.jquery ? {parent: settings} : settings || {})))));
- if (!settings.parent && !settings.addTo) {
- this.clear(false);
- }
- var size = [this._svg.getAttribute('width'), this._svg.getAttribute('height')];
- var wrapper = this;
- // Report a problem with the load
- var reportError = function(message) {
- message = $.svg.local.errorLoadingText + ': ' + message;
- if (settings.onLoad) {
- settings.onLoad.apply(wrapper._container || wrapper._svg, [wrapper, message]);
- }
- else {
- wrapper.text(null, 10, 20, message);
- }
- };
- // Create a DOM from SVG content
- var loadXML4IE = function(data) {
- var xml = new ActiveXObject('Microsoft.XMLDOM');
- xml.validateOnParse = false;
- xml.resolveExternals = false;
- xml.async = false;
- xml.loadXML(data);
- if (xml.parseError.errorCode !== 0) {
- reportError(xml.parseError.reason);
- return null;
- }
- return xml;
- };
- // Load the SVG DOM
- var loadSVG = function(data) {
- if (!data) {
- return;
- }
- if (data.documentElement.nodeName !== 'svg') {
- var errors = data.getElementsByTagName('parsererror');
- var messages = (errors.length ? errors[0].getElementsByTagName('div') : []); // Safari
- reportError(!errors.length ? '???' : (messages.length ? messages[0] : errors[0]).firstChild.nodeValue);
- return;
- }
- var parent = (settings.parent ? $(settings.parent)[0] : wrapper._svg);
- var attrs = {};
- for (var i = 0; i < data.documentElement.attributes.length; i++) {
- var attr = data.documentElement.attributes.item(i);
- if (!(attr.nodeName === 'version' || attr.nodeName.substring(0, 5) === 'xmlns')) {
- attrs[attr.nodeName] = attr.nodeValue;
- }
- }
- wrapper.configure(parent, attrs, !settings.parent);
- var nodes = data.documentElement.childNodes;
- for (var i = 0; i < nodes.length; i++) {
- try {
- parent.appendChild(wrapper._svg.ownerDocument.importNode(nodes[i], true));
- if (nodes[i].nodeName === 'script') {
- $.globalEval(nodes[i].textContent);
- }
- }
- catch (e) {
- wrapper.add(parent, nodes[i]);
- }
- }
- if (!settings.keepRelativeLinks && url.match('/')) {
- var base = url.replace(/\/[^\/]*$/, '/');
- $('*', parent).each(function() {
- var href = $(this).attr('xlink:href');
- if (href && !href.match(/(^[a-z][-a-z0-9+.]*:.*$)|(^\/.*$)|(^#.*$)/i)) {
- $(this).attr('xlink:href', base + href);
- }
- });
- }
- if (!settings.changeSize) {
- wrapper.configure(parent, {width: size[0], height: size[1]});
- }
- if (settings.onLoad) {
- settings.onLoad.apply(wrapper._container || wrapper._svg, [wrapper]);
- }
- };
- if (url.match('