Просмотр исходного кода

Merge pull request #496 from userfriendly/patch-1

YAML mapping: Check if field mapped as sluggable is identifier only in entities, not mapped superclasses.
Gediminas Morkevicius 12 лет назад
Родитель
Сommit
3b16d0c17a
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      lib/Gedmo/Sluggable/Mapping/Driver/Yaml.php

+ 1 - 1
lib/Gedmo/Sluggable/Mapping/Driver/Yaml.php

@@ -80,7 +80,7 @@ class Yaml extends File implements Driver
                         $config['slugs'][$field]['separator'] = isset($slug['separator']) ?
                         $config['slugs'][$field]['separator'] = isset($slug['separator']) ?
                             (string)$slug['separator'] : '-';
                             (string)$slug['separator'] : '-';
 
 
-                        if ($meta->isIdentifier($field) && !$config['slugs'][$field]['unique']) {
+                        if (!$meta->isMappedSuperclass && $meta->isIdentifier($field) && !$config['slugs'][$field]['unique']) {
                             throw new InvalidMappingException("Identifier field - [{$field}] slug must be unique in order to maintain primary key in class - {$meta->name}");
                             throw new InvalidMappingException("Identifier field - [{$field}] slug must be unique in order to maintain primary key in class - {$meta->name}");
                         }
                         }
                     }
                     }