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

fix for #1634
doctrine-extensions · Jul 19, 2016 · c453c7d · c453c7d
2 parents 1a08240 + c55d415
commit c453c7d
Showing 1 changed file with 2 additions and 2 deletions.
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;