X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCore%2FCodeGen%2FBaseTask.php;h=c58a32ac15aa06b6fd140bcfd522402b37549c6a;hb=7914f0a4fd8b7950936db550ed109bc470f7c9ae;hp=83fcf1a410d0fec65851bcf1fe97add512ebe6c3;hpb=066753946e20230eda06f7010d023ceff12a32ff;p=civicrm-core.git diff --git a/CRM/Core/CodeGen/BaseTask.php b/CRM/Core/CodeGen/BaseTask.php index 83fcf1a410..c58a32ac15 100644 --- a/CRM/Core/CodeGen/BaseTask.php +++ b/CRM/Core/CodeGen/BaseTask.php @@ -73,13 +73,11 @@ abstract class CRM_Core_CodeGen_BaseTask implements CRM_Core_CodeGen_ITask { * @return bool */ protected function isApproxPhpMatch($actual, $expected) { - $actual = preg_replace(';\(GenCodeChecksum:([a-zA-Z0-9]+)\);', '', $actual); - $actual = preg_replace(';[ \r\n\t];', '', $actual); - - $expected = preg_replace(';\(GenCodeChecksum:([a-zA-Z0-9]+)\);', '', - $expected); - $expected = preg_replace(';[ \r\n\t];', '', $expected); - + foreach (['actual', 'expected'] as $var) { + $$var = CRM_Core_CodeGen_Util_ArraySyntaxConverter::convert($$var); + $$var = preg_replace(';\(GenCodeChecksum:([a-zA-Z0-9]+)\);', '', $$var); + $$var = strtolower(preg_replace(';[ \r\n\t];', '', $$var)); + } return $actual === $expected; }