Merge pull request Haehnchen#1610 from adamwojs/issue_1575

Fixed Haehnchen#1575: Inspection "Container sensitivity" is not expected to be emitted for default env values

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/inspection/CaseSensitivityServiceInspection.java

@@ -78,7 +78,7 @@ public void visitElement(PsiElement psiElement) {
  // services and parameter
  YamlHelper.processKeysAfterRoot(psiFile, yamlKeyValue -> {
  String keyText = yamlKeyValue.getKeyText();
- if(StringUtils.isNotBlank(keyText) && !keyText.equals(keyText.toLowerCase()) && !YamlHelper.isClassServiceId(keyText)) {
+ if(StringUtils.isNotBlank(keyText) && !keyText.equals(keyText.toLowerCase()) && !YamlHelper.isClassServiceId(keyText) && !YamlHelper.isDefaultEnvValue(keyText)) {
  PsiElement firstChild = yamlKeyValue.getFirstChild();
  if(firstChild != null) {
  holder.registerProblem(firstChild, SYMFONY_LOWERCASE_LETTERS_FOR_SERVICE, ProblemHighlightType.WEAK_WARNING);

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/yaml/YamlHelper.java

@@ -1032,6 +1032,13 @@ public static boolean isClassServiceId(@NotNull String serviceId) {
  return PhpNameUtil.isValidNamespaceFullName(serviceId, true);
  }
 
+ /**
+ * Returns true if given parameter name is default value for ENV variable.
+ */
+ public static boolean isDefaultEnvValue(@NotNull String parameterName) {
+ return parameterName.length() > 5 && parameterName.startsWith("env(") && parameterName.endsWith(")");
+ }
+
  /**
  * service_name:
  * class: FOOBAR

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/inspection/CaseSensitivityServiceInspectionTest.java

@@ -79,6 +79,11 @@ public void testCaseSensitivityForYamlFiles() {
  " class: DateTime",
  "Symfony: lowercase letters for service and parameter"
  );
+
+ assertLocalInspectionNotContains("service.yml", "parameters:\n" +
+ " env(SECRET<caret>): 'some_secret'\n",
+ "Symfony: lowercase letters for service and parameter"
+ );
  }
 
  public void testCaseSensitivityForYamlExpressionsNotInspected() {