Fix some errors

lib/Gedmo/Mapping/Annotation/Sluggable.php

@@ -18,13 +18,6 @@ use Doctrine\Common\Annotations\Annotation;
 final class Sluggable extends Annotation
 {
     public $position = 0;
-<<<<<<< HEAD
     public $slugField = 'slug';
-=======
-<<<<<<< HEAD
-=======
-    public $slugField = 'slug';
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
 }
 

lib/Gedmo/Sluggable/Mapping/Driver/Annotation.php

@@ -108,30 +108,12 @@ class Annotation implements AnnotationDriverInterface
                 if (!$this->isValidField($meta, $field)) {
                     throw new InvalidMappingException("Cannot use field - [{$field}] for slug storage, type is not valid and must be 'string' in class - {$meta->name}");
                 }
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-                if (isset($config['slug'])) {
-                    throw new InvalidMappingException("There cannot be two slug fields: [{$slugField}] and [{$config['slug']}], in class - {$meta->name}.");
-                }
-
-                $config['slug'] = $field;
-                $config['style'] = $slug->style;
-                $config['updatable'] = $slug->updatable;
-                $config['unique'] = $slug->unique;
-                $config['separator'] = $slug->separator;
-=======
->>>>>>> multiple_slugs
                 
                 $config['slugFields'][$field]['slug'] = $field;
                 $config['slugFields'][$field]['style'] = $slug->style;
                 $config['slugFields'][$field]['updatable'] = $slug->updatable;
                 $config['slugFields'][$field]['unique'] = $slug->unique;
                 $config['slugFields'][$field]['separator'] = $slug->separator;
-<<<<<<< HEAD
-=======
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
             }
         }
     }

lib/Gedmo/Sluggable/Mapping/Driver/Xml.php

@@ -65,15 +65,7 @@ class Xml extends BaseXml
                     if (!$this->isValidField($meta, $field)) {
                         throw new InvalidMappingException("Cannot slug field - [{$field}] type is not valid and must be 'string' in class - {$meta->name}");
                     }
-<<<<<<< HEAD
                     $options = array('position'=>false, 'field'=>$field, 'slugField'=>'slug');
-=======
-<<<<<<< HEAD
-                    $options = array('position' => false, 'field' => $field);
-=======
-                    $options = array('position'=>false, 'field'=>$field, 'slugField'=>'slug');
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
                     if ($this->_isAttributeSet($mapping->sluggable, 'position')) {
                         $options['position'] =  (int)$this->_getAttribute($mapping->sluggable, 'position');
                     }
@@ -94,18 +86,8 @@ class Xml extends BaseXml
                     if (isset($config['slug'])) {
                         throw new InvalidMappingException("There cannot be two slug fields: [{$slug}] and [{$config['slug']}], in class - {$meta->name}.");
                     }
-<<<<<<< HEAD
-                    $config['slugFields'][$field]['slug'] = $field;
-                    $config['slugFields'][$field]['style'] = $this->_isAttributeSet($slug, 'style') ?
-=======
-<<<<<<< HEAD
-                    $config['slug'] = $field;
-                    $config['style'] = $this->_isAttributeSet($slug, 'style') ?
-=======
                     $config['slugFields'][$field]['slug'] = $field;
                     $config['slugFields'][$field]['style'] = $this->_isAttributeSet($slug, 'style') ?
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
                         $this->_getAttribute($slug, 'style') : 'default';
 
                     $config['slugFields'][$field]['updatable'] = $this->_isAttributeSet($slug, 'updatable') ?

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

@@ -63,17 +63,8 @@ class Yaml extends File implements Driver
                             throw new InvalidMappingException("Cannot slug field - [{$field}] type is not valid and must be 'string' in class - {$meta->name}");
                         }
                         $sluggable = $fieldMapping['gedmo'][array_search('sluggable', $fieldMapping['gedmo'])];
-<<<<<<< HEAD
                         $slugField = isset($sluggable['slugField'])? $sluggable['slugField']:'slug';
                         $config['fields'][$slugField][] = array('field' => $field, 'position' => $sluggable['position'], 'slugField' => $slugField);
-=======
-<<<<<<< HEAD
-                        $config['fields'][] = array('field' => $field, 'position' => $sluggable['position']);
-=======
-                        $slugField = isset($sluggable['slugField'])? $sluggable['slugField']:'slug';
-                        $config['fields'][$slugField][] = array('field' => $field, 'position' => $sluggable['position'], 'slugField' => $slugField);
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
                     } elseif (isset($fieldMapping['gedmo']['slug']) || in_array('slug', $fieldMapping['gedmo'])) {
                         $slug = $fieldMapping['gedmo']['slug'];
                         if (!$this->isValidField($meta, $field)) {
@@ -82,8 +73,6 @@ class Yaml extends File implements Driver
                         if (isset($config['slug'])) {
                             throw new InvalidMappingException("There cannot be two slug fields: [{$slugField}] and [{$config['slug']}], in class - {$meta->name}.");
                         }
-                        
-
                         $config['slugFields'][$field]['slug'] = $field;
                         $config['slugFields'][$field]['style'] = isset($slug['style']) ?
                             (string)$slug['style'] : 'default';

lib/Gedmo/Sluggable/SluggableListener.php

@@ -116,21 +116,10 @@ class SluggableListener extends MappedEventSubscriber
             if ($config = $this->getConfiguration($om, $meta->name)) {
                 // generate first to exclude this object from similar persisted slugs result
                 $this->generateSlug($ea, $object);
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-                $slug = $meta->getReflectionProperty($config['slug'])->getValue($object);
-                $this->persistedSlugs[$config['useObjectClass']][] = $slug;
-=======
->>>>>>> multiple_slugs
                 foreach ($config['fields'] as $slugField=>$fieldsForSlugField) {
                     $slug = $meta->getReflectionProperty($slugField)->getValue($object);
                     $this->persistedSlugs[$config['useObjectClass']][] = $slug;
                 }
-<<<<<<< HEAD
-=======
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
             }
         }
         // we use onFlush and not preUpdate event to let other
@@ -138,21 +127,10 @@ class SluggableListener extends MappedEventSubscriber
         foreach ($ea->getScheduledObjectUpdates($uow) as $object) {
             $meta = $om->getClassMetadata(get_class($object));
             if ($config = $this->getConfiguration($om, $meta->name)) {
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-                if ($config['updatable']) {
-                    $this->generateSlug($ea, $object);
-=======
->>>>>>> multiple_slugs
                 foreach ($config['slugFields'] as $slugField) {
                     if ($slugField['updatable']) {
                         $this->generateSlug($ea, $object);
                     }
-<<<<<<< HEAD
-=======
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
                 }
             }
         }
@@ -182,14 +160,7 @@ class SluggableListener extends MappedEventSubscriber
         $uow = $om->getUnitOfWork();
         $changeSet = $ea->getObjectChangeSet($uow, $object);
         $config = $this->getConfiguration($om, $meta->name);
-<<<<<<< HEAD
         foreach ($config['fields'] as $slugField=>$fieldsForSlugField) {
-=======
-<<<<<<< HEAD
-=======
-        foreach ($config['fields'] as $slugField=>$fieldsForSlugField) {
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
 
             // sort sluggable fields by position
             $fields = $fieldsForSlugField;
@@ -256,7 +227,6 @@ class SluggableListener extends MappedEventSubscriber
                 $meta->getReflectionProperty($slugFieldConfig['slug'])->setValue($object, $slug);
                 // recompute changeset
                 $ea->recomputeSingleObjectChangeSet($uow, $meta, $object);
-            
             }
         }
     }
@@ -273,21 +243,11 @@ class SluggableListener extends MappedEventSubscriber
     {
         $om = $ea->getObjectManager();
         $meta = $om->getClassMetadata(get_class($object));
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-        $config = $this->getConfiguration($om, $meta->name);
-=======
->>>>>>> multiple_slugs
         if (count ($config) == 0)
         {
             $config = $this->getConfiguration($om, $meta->name);
         }
         
-<<<<<<< HEAD
-=======
->>>>>>> a6dd4fd... Fixed coding standard problems
->>>>>>> multiple_slugs
 
         // search for similar slug
         $result = $ea->getSimilarSlugs($object, $meta, $config, $preferedSlug);
@@ -364,4 +324,4 @@ class SluggableListener extends MappedEventSubscriber
             }
         }
     }
-}
+}