Skip to content

Commit

Permalink
Bumped symfony/process and symfony/polyfill-mbstring dependency version
Browse files Browse the repository at this point in the history
  • Loading branch information
DevDavido committed Dec 28, 2020
1 parent 966739c commit 68adefa
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 111 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"ext-json": "*",
"ext-spl": "*",
"ducks-project/spl-types": "^1.1",
"symfony/polyfill-mbstring": "^1.18",
"symfony/polyfill-mbstring": "^1.20",
"symfony/process": "^4.4",
"jeroen-g/lighthouse": "^0.2"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.16"
"friendsofphp/php-cs-fixer": "^2.17"
},
"autoload": {
"classmap": ["./"]
Expand Down
24 changes: 12 additions & 12 deletions vendor/composer/InstalledVersions.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ class InstalledVersions
private static $installed = array (
'root' =>
array (
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'pretty_version' => 'dev-4.x-dev',
'version' => 'dev-4.x-dev',
'aliases' =>
array (
),
'reference' => 'fa02858d47f977e486689baf845e3df5367ed647',
'reference' => '966739c860cee8c164e596688c3e6055c8de29a9',
'name' => 'devdavido/performance-audit-plugin',
),
'versions' =>
array (
'devdavido/performance-audit-plugin' =>
array (
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'pretty_version' => 'dev-4.x-dev',
'version' => 'dev-4.x-dev',
'aliases' =>
array (
),
'reference' => 'fa02858d47f977e486689baf845e3df5367ed647',
'reference' => '966739c860cee8c164e596688c3e6055c8de29a9',
),
'ducks-project/spl-types' =>
array (
Expand All @@ -53,21 +53,21 @@ class InstalledVersions
),
'symfony/polyfill-mbstring' =>
array (
'pretty_version' => 'v1.18.1',
'version' => '1.18.1.0',
'pretty_version' => 'v1.20.0',
'version' => '1.20.0.0',
'aliases' =>
array (
),
'reference' => 'a6977d63bf9a0ad4c65cd352709e230876f9904a',
'reference' => '39d483bdf39be819deabf04ec872eb0b2410b531',
),
'symfony/process' =>
array (
'pretty_version' => 'v4.4.15',
'version' => '4.4.15.0',
'pretty_version' => 'v4.4.18',
'version' => '4.4.18.0',
'aliases' =>
array (
),
'reference' => '9b887acc522935f77555ae8813495958c7771ba7',
'reference' => '075316ff72233ce3d04a9743414292e834f2cb4a',
),
),
);
Expand Down
37 changes: 16 additions & 21 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,30 +112,30 @@
},
{
"name": "symfony/polyfill-mbstring",
"version": "v1.18.1",
"version_normalized": "1.18.1.0",
"version": "v1.20.0",
"version_normalized": "1.20.0.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
"reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
"reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
"reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": ">=7.1"
},
"suggest": {
"ext-mbstring": "For best performance"
},
"time": "2020-07-14T12:35:20+00:00",
"time": "2020-10-23T14:02:19+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.18-dev"
"dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
Expand Down Expand Up @@ -175,7 +175,7 @@
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.18.1"
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
},
"funding": [
{
Expand All @@ -195,29 +195,24 @@
},
{
"name": "symfony/process",
"version": "v4.4.15",
"version_normalized": "4.4.15.0",
"version": "v4.4.18",
"version_normalized": "4.4.18.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "9b887acc522935f77555ae8813495958c7771ba7"
"reference": "075316ff72233ce3d04a9743414292e834f2cb4a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/9b887acc522935f77555ae8813495958c7771ba7",
"reference": "9b887acc522935f77555ae8813495958c7771ba7",
"url": "https://api.github.com/repos/symfony/process/zipball/075316ff72233ce3d04a9743414292e834f2cb4a",
"reference": "075316ff72233ce3d04a9743414292e834f2cb4a",
"shasum": ""
},
"require": {
"php": ">=7.1.3"
},
"time": "2020-09-02T16:08:58+00:00",
"time": "2020-12-08T16:59:59+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.4-dev"
}
},
"installation-source": "dist",
"autoload": {
"psr-4": {
Expand All @@ -244,7 +239,7 @@
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/process/tree/4.4"
"source": "https://github.com/symfony/process/tree/v4.4.18"
},
"funding": [
{
Expand Down
24 changes: 12 additions & 12 deletions vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<?php return array (
'root' =>
array (
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'pretty_version' => 'dev-4.x-dev',
'version' => 'dev-4.x-dev',
'aliases' =>
array (
),
'reference' => 'fa02858d47f977e486689baf845e3df5367ed647',
'reference' => '966739c860cee8c164e596688c3e6055c8de29a9',
'name' => 'devdavido/performance-audit-plugin',
),
'versions' =>
array (
'devdavido/performance-audit-plugin' =>
array (
'pretty_version' => 'dev-main',
'version' => 'dev-main',
'pretty_version' => 'dev-4.x-dev',
'version' => 'dev-4.x-dev',
'aliases' =>
array (
),
'reference' => 'fa02858d47f977e486689baf845e3df5367ed647',
'reference' => '966739c860cee8c164e596688c3e6055c8de29a9',
),
'ducks-project/spl-types' =>
array (
Expand All @@ -40,21 +40,21 @@
),
'symfony/polyfill-mbstring' =>
array (
'pretty_version' => 'v1.18.1',
'version' => '1.18.1.0',
'pretty_version' => 'v1.20.0',
'version' => '1.20.0.0',
'aliases' =>
array (
),
'reference' => 'a6977d63bf9a0ad4c65cd352709e230876f9904a',
'reference' => '39d483bdf39be819deabf04ec872eb0b2410b531',
),
'symfony/process' =>
array (
'pretty_version' => 'v4.4.15',
'version' => '4.4.15.0',
'pretty_version' => 'v4.4.18',
'version' => '4.4.18.0',
'aliases' =>
array (
),
'reference' => '9b887acc522935f77555ae8813495958c7771ba7',
'reference' => '075316ff72233ce3d04a9743414292e834f2cb4a',
),
),
);
11 changes: 5 additions & 6 deletions vendor/symfony/polyfill-mbstring/Mbstring.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,8 @@ public static function mb_convert_encoding($s, $toEncoding, $fromEncoding = null
return iconv($fromEncoding, $toEncoding.'//IGNORE', $s);
}

public static function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null)
public static function mb_convert_variables($toEncoding, $fromEncoding, &...$vars)
{
$vars = array(&$a, &$b, &$c, &$d, &$e, &$f);

$ok = true;
array_walk_recursive($vars, function (&$v) use (&$ok, $toEncoding, $fromEncoding) {
if (false === $v = Mbstring::mb_convert_encoding($v, $toEncoding, $fromEncoding)) {
Expand Down Expand Up @@ -629,10 +627,11 @@ public static function mb_strrchr($haystack, $needle, $part = false, $encoding =
{
$encoding = self::getEncoding($encoding);
if ('CP850' === $encoding || 'ASCII' === $encoding) {
return strrchr($haystack, $needle, $part);
$pos = strrpos($haystack, $needle);
} else {
$needle = self::mb_substr($needle, 0, 1, $encoding);
$pos = iconv_strrpos($haystack, $needle, $encoding);
}
$needle = self::mb_substr($needle, 0, 1, $encoding);
$pos = iconv_strrpos($haystack, $needle, $encoding);

return self::getSubpart($pos, $part, $haystack, $encoding);
}
Expand Down
Loading

0 comments on commit 68adefa

Please sign in to comment.