Merge pull request #676 from youmingdot/5.5

taylorotwell · web-flow · commit 5c151e95ae02 · 2017-11-04T13:10:09.000-05:00
[5.5] Some optimization based on PHP 7.
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -133,7 +133,7 @@ protected static function formatUsesPrefix($new, $old)
                 : trim($new['namespace'], '\\');
         }
 
-        return isset($old['namespace']) ? $old['namespace'] : null;
+        return $old['namespace'] ?? null;
     }
 
     /**
@@ -145,7 +145,7 @@ protected static function formatUsesPrefix($new, $old)
      */
     protected static function formatGroupPrefix($new, $old)
     {
-        $oldPrefix = isset($old['prefix']) ? $old['prefix'] : null;
+        $oldPrefix = $old['prefix'] ?? null;
 
         if (isset($new['prefix'])) {
             return trim($oldPrefix, '/').'/'.trim($new['prefix'], '/');
@@ -239,9 +239,9 @@ public function hasGroupStack()
      */
     protected function mergeGroupAttributes(array $action, array $attributes)
     {
-        $namespace = isset($attributes['namespace']) ? $attributes['namespace'] : null;
-        $middleware = isset($attributes['middleware']) ? $attributes['middleware'] : null;
-        $as = isset($attributes['as']) ? $attributes['as'] : null;
+        $namespace = $attributes['namespace'] ?? null;
+        $middleware = $attributes['middleware'] ?? null;
+        $as = $attributes['as'] ?? null;
 
         return $this->mergeNamespaceGroup(
             $this->mergeMiddlewareGroup(
