Progress on v4

Author: daftspunk

src/Argon/README.md

@@ -670,6 +670,14 @@ public function getAuthIdentifierName()
         return $this->getKeyName();
     }
 
+    /**
+     * getAuthPasswordName of the password attribute for the user.
+     */
+    public function getAuthPasswordName()
+    {
+        return 'password';
+    }
+
     /**
      * getAuthIdentifier gets the unique identifier for the user
      * @return mixed

src/Auth/Models/User.php

@@ -164,7 +164,7 @@ protected function searchWhereInternal($term, $columns, $mode, $boolean)
      * @param  int  $page
      * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
-    public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
+    public function paginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null, $total = null)
     {
         // Legacy signature support
         // paginate($perPage, $page, $columns, $pageName)
@@ -178,18 +178,17 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
             $page = is_array($_currentPage) ? null : $_currentPage;
         }
 
-        if (!$page) {
-            $page = Paginator::resolveCurrentPage($pageName);
-        }
+        $page = $page ?: Paginator::resolveCurrentPage($pageName);
 
-        if (!$perPage) {
-            $perPage = $this->model->getPerPage();
-        }
+        $total = value($total) ?? $this->toBase()->getCountForPagination();
 
-        $total = $this->toBase()->getCountForPagination();
-        $this->forPage((int) $page, (int) $perPage);
+        $perPage = value($perPage, $total) ?: $this->model->getPerPage();
 
-        return $this->paginator($this->get($columns), $total, $perPage, $page, [
+        $results = $total
+            ? $this->forPage($page, $perPage)->get($columns)
+            : $this->model->newCollection();
+
+        return $this->paginator($results, $total, $perPage, $page, [
             'path' => Paginator::resolveCurrentPath(),
             'pageName' => $pageName
         ]);
@@ -204,31 +203,27 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
      * @param  int  $currentPage
      * @return \Illuminate\Contracts\Pagination\Paginator
      */
-    public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page', $currentPage = null)
+    public function simplePaginate($perPage = null, $columns = ['*'], $pageName = 'page', $page = null)
     {
         // Legacy signature support
         // paginate($perPage, $currentPage, $columns, $pageName)
         if (!is_array($columns)) {
             $_currentPage = $columns;
             $_columns = $pageName;
-            $_pageName = $currentPage;
+            $_pageName = $page;
 
             $columns = is_array($_columns) ? $_columns : ['*'];
             $pageName = $_pageName !== null ? $_pageName : 'page';
-            $currentPage = is_array($_currentPage) ? null : $_currentPage;
+            $page = is_array($_currentPage) ? null : $_currentPage;
         }
 
-        if (!$currentPage) {
-            $currentPage = Paginator::resolveCurrentPage($pageName);
-        }
+        $page = $page ?: Paginator::resolveCurrentPage($pageName);
 
-        if (!$perPage) {
-            $perPage = $this->model->getPerPage();
-        }
+        $perPage = $perPage ?: $this->model->getPerPage();
 
-        $this->skip(($currentPage - 1) * $perPage)->take($perPage + 1);
+        $this->skip(($page - 1) * $perPage)->take($perPage + 1);
 
-        return $this->simplePaginator($this->get($columns), $perPage, $currentPage, [
+        return $this->simplePaginator($this->get($columns), $perPage, $page, [
             'path' => Paginator::resolveCurrentPath(),
             'pageName' => $pageName
         ]);

src/Database/Builder.php

@@ -20,7 +20,7 @@ public function register()
         Model::flushEventListeners();
 
         $this->registerConnectionServices();
-        $this->registerEloquentFactory();
+        $this->registerFakerGenerator();
         $this->registerQueueableEntityResolver();
     }
 

src/Database/DatabaseServiceProvider.php

@@ -1,4 +1,4 @@
-<?php namespace October\Rain\Argon;
+<?php namespace October\Rain\Foundation\Providers;
 
 use Carbon\Carbon;
 use Carbon\CarbonImmutable;
@@ -8,19 +8,16 @@
 use October\Rain\Support\ServiceProvider;
 
 /**
- * ArgonServiceProvider
- *
- * @package october\argon
- * @author Alexey Bobkov, Samuel Georges
+ * DateServiceProvider
  */
-class ArgonServiceProvider extends ServiceProvider
+class DateServiceProvider extends ServiceProvider
 {
     /**
      * register the service provider.
      */
     public function register()
     {
-        DateFactory::useClass(\October\Rain\Argon\Argon::class);
+        DateFactory::useClass(\October\Rain\Support\Date::class);
     }
 
     /**

src/Argon/ArgonServiceProvider.php src/Foundation/Providers/DateServiceProvider.php

@@ -1,27 +1,27 @@
-<?php namespace October\Rain\Argon;
+<?php namespace October\Rain\Support;
 
 use Carbon\Carbon as DateBase;
 
 /**
- * Argon is an umbrella class for Carbon that automatically applies localizations
+ * Date is an umbrella class for Carbon that automatically applies localizations
  *
- * @package october\argon
+ * @package october\support
  * @author Alexey Bobkov, Samuel Georges
  */
-class Argon extends DateBase
+class Date extends DateBase
 {
     /**
      * format
      */
-    public function format($format)
+    public function format(string $format): string
     {
         return parent::translatedFormat($format);
     }
 
     /**
      * createFromFormat
      */
-    public static function createFromFormat($format, $time, $timezone = null)
+    public static function createFromFormat($format, $time, $timezone = null): ?DateBase
     {
         if (is_string($time)) {
             $time = static::translateTimeString($time, static::getLocale(), 'en');
@@ -33,7 +33,7 @@ public static function createFromFormat($format, $time, $timezone = null)
     /**
      * parse
      */
-    public static function parse($time = null, $timezone = null)
+    public static function parse($time = null, $timezone = null): static
     {
         if (is_string($time)) {
             $time = static::translateTimeString($time, static::getLocale(), 'en');

src/Argon/Argon.php src/Support/Date.php

@@ -20,7 +20,7 @@ public function __construct(?array $providers = null)
             \October\Rain\Halcyon\HalcyonServiceProvider::class,
             \October\Rain\Filesystem\FilesystemServiceProvider::class,
             \October\Rain\Html\UrlServiceProvider::class,
-            \October\Rain\Argon\ArgonServiceProvider::class,
+            \October\Rain\Foundation\Providers\DateServiceProvider::class,
 
             // October Providers (Deferred)
             \October\Rain\Mail\MailServiceProvider::class,