Move constant defined check when setting the option value in YamlLinter

phpro · Nov 21, 2017 · a375508 · a375508
1 parent a187136
commit a375508
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/src/Linter/Yaml/YamlLinter.php b/src/Linter/Yaml/YamlLinter.php
@@ -108,12 +108,8 @@ private function parseYaml($content)
         $flags = 0;
         $flags |= $this->objectSupport ? Yaml::PARSE_OBJECT : 0;
         $flags |= $this->exceptionOnInvalidType ? Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE : 0;
-
-        // Yaml::PARSE_CONSTANT is only available in Symfony Yaml >= 3.2
-        $flags |= $this->parseConstants && defined('Symfony\Component\Yaml\Yaml::PARSE_CONSTANT') ? Yaml::PARSE_CONSTANT : 0;
-
-        // Yaml::PARSE_CUSTOM_TAGS is only available in Symfony Yaml >= 3.3
-        $flags |= $this->parseCustomTags && defined('Symfony\Component\Yaml\Yaml::PARSE_CUSTOM_TAGS') ? Yaml::PARSE_CUSTOM_TAGS : 0;
+        $flags |= $this->parseConstants ? Yaml::PARSE_CONSTANT : 0;
+        $flags |= $this->parseCustomTags ? Yaml::PARSE_CUSTOM_TAGS : 0;
         Yaml::parse($content, $flags);
     }
 
@@ -146,14 +142,16 @@ public function setExceptionOnInvalidType($exceptionOnInvalidType)
      */
     public function setParseCustomTags($parseCustomTags)
     {
-        $this->parseCustomTags = $parseCustomTags;
+        // Yaml::PARSE_CONSTANT is only available in Symfony Yaml >= 3.2
+        $this->parseCustomTags = $parseCustomTags && defined('Symfony\Component\Yaml\Yaml::PARSE_CONSTANT');
     }
 
     /**
      * @param bool $parseConstants
      */
     public function setParseConstants($parseConstants)
     {
-        $this->parseConstants = $parseConstants;
+        // Yaml::PARSE_CUSTOM_TAGS is only available in Symfony Yaml >= 3.3
+        $this->parseConstants = $parseConstants && defined('Symfony\Component\Yaml\Yaml::PARSE_CUSTOM_TAGS');
     }
 }