From 27b88449805c1e9903fe4088f303c0858336b23b Mon Sep 17 00:00:00 2001
From: Taylor Otwell <taylor@laravel.com>
Date: Mon, 16 Apr 2018 07:09:23 -0500
Subject: [PATCH] formatting

---
 composer.json                                 |  2 +-
 .../Routing/PendingResourceRegistration.php   | 20 ++++++++++---------
 src/Illuminate/Routing/ResourceRegistrar.php  |  4 +++-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index d7dc5bf3d5e9..2942e7a4eb39 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "erusev/parsedown": "~1.7",
         "league/flysystem": "^1.0.8",
         "monolog/monolog": "~1.12",
-        "nesbot/carbon": "^1.24.1",
+        "nesbot/carbon": "1.25.*",
         "psr/container": "~1.0",
         "psr/simple-cache": "^1.0",
         "ramsey/uuid": "^3.7",
diff --git a/src/Illuminate/Routing/PendingResourceRegistration.php b/src/Illuminate/Routing/PendingResourceRegistration.php
index 796b752c1837..8b83ffc2bb39 100644
--- a/src/Illuminate/Routing/PendingResourceRegistration.php
+++ b/src/Illuminate/Routing/PendingResourceRegistration.php
@@ -11,13 +11,6 @@ class PendingResourceRegistration
      */
     protected $registrar;
 
-    /**
-     * The resource's registration status.
-     *
-     * @var bool
-     */
-    protected $registered = false;
-
     /**
      * The resource name.
      *
@@ -39,6 +32,13 @@ class PendingResourceRegistration
      */
     protected $options = [];
 
+    /**
+     * The resource's registration status.
+     *
+     * @var bool
+     */
+    protected $registered = false;
+
     /**
      * Create a new pending resource registration instance.
      *
@@ -150,7 +150,7 @@ public function middleware($middleware)
     }
 
     /**
-     * Register the Resource.
+     * Register the resource route.
      *
      * @return \Illuminate\Routing\RouteCollection
      */
@@ -158,7 +158,9 @@ public function register()
     {
         $this->registered = true;
 
-        return $this->registrar->register($this->name, $this->controller, $this->options);
+        return $this->registrar->register(
+            $this->name, $this->controller, $this->options
+        );
     }
 
     /**
diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php
index d1ec79fc1ae9..37ccb2e59f77 100644
--- a/src/Illuminate/Routing/ResourceRegistrar.php
+++ b/src/Illuminate/Routing/ResourceRegistrar.php
@@ -95,7 +95,9 @@ public function register($name, $controller, array $options = [])
         $collection = new RouteCollection;
 
         foreach ($this->getResourceMethods($defaults, $options) as $m) {
-            $collection->add($this->{'addResource'.ucfirst($m)}($name, $base, $controller, $options));
+            $collection->add($this->{'addResource'.ucfirst($m)}(
+                $name, $base, $controller, $options
+            ));
         }
 
         return $collection;