create-prisma-php-app 2.4.0 → 2.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -131,7 +131,12 @@ class TwMerge
|
|
|
131
131
|
if (strpos($classKey, ':') === false) {
|
|
132
132
|
$baseGroup = $classKey;
|
|
133
133
|
foreach ($classArray as $existingKey => $existingClass) {
|
|
134
|
-
|
|
134
|
+
|
|
135
|
+
if (
|
|
136
|
+
is_string($existingKey) // make sure we have a string
|
|
137
|
+
&& $existingKey !== $baseGroup
|
|
138
|
+
&& substr($existingKey, -strlen($baseGroup)) === $baseGroup
|
|
139
|
+
) {
|
|
135
140
|
unset($classArray[$existingKey]);
|
|
136
141
|
}
|
|
137
142
|
}
|