Skip to content

Commit 1a08240

Browse files
l3pp4rdl3pp4rd
authored
Merge pull request #1633 from krafas/sluggable-attribute-override
Allow gedmo:slug to be overrided by attributeOverride
2 parents dc1c7a9 + 0102b1d commit 1a08240

File tree

1 file changed

+79
-68
lines changed
  • lib/Gedmo/Sluggable/Mapping/Driver

1 file changed

+79
-68
lines changed

‎lib/Gedmo/Sluggable/Mapping/Driver/Yaml.php

Lines changed: 79 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -46,75 +46,13 @@ public function readExtendedMetadata($meta, array &$config)
4646

4747
if (isset($mapping['fields'])) {
4848
foreach ($mapping['fields'] as $field => $fieldMapping) {
49-
if (isset($fieldMapping['gedmo'])) {
50-
if (isset($fieldMapping['gedmo']['slug'])) {
51-
$slug = $fieldMapping['gedmo']['slug'];
52-
if (!$this->isValidField($meta, $field)) {
53-
throw new InvalidMappingException("Cannot use field - [{$field}] for slug storage, type is not valid and must be 'string' or 'text' in class - {$meta->name}");
54-
}
55-
// process slug handlers
56-
$handlers = array();
57-
if (isset($slug['handlers'])) {
58-
foreach ($slug['handlers'] as $handlerClass => $options) {
59-
if (!strlen($handlerClass)) {
60-
throw new InvalidMappingException("SlugHandler class: {$handlerClass} should be a valid class name in entity - {$meta->name}");
61-
}
62-
$handlers[$handlerClass] = $options;
63-
$handlerClass::validate($handlers[$handlerClass], $meta);
64-
}
65-
}
66-
// process slug fields
67-
if (empty($slug['fields']) || !is_array($slug['fields'])) {
68-
throw new InvalidMappingException("Slug must contain at least one field for slug generation in class - {$meta->name}");
69-
}
70-
foreach ($slug['fields'] as $slugField) {
71-
if (!$meta->hasField($slugField)) {
72-
throw new InvalidMappingException("Unable to find slug [{$slugField}] as mapped property in entity - {$meta->name}");
73-
}
74-
if (!$this->isValidField($meta, $slugField)) {
75-
throw new InvalidMappingException("Cannot use field - [{$slugField}] for slug storage, type is not valid and must be 'string' or 'text' in class - {$meta->name}");
76-
}
77-
}
78-
79-
$config['slugs'][$field]['fields'] = $slug['fields'];
80-
$config['slugs'][$field]['handlers'] = $handlers;
81-
$config['slugs'][$field]['slug'] = $field;
82-
$config['slugs'][$field]['style'] = isset($slug['style']) ?
83-
(string) $slug['style'] : 'default';
84-
85-
$config['slugs'][$field]['dateFormat'] = isset($slug['dateFormat']) ?
86-
(string) $slug['dateFormat'] : 'Y-m-d-H:i';
87-
88-
$config['slugs'][$field]['updatable'] = isset($slug['updatable']) ?
89-
(bool) $slug['updatable'] : true;
90-
91-
$config['slugs'][$field]['unique'] = isset($slug['unique']) ?
92-
(bool) $slug['unique'] : true;
93-
94-
$config['slugs'][$field]['unique_base'] = isset($slug['unique_base']) ?
95-
$slug['unique_base'] : null;
96-
97-
$config['slugs'][$field]['separator'] = isset($slug['separator']) ?
98-
(string) $slug['separator'] : '-';
99-
100-
$config['slugs'][$field]['prefix'] = isset($slug['prefix']) ?
101-
(string) $slug['prefix'] : '';
102-
103-
$config['slugs'][$field]['suffix'] = isset($slug['suffix']) ?
104-
(string) $slug['suffix'] : '';
49+
$this->buildFieldConfiguration($field, $fieldMapping, $meta, $config);
50+
}
51+
}
10552

106-
if (!$meta->isMappedSuperclass && $meta->isIdentifier($field) && !$config['slugs'][$field]['unique']) {
107-
throw new InvalidMappingException("Identifier field - [{$field}] slug must be unique in order to maintain primary key in class - {$meta->name}");
108-
}
109-
$ubase = $config['slugs'][$field]['unique_base'];
110-
if ($config['slugs'][$field]['unique'] === false && $ubase) {
111-
throw new InvalidMappingException("Slug annotation [unique_base] can not be set if unique is unset or 'false'");
112-
}
113-
if ($ubase && !$meta->hasField($ubase) && !$meta->hasAssociation($ubase)) {
114-
throw new InvalidMappingException("Unable to find [{$ubase}] as mapped property in entity - {$meta->name}");
115-
}
116-
}
117-
}
53+
if (isset($mapping['attributeOverride'])) {
54+
foreach ($mapping['attributeOverride'] as $field => $overrideMapping) {
55+
$this->buildFieldConfiguration($field, $overrideMapping, $meta, $config);
11856
}
11957
}
12058
}
@@ -141,4 +79,77 @@ protected function isValidField($meta, $field)
14179

14280
return $mapping && in_array($mapping['type'], $this->validTypes);
14381
}
82+
83+
private function buildFieldConfiguration($field, array $fieldMapping, $meta, array &$config)
84+
{
85+
if (isset($fieldMapping['gedmo'])) {
86+
if (isset($fieldMapping['gedmo']['slug'])) {
87+
$slug = $fieldMapping['gedmo']['slug'];
88+
if (!$this->isValidField($meta, $field)) {
89+
throw new InvalidMappingException("Cannot use field - [{$field}] for slug storage, type is not valid and must be 'string' or 'text' in class - {$meta->name}");
90+
}
91+
// process slug handlers
92+
$handlers = array();
93+
if (isset($slug['handlers'])) {
94+
foreach ($slug['handlers'] as $handlerClass => $options) {
95+
if (!strlen($handlerClass)) {
96+
throw new InvalidMappingException("SlugHandler class: {$handlerClass} should be a valid class name in entity - {$meta->name}");
97+
}
98+
$handlers[$handlerClass] = $options;
99+
$handlerClass::validate($handlers[$handlerClass], $meta);
100+
}
101+
}
102+
// process slug fields
103+
if (empty($slug['fields']) || !is_array($slug['fields'])) {
104+
throw new InvalidMappingException("Slug must contain at least one field for slug generation in class - {$meta->name}");
105+
}
106+
foreach ($slug['fields'] as $slugField) {
107+
if (!$meta->hasField($slugField)) {
108+
throw new InvalidMappingException("Unable to find slug [{$slugField}] as mapped property in entity - {$meta->name}");
109+
}
110+
if (!$this->isValidField($meta, $slugField)) {
111+
throw new InvalidMappingException("Cannot use field - [{$slugField}] for slug storage, type is not valid and must be 'string' or 'text' in class - {$meta->name}");
112+
}
113+
}
114+
115+
$config['slugs'][$field]['fields'] = $slug['fields'];
116+
$config['slugs'][$field]['handlers'] = $handlers;
117+
$config['slugs'][$field]['slug'] = $field;
118+
$config['slugs'][$field]['style'] = isset($slug['style']) ?
119+
(string) $slug['style'] : 'default';
120+
121+
$config['slugs'][$field]['dateFormat'] = isset($slug['dateFormat']) ?
122+
(string) $slug['dateFormat'] : 'Y-m-d-H:i';
123+
124+
$config['slugs'][$field]['updatable'] = isset($slug['updatable']) ?
125+
(bool) $slug['updatable'] : true;
126+
127+
$config['slugs'][$field]['unique'] = isset($slug['unique']) ?
128+
(bool) $slug['unique'] : true;
129+
130+
$config['slugs'][$field]['unique_base'] = isset($slug['unique_base']) ?
131+
$slug['unique_base'] : null;
132+
133+
$config['slugs'][$field]['separator'] = isset($slug['separator']) ?
134+
(string) $slug['separator'] : '-';
135+
136+
$config['slugs'][$field]['prefix'] = isset($slug['prefix']) ?
137+
(string) $slug['prefix'] : '';
138+
139+
$config['slugs'][$field]['suffix'] = isset($slug['suffix']) ?
140+
(string) $slug['suffix'] : '';
141+
142+
if (!$meta->isMappedSuperclass && $meta->isIdentifier($field) && !$config['slugs'][$field]['unique']) {
143+
throw new InvalidMappingException("Identifier field - [{$field}] slug must be unique in order to maintain primary key in class - {$meta->name}");
144+
}
145+
$ubase = $config['slugs'][$field]['unique_base'];
146+
if ($config['slugs'][$field]['unique'] === false && $ubase) {
147+
throw new InvalidMappingException("Slug annotation [unique_base] can not be set if unique is unset or 'false'");
148+
}
149+
if ($ubase && !$meta->hasField($ubase) && !$meta->hasAssociation($ubase)) {
150+
throw new InvalidMappingException("Unable to find [{$ubase}] as mapped property in entity - {$meta->name}");
151+
}
152+
}
153+
}
154+
}
144155
}

0 commit comments

Comments
 (0)