Merge with multiple_slugs_1

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

@@ -108,7 +108,10 @@ 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
                 
+=======
+>>>>>>> multiple_slugs_1
                 $config['slugFields'][$field]['slug'] = $field;
                 $config['slugFields'][$field]['style'] = $slug->style;
                 $config['slugFields'][$field]['updatable'] = $slug->updatable;

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

@@ -65,6 +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');
                     if ($this->_isAttributeSet($mapping->sluggable, 'position')) {
                         $options['position'] =  (int)$this->_getAttribute($mapping->sluggable, 'position');
@@ -74,6 +75,17 @@ class Xml extends BaseXml
                         $options['slugField'] =  $this->_getAttribute($mapping->sluggable, 'slugField');
                     }
                     
+=======
+                    $options = array('position' => false, 'field' => $field, 'slugField' => 'slug');
+                    if ($this->_isAttributeSet($mapping->sluggable, 'position')) {
+                        $options['position'] =  (int)$this->_getAttribute($mapping->sluggable, 'position');
+                    }
+
+                    if ($this->_isAttributeSet($mapping->sluggable, 'slugField')) {
+                        $options['slugField'] =  $this->_getAttribute($mapping->sluggable, 'slugField');
+                    }
+
+>>>>>>> multiple_slugs_1
                     $config['fields'][$options['slugField']][] = $options;
                 } elseif (isset($mapping->slug)) {
                     /**

lib/Gedmo/Sluggable/SluggableListener.php

@@ -182,19 +182,30 @@ class SluggableListener extends MappedEventSubscriber
             }
             // if slug is changed, do further processing
             if ($needToChangeSlug) {            
+<<<<<<< HEAD
     
+=======
+>>>>>>> multiple_slugs_1
                 if (!strlen(trim($slug))) {
                     throw new \Gedmo\Exception\UnexpectedValueException("Unable to find any non empty sluggable fields for slug [{$slugField}] , make sure they have something at least.");
                 }
                 
                 $slugFieldConfig = $config['slugFields'][$slugField];
+<<<<<<< HEAD
         
+=======
+
+>>>>>>> multiple_slugs_1
                 // build the slug
                 $slug = call_user_func_array(
                     $this->transliterator,
                     array($slug, $slugFieldConfig['separator'], $object)
                 );
+<<<<<<< HEAD
         
+=======
+
+>>>>>>> multiple_slugs_1
                 // stylize the slug
                 switch ($slugFieldConfig['style']) {
                     case 'camel':
@@ -247,7 +258,10 @@ class SluggableListener extends MappedEventSubscriber
         {
             $config = $this->getConfiguration($om, $meta->name);
         }
+<<<<<<< HEAD
         
+=======
+>>>>>>> multiple_slugs_1
 
         // search for similar slug
         $result = $ea->getSimilarSlugs($object, $meta, $config, $preferedSlug);

tests/Gedmo/Sluggable/TranslatableManySlugTest.php

@@ -77,8 +77,11 @@ class TranslatableManySlugTest extends BaseTestCaseORM
         $this->assertEquals('title-in-de-code-in-de', $translations['de_de']['slug']);
     }
 
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> multiple_slugs_1
     protected function getUsedEntityFixtures()
     {
         return array(