Skip to content

Commit 057b36c

Browse files
committed
fix tests failure
1 parent f6a16e2 commit 057b36c

File tree

1 file changed

+8
-25
lines changed

1 file changed

+8
-25
lines changed

src/Analyzer/EtSchemaAnalyzer.php

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -329,53 +329,36 @@ public function reportChanges(array $changes): void
329329
*/
330330
public function analyze($registryBefore, $registryAfter)
331331
{
332+
333+
$before = isset($registryBefore->data[self::CONTEXT]) ? $registryBefore->data[self::CONTEXT] : [];
334+
$after = isset($registryAfter->data[self::CONTEXT]) ? $registryAfter->data[self::CONTEXT] : [];
332335
$changes = [];
333-
$commonModules = array_intersect(
334-
array_keys($registryBefore->data[self::CONTEXT]),
335-
array_keys($registryAfter->data[self::CONTEXT])
336-
);
336+
$commonModules = array_intersect(array_keys($before), array_keys($after));
337337
foreach ($commonModules as $moduleName) {
338338
$changes = array_merge(
339339
$changes,
340340
$this->analyzeModuleConfig(
341341
$moduleName,
342-
$registryBefore->data[self::CONTEXT][$moduleName],
343-
$registryAfter->data[self::CONTEXT][$moduleName]
342+
$before[$moduleName],
343+
$after[$moduleName]
344344
)
345345
);
346346
}
347347

348348
$changes = array_merge(
349349
$changes,
350350
$this->removedModuleConfig(
351-
array_intersect_key(
352-
$registryBefore->data[self::CONTEXT],
353-
array_flip(
354-
array_diff(
355-
array_keys($registryBefore->data[self::CONTEXT]),
356-
array_keys($registryAfter->data[self::CONTEXT])
357-
)
358-
)
359-
)
351+
array_intersect_key($before, array_flip(array_diff(array_keys($before), array_keys($after))))
360352
)
361353
);
362354

363355
$changes = array_merge(
364356
$changes,
365357
$this->addedModuleConfig(
366-
array_intersect_key(
367-
$registryAfter->data[self::CONTEXT],
368-
array_flip(
369-
array_diff(
370-
array_keys($registryAfter->data[self::CONTEXT]),
371-
array_keys($registryBefore->data[self::CONTEXT])
372-
)
373-
)
374-
)
358+
array_intersect_key($after, array_flip(array_diff(array_keys($after), array_keys($before))))
375359
)
376360
);
377361

378-
379362
$this->reportChanges($changes);
380363
return $this->report;
381364
}

0 commit comments

Comments
 (0)