Update Jevix

This commit is contained in:
Visman 2021-03-04 13:11:20 +07:00
parent e2e71ac03d
commit 57c2a4507b
6 changed files with 27 additions and 22 deletions

12
composer.lock generated
View file

@ -62,16 +62,16 @@
},
{
"name": "miovisman/jevix",
"version": "2.2.0",
"version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/MioVisman/Jevix.git",
"reference": "f92970c3fa19dbecd73652aca378aaf0703443bf"
"reference": "bd9807b8e3ea26567e775ee1d372b417440b1198"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/MioVisman/Jevix/zipball/f92970c3fa19dbecd73652aca378aaf0703443bf",
"reference": "f92970c3fa19dbecd73652aca378aaf0703443bf",
"url": "https://api.github.com/repos/MioVisman/Jevix/zipball/bd9807b8e3ea26567e775ee1d372b417440b1198",
"reference": "bd9807b8e3ea26567e775ee1d372b417440b1198",
"shasum": ""
},
"require": {
@ -114,9 +114,9 @@
],
"description": "Library for html filtering",
"support": {
"source": "https://github.com/MioVisman/Jevix/tree/2.2.0"
"source": "https://github.com/MioVisman/Jevix/tree/2.2.1"
},
"time": "2021-03-03T11:11:48+00:00"
"time": "2021-03-04T06:07:15+00:00"
},
{
"name": "miovisman/normemail",

View file

@ -55,12 +55,12 @@ private static $installed = array (
),
'miovisman/jevix' =>
array (
'pretty_version' => '2.2.0',
'version' => '2.2.0.0',
'pretty_version' => '2.2.1',
'version' => '2.2.1.0',
'aliases' =>
array (
),
'reference' => 'f92970c3fa19dbecd73652aca378aaf0703443bf',
'reference' => 'bd9807b8e3ea26567e775ee1d372b417440b1198',
),
'miovisman/normemail' =>
array (

View file

@ -58,24 +58,24 @@
},
{
"name": "miovisman/jevix",
"version": "2.2.0",
"version_normalized": "2.2.0.0",
"version": "2.2.1",
"version_normalized": "2.2.1.0",
"source": {
"type": "git",
"url": "https://github.com/MioVisman/Jevix.git",
"reference": "f92970c3fa19dbecd73652aca378aaf0703443bf"
"reference": "bd9807b8e3ea26567e775ee1d372b417440b1198"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/MioVisman/Jevix/zipball/f92970c3fa19dbecd73652aca378aaf0703443bf",
"reference": "f92970c3fa19dbecd73652aca378aaf0703443bf",
"url": "https://api.github.com/repos/MioVisman/Jevix/zipball/bd9807b8e3ea26567e775ee1d372b417440b1198",
"reference": "bd9807b8e3ea26567e775ee1d372b417440b1198",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=7.3.0"
},
"time": "2021-03-03T11:11:48+00:00",
"time": "2021-03-04T06:07:15+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -113,7 +113,7 @@
],
"description": "Library for html filtering",
"support": {
"source": "https://github.com/MioVisman/Jevix/tree/2.2.0"
"source": "https://github.com/MioVisman/Jevix/tree/2.2.1"
},
"install-path": "../miovisman/jevix"
},

View file

@ -32,12 +32,12 @@
),
'miovisman/jevix' =>
array (
'pretty_version' => '2.2.0',
'version' => '2.2.0.0',
'pretty_version' => '2.2.1',
'version' => '2.2.1.0',
'aliases' =>
array (
),
'reference' => 'f92970c3fa19dbecd73652aca378aaf0703443bf',
'reference' => 'bd9807b8e3ea26567e775ee1d372b417440b1198',
),
'miovisman/normemail' =>
array (

View file

@ -1,3 +1,6 @@
2.2.1
+ Fix text of error messages
2.2.0
-------
+ Simplify conditions

View file

@ -12,7 +12,7 @@
* @author https://github.com/altocms/Jevix
* @author Agel_Nash <agel-nash@mail.ru>
* @author Visman <mio.visman@yandex.ru>
* @version 2.2.0
* @version 2.2.1
* @link https://github.com/MioVisman/Jevix
* @license https://opensource.org/licenses/MIT The MIT License (MIT)
*/
@ -1633,6 +1633,8 @@ class Jevix
$paramAllowedValues = $tagRules[self::TR_PARAM_ALLOWED][$param] ?? false;
if (empty($paramAllowedValues)) {
$this->errors[] = ['%2$s attribute is not allowed in %1$s tag', $tag, $param];
continue;
}
@ -1648,7 +1650,7 @@ class Jevix
);
if (\preg_match('%javascript:%i', $valueDecode)) {
$this->errors[] = ['Attempting to insert JavaScript into %1$s attribute of %2$s tag', $param, $tag];
$this->errors[] = ['Attempting to insert JavaScript into %2$s attribute of %1$s tag', $tag, $param];
continue;
}
@ -2041,7 +2043,7 @@ class Jevix
return false;
} else {
$this->errors[] = ['Не ожидалось закрывающегося тега %1$s', $name];
$this->errors[] = ['Not expected to close %1$s tag', $name];
}
} else {