Merge pull request #36 from Taluu/refactor-set

Refactor things
Wisembly · Jan 8, 2016 · e6b43cd · e6b43cd
2 parents 196992e + 0ad3481
commit e6b43cd
Showing 1 changed file with 18 additions and 34 deletions.
diff --git a/src/Set.php b/src/Set.php
@@ -178,41 +178,25 @@ private function computeEntry(AbstractSnapshot $old, AbstractSnapshot $new, $key
             return new Removal($this->getRawData($old[$key]));
         }
 
-        $values = ['old' => $this->getRawData($old[$key]),
-                   'new' => $this->getRawData($new[$key])];
-
-        switch (true) {
-            // type verification
-            case gettype($old[$key]) !== gettype($new[$key]):
-                return new Modification($values['old'], $values['new']);
-
-            // could we compare two snapshots ?
-            case $old[$key] instanceof AbstractSnapshot:
-                if (!$new[$key] instanceof AbstractSnapshot) {
-                    return new Modification($values['old'], $values['new']);
-                }
-
-                if (!$old[$key]->isComparable($new[$key])) {
-                    return new Modification($values['old'], $values['new']);
-                }
-
-                $set = new static;
-                $set->compute($old[$key], $new[$key]);
-
-                if (0 < count($set)) {
-                    return $set;
-                }
-
-                return null;
-
-            // unknown type : compare raw data
-            case $values['old'] !== $values['new']:
-                return new Modification($values['old'], $values['new']);
-        // PHPUnit coverage wtf start
-        // @codeCoverageIgnoreStart
+        $raw = [
+            'old' => $this->getRawData($old[$key]),
+            'new' => $this->getRawData($new[$key])
+        ];
+
+        if ($old[$key] instanceof AbstractSnapshot && $new[$key] instanceof AbstractSnapshot && $new[$key]->isComparable($old[$key])) {
+            $set = new static;
+            $set->compute($old[$key], $new[$key]);
+
+            if (0 < count($set)) {
+                return $set;
+            }
         }
-        // @codeCoverageIgnoreEnd
-        // PHPUnit coverage wtf end
+
+        if ($raw['old'] !== $raw['new']) {
+            return new Modification($raw['old'], $raw['new']);
+        }
+
+        return null;
     }
 
     /**