formatting

Author: taylorotwell

src/Illuminate/Pagination/AbstractPaginator.php

@@ -94,18 +94,18 @@ abstract class AbstractPaginator implements Htmlable
     protected static $currentPageResolver;
 
     /**
-     * The view factory resolver callback.
+     * The query string resolver callback.
      *
      * @var \Closure
      */
-    protected static $viewFactoryResolver;
+    protected static $queryStringResolver;
 
     /**
-     * The with query string resolver callback.
+     * The view factory resolver callback.
      *
      * @var \Closure
      */
-    protected static $queryStringResolver;
+    protected static $viewFactoryResolver;
 
     /**
      * The default pagination view.
@@ -223,29 +223,29 @@ public function appends($key, $value = null)
     }
 
     /**
-     * Add all query string values to the paginator.
+     * Add an array of query string values.
      *
+     * @param  array  $keys
      * @return $this
      */
-    public function withQueryString()
+    protected function appendArray(array $keys)
     {
-        if (isset(static::$queryStringResolver)) {
-            return $this->appends(call_user_func(static::$queryStringResolver));
+        foreach ($keys as $key => $value) {
+            $this->addQuery($key, $value);
         }
 
         return $this;
     }
 
     /**
-     * Add an array of query string values.
+     * Add all current query string values to the paginator.
      *
-     * @param  array  $keys
      * @return $this
      */
-    protected function appendArray(array $keys)
+    public function withQueryString()
     {
-        foreach ($keys as $key => $value) {
-            $this->addQuery($key, $value);
+        if (isset(static::$queryStringResolver)) {
+            return $this->appends(call_user_func(static::$queryStringResolver));
         }
 
         return $this;
@@ -484,6 +484,17 @@ public static function currentPageResolver(Closure $resolver)
         static::$currentPageResolver = $resolver;
     }
 
+    /**
+     * Set with query string resolver callback.
+     *
+     * @param  \Closure  $resolver
+     * @return void
+     */
+    public static function queryStringResolver(Closure $resolver)
+    {
+        static::$queryStringResolver = $resolver;
+    }
+
     /**
      * Get an instance of the view factory from the resolver.
      *
@@ -505,17 +516,6 @@ public static function viewFactoryResolver(Closure $resolver)
         static::$viewFactoryResolver = $resolver;
     }
 
-    /**
-     * Set with query string resolver callback.
-     *
-     * @param  \Closure  $resolver
-     * @return void
-     */
-    public static function withQueryStringResolver(Closure $resolver)
-    {
-        static::$queryStringResolver = $resolver;
-    }
-
     /**
      * Set the default pagination view.
      *

src/Illuminate/Pagination/PaginationServiceProvider.php

@@ -47,7 +47,7 @@ public function register()
             return 1;
         });
 
-        Paginator::withQueryStringResolver(function () {
+        Paginator::queryStringResolver(function () {
             return $this->app['request']->query();
         });
     }