comparison vendor/symfony/translation/Loader/YamlFileLoader.php @ 14:1fec387a4317

Update Drupal core to 8.5.2 via Composer
author Chris Cannam
date Mon, 23 Apr 2018 09:46:53 +0100
parents 4c8ae668cc8c
children 129ea1e6d783
comparison
equal deleted inserted replaced
13:5fb285c0d0e3 14:1fec387a4317
36 } 36 }
37 37
38 $this->yamlParser = new YamlParser(); 38 $this->yamlParser = new YamlParser();
39 } 39 }
40 40
41 $prevErrorHandler = set_error_handler(function ($level, $message, $script, $line) use ($resource, &$prevErrorHandler) {
42 $message = E_USER_DEPRECATED === $level ? preg_replace('/ on line \d+/', ' in "'.$resource.'"$0', $message) : $message;
43
44 return $prevErrorHandler ? $prevErrorHandler($level, $message, $script, $line) : false;
45 });
46
41 try { 47 try {
42 $messages = $this->yamlParser->parse(file_get_contents($resource)); 48 $messages = $this->yamlParser->parseFile($resource);
43 } catch (ParseException $e) { 49 } catch (ParseException $e) {
44 throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e); 50 throw new InvalidResourceException(sprintf('Error parsing YAML, invalid file "%s"', $resource), 0, $e);
51 } finally {
52 restore_error_handler();
45 } 53 }
46 54
47 return $messages; 55 return $messages;
48 } 56 }
49 } 57 }