Merge pull request #1635 from vbartusevicius/v2.4.x

l3pp4rd · web-flow · commit c453c7d695da · 2016-07-19T09:08:11.000+03:00
fix for #1634
diff --git a/lib/Gedmo/Translatable/Mapping/Driver/Yaml.php b/lib/Gedmo/Translatable/Mapping/Driver/Yaml.php
@@ -73,9 +73,9 @@ protected function _loadMappingFile($file)
         return \Symfony\Component\Yaml\Yaml::parse(file_get_contents($file));
     }
 
-    private function buildFieldConfiguration($field, array $fieldMapping, array &$config)
+    private function buildFieldConfiguration($field, $fieldMapping, array &$config)
     {
-        if (isset($fieldMapping['gedmo'])) {
+        if (is_array($fieldMapping) && isset($fieldMapping['gedmo'])) {
             if (in_array('translatable', $fieldMapping['gedmo']) || isset($fieldMapping['gedmo']['translatable'])) {
                 // fields cannot be overrided and throws mapping exception
                 $config['fields'][] = $field;

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,9 @@ protected function _loadMappingFile($file)`
`73`	`73`	`return \Symfony\Component\Yaml\Yaml::parse(file_get_contents($file));`
`74`	`74`	`}`
`75`	`75`
`76`		`- private function buildFieldConfiguration($field, array $fieldMapping, array &$config)`
	`76`	`+ private function buildFieldConfiguration($field, $fieldMapping, array &$config)`
`77`	`77`	`{`
`78`		`- if (isset($fieldMapping['gedmo'])) {`
	`78`	`+ if (is_array($fieldMapping) && isset($fieldMapping['gedmo'])) {`
`79`	`79`	`if (in_array('translatable', $fieldMapping['gedmo']) \|\| isset($fieldMapping['gedmo']['translatable'])) {`
`80`	`80`	`// fields cannot be overrided and throws mapping exception`
`81`	`81`	`$config['fields'][] = $field;`