simplify the Laravel 5.1/5.2/Lumen stuff

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 4.0.0 - xx-Jun-2016
 
 - Fix for Laravel 5.1 (#263 thanks @roshangautam and @andregaldino).
+- Update `Cocur\Slugify` to `^2.1` (#269 thanks @shadoWalker89).
 
 
 ## 4.0.0-beta - 01-Jun-2016

src/Services/SlugService.php

@@ -318,13 +318,11 @@ protected function getExistingSlugs($slug, $attribute, array $config)
         }
 
         // get the list of all matching slugs
-        // (need to do this check because of changes in Query Builder between 5.1 and 5.2)
-        // @todo refactor this to universally working code
-        if (version_compare($this->getApplicationVersion(), '5.2', '>=')) {
-            return $query->pluck($attribute, $this->model->getKeyName());
-        } else {
-            return $query->lists($attribute, $this->model->getKeyName());
-        }
+        $results = $query->addSelect([$attribute, $this->model->getKeyName()])
+            ->get();
+
+        // key the results and return
+        return $results->pluck($attribute, $this->model->getKeyName());
     }
 
     /**
@@ -374,23 +372,4 @@ public function setModel(Model $model)
 
         return $this;
     }
-
-    /**
-     * Determine the version of Laravel (or the Illuminate components) that we are running.
-     *
-     * @return string
-     */
-    protected function getApplicationVersion()
-    {
-        static $version;
-
-        if (!$version) {
-            $version = app()->version();
-            // parse out Lumen version
-            if (preg_match('/Lumen \((.*?)\)/i', $version, $matches)) {
-                $version = $matches[1];
-            }
-        }
-        return $version;
-    }
 }