From 08f3326b1f172ad0ae13ee4ac02656ff0220eaf9 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 4 Sep 2014 21:01:01 +0200 Subject: [PATCH] fix PHP tests --- .../openapi/components/impl/stores/StateStorageManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java index 1f136345560d..707153af9c9c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StateStorageManagerImpl.java @@ -343,7 +343,7 @@ public abstract class StateStorageManagerImpl implements StateStorageManager, Di final Matcher matcher = MACRO_PATTERN.matcher(expanded); while (matcher.find()) { String m = matcher.group(1); - if (!myMacros.containsKey(m)) { + if (m != null && !myMacros.containsKey(m) && (!ApplicationManager.getApplication().isUnitTestMode() || !m.contains("\\com.jetbrains.php."))) { throw new IllegalArgumentException("Unknown macro: " + m + " in storage file spec: " + file); } }