composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-09 10:28:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	css/setup.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	package-lock.json
This commit is contained in:
Stephen Abello
2026-04-29 16:58:50 +02:00
parent ea35ad48d2 de4ec9d9ce
commit 8de5c2525b
179 changed files with 7748 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/composer/installed.json
View File

@@ -1672,12 +1672,12 @@
"source": {
"type": "git",
"url": "https://github.com/combodo-itop-libs/scssphp.git",
"reference": "dde81c0a39d02e8e6fc81b70269747734e16d526"
"reference": "6820f035182a956c355cbfa7882d90f1198a208b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/dde81c0a39d02e8e6fc81b70269747734e16d526",
"reference": "dde81c0a39d02e8e6fc81b70269747734e16d526",
"url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/6820f035182a956c355cbfa7882d90f1198a208b",
"reference": "6820f035182a956c355cbfa7882d90f1198a208b",
"shasum": ""
},
"require": {
@@ -1700,7 +1700,7 @@
"ext-iconv": "Can be used as fallback when ext-mbstring is not available",
"ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
},
"time": "2026-03-23T15:26:59+00:00",
"time": "2026-04-23T14:20:24+00:00",
"bin": [
"bin/pscss"
],

2
lib/composer/installed.php
View File

@@ -296,7 +296,7 @@
'scssphp/scssphp' => array(
'pretty_version' => 'dev-combodo/1.x',
'version' => 'dev-combodo/1.x',
'reference' => 'dde81c0a39d02e8e6fc81b70269747734e16d526',
'reference' => '6820f035182a956c355cbfa7882d90f1198a208b',
'type' => 'library',
'install_path' => __DIR__ . '/../scssphp/scssphp',
'aliases' => array(),

18
lib/scssphp/scssphp/src/Compiler.php
View File

@@ -939,7 +939,7 @@ class Compiler
// if the new part is just including a previous part don't try to extend anymore
if (\count($part) > 1) {
foreach ($partsPile as $previousPart) {
if (! \count(array_diff($previousPart, $part))) {
if (! \count($this->diff_recursive($previousPart, $part))) {
continue 2;
}
}
@@ -10511,4 +10511,20 @@ TXT;
return [Type::T_LIST, ',', $listParts];
}
protected function diff_recursive($array1, $array2) {
$difference=array();
foreach($array1 as $key => $value) {
if(is_array($value) && isset($array2[$key])){ // it's an array and both have the key
$new_diff = $this->diff_recursive($value, $array2[$key]);
if( !empty($new_diff) )
$difference[$key] = $new_diff;
} else if(is_string($value) && !in_array($value, $array2)) { // the value is a string and it's not in array B
$difference[$key] = $value . " is missing from the second array";
} else if(!is_numeric($key) && !array_key_exists($key, $array2)) { // the key is not numberic and is missing from array B
$difference[$key] = "Missing from the second array";
}
}
return $difference;
}
}