Merge pull request #445 from djlambert/sortable-groups-refactor

Sortable get groups refactor

lib/Gedmo/Sortable/SortableListener.php

@@ -11,7 +11,7 @@ use Doctrine\ORM\Proxy\Proxy;
  * The SortableListener maintains a sort index on your entities
  * to enable arbitrary sorting.
  *
- * This behavior can inpact the performance of your application
+ * This behavior can impact the performance of your application
  * since it does some additional calculations on persisted objects.
  *
  * @author Lukas Botsch <lukas.botsch@gmail.com>
@@ -40,10 +40,9 @@ class SortableListener extends MappedEventSubscriber
     }
 
     /**
-     * Mapps additional metadata
+     * Maps additional metadata
      *
-     * @param EventArgs $eventArgs
-     * @return void
+     * @param EventArgs $args
      */
     public function loadClassMetadata(EventArgs $args)
     {
@@ -52,11 +51,10 @@ class SortableListener extends MappedEventSubscriber
     }
 
     /**
-     * Generate slug on objects being updated during flush
+     * Update position on objects being updated during flush
      * if they require changing
      *
      * @param EventArgs $args
-     * @return void
      */
     public function onFlush(EventArgs $args)
     {
@@ -64,7 +62,7 @@ class SortableListener extends MappedEventSubscriber
         $om = $ea->getObjectManager();
         $uow = $om->getUnitOfWork();
 
-        // process all objects beeing deleted
+        // process all objects being deleted
         foreach ($ea->getScheduledObjectDeletions($uow) as $object) {
             $meta = $om->getClassMetadata(get_class($object));
             if ($config = $this->getConfiguration($om, $meta->name)) {
@@ -72,7 +70,7 @@ class SortableListener extends MappedEventSubscriber
             }
         }
 
-        // process all objects beeing updated
+        // process all objects being updated
         foreach ($ea->getScheduledObjectUpdates($uow) as $object) {
             $meta = $om->getClassMetadata(get_class($object));
             if ($config = $this->getConfiguration($om, $meta->name)) {
@@ -80,7 +78,7 @@ class SortableListener extends MappedEventSubscriber
             }
         }
 
-        // process all objects beeing inserted
+        // process all objects being inserted
         foreach ($ea->getScheduledObjectInsertions($uow) as $object) {
             $meta = $om->getClassMetadata(get_class($object));
             if ($config = $this->getConfiguration($om, $meta->name)) {
@@ -93,6 +91,8 @@ class SortableListener extends MappedEventSubscriber
 
     /**
      * Update maxPositions as needed
+     *
+     * @param EventArgs $args
      */
     public function prePersist(EventArgs $args)
     {
@@ -104,12 +104,8 @@ class SortableListener extends MappedEventSubscriber
 
         if ($config = $this->getConfiguration($om, $meta->name)) {
             // Get groups
-            $groups = array();
-            if (isset($config['groups'])) {
-                foreach ($config['groups'] as $group) {
-                    $groups[$group] = $meta->getReflectionProperty($group)->getValue($object);
-                }
-            }
+            $groups = $this->getGroups($meta, $config, $object);
+
             // Get hash
             $hash = $this->getHash($meta, $groups, $object, $config);
 
@@ -134,12 +130,8 @@ class SortableListener extends MappedEventSubscriber
         }
 
         // Get groups
-        $groups = array();
-        if (isset($config['groups'])) {
-            foreach ($config['groups'] as $group) {
-                $groups[$group] = $meta->getReflectionProperty($group)->getValue($object);
-            }
-        }
+        $groups = $this->getGroups($meta, $config, $object);
+
         // Get hash
         $hash = $this->getHash($meta, $groups, $object, $config);
 
@@ -199,14 +191,11 @@ class SortableListener extends MappedEventSubscriber
         $changed = $changed || $oldPosition != $newPosition;
 
         // Get groups
-        $groups = array();
-        if (isset($config['groups'])) {
-            foreach ($config['groups'] as $group) {
-                $changed = $changed ||
-                    (array_key_exists($group, $changeSet)
-                        && $changeSet[$group][0] != $changeSet[$group][1]);
-                $groups[$group] = $meta->getReflectionProperty($group)->getValue($object);
-            }
+        $groups = $this->getGroups($meta, $config, $object);
+        foreach ($groups as $group) {
+            $changed = $changed ||
+                (array_key_exists($group, $changeSet)
+                    && $changeSet[$group][0] != $changeSet[$group][1]);
         }
 
         if (!$changed) return;
@@ -279,12 +268,8 @@ class SortableListener extends MappedEventSubscriber
         $position = $meta->getReflectionProperty($config['position'])->getValue($object);
 
         // Get groups
-        $groups = array();
-        if (isset($config['groups'])) {
-            foreach ($config['groups'] as $group) {
-                $groups[$group] = $meta->getReflectionProperty($group)->getValue($object);
-            }
-        }
+        $groups = $this->getGroups($meta, $config, $object);
+
         // Get hash
         $hash = $this->getHash($meta, $groups, $object, $config);
 
@@ -385,12 +370,7 @@ class SortableListener extends MappedEventSubscriber
         $maxPos = null;
 
         // Get groups
-        $groups = array();
-        if (isset($config['groups'])) {
-            foreach ($config['groups'] as $group) {
-                $groups[$group] = $meta->getReflectionProperty($group)->getValue($object);
-            }
-        }
+        $groups = $this->getGroups($meta, $config, $object);
 
         // Get hash
         $hash = $this->getHash($meta, $groups, $object, $config);
@@ -467,6 +447,25 @@ class SortableListener extends MappedEventSubscriber
         } catch (\Exception $e) {}
     }
 
+    /**
+     * @param $meta
+     * @param $config
+     * @param $object
+     *
+     * @return array
+     */
+    private function getGroups($meta, $config, $object)
+    {
+        $groups = array();
+        if (isset($config['groups'])) {
+            foreach ($config['groups'] as $group) {
+                $groups[$group] = $meta->getReflectionProperty($group)->getValue($object);
+            }
+        }
+
+        return $groups;
+    }
+
     /**
      * {@inheritDoc}
      */