composer.json

@@ -18,17 +18,15 @@
         "composer/composer": "^2.0.0",
         "doctrine/dbal": "^2.13.3|^3.1.4",
         "linkorb/jsmin-php": "~1.0",
-        "wikimedia/less.php": "~4.1",
+        "wikimedia/less.php": "~5.2",
         "scssphp/scssphp": "~1.0",
         "symfony/yaml": "^6.0",
         "twig/twig": "~3.0",
         "league/csv": "~9.1",
-        "nesbot/carbon": "^2.0",
-        "guzzlehttp/guzzle": "^7.5",
         "laravel/tinker": "~2.0"
     },
     "require-dev": {
-        "laravel/framework": "^9.0|^10.0",
+        "laravel/framework": "^12.0",
         "phpunit/phpunit": "^8.0|^9.0|^10.0",
         "meyfa/phpunit-assert-gd": "^2.0.0|^3.0.0",
         "phpbench/phpbench": "^1.2"
@@ -60,17 +58,6 @@
             "phpbench run tests\\Benchmark\\ --report=default"
         ]
     },
-    "extra": {
-        "branch-alias": {
-            "dev-develop": "3.x-dev"
-        },
-        "laravel": {
-            "providers": [
-                "October\\Rain\\Foundation\\Providers\\AppSupportServiceProvider",
-                "October\\Rain\\Foundation\\Providers\\AppDeferSupportServiceProvider"
-            ]
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

contracts/Database/MultisiteInterface.php

@@ -11,7 +11,7 @@ interface MultisiteInterface
     /**
      * findOrCreateForSite
      */
-    public function findOrCreateForSite(string $siteId = null);
+    public function findOrCreateForSite(?string $siteId = null);
 
     /**
      * isMultisiteEnabled

contracts/Element/FilterElement.php

@@ -13,5 +13,5 @@ interface FilterElement
     /**
      * defineScope adds a scope to the filter element
      */
-    public function defineScope(string $scopeName = null, string $label = null): ScopeDefinition;
+    public function defineScope(string $scopeName, ?string $label = null): ScopeDefinition;
 }

contracts/Element/FormElement.php

@@ -14,7 +14,7 @@ interface FormElement
     /**
      * addFormField adds a field to the fieldset
      */
-    public function addFormField(string $fieldName = null, string $label = null): FieldDefinition;
+    public function addFormField(string $fieldName, ?string $label = null): FieldDefinition;
 
     /**
      * getFormFieldset returns the current fieldset definition

contracts/Element/ListElement.php

@@ -13,5 +13,5 @@ interface ListElement
     /**
      * defineColumn adds a column to the list element
      */
-    public function defineColumn(string $columnName = null, string $label = null): ColumnDefinition;
+    public function defineColumn(string $columnName, ?string $label = null): ColumnDefinition;
 }

src/Assetic/Asset/AssetCache.php

@@ -57,7 +57,7 @@ public function clearFilters()
     /**
      * load
      */
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
         if ($this->cache->has($cacheKey)) {
@@ -73,7 +73,7 @@ public function load(FilterInterface $additionalFilter = null)
     /**
      * dump
      */
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'dump');
         if ($this->cache->has($cacheKey)) {
@@ -190,7 +190,7 @@ public function getValues()
      *
      * @return string A key for identifying the current asset
      */
-    protected static function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
+    protected static function getCacheKey(AssetInterface $asset, ?FilterInterface $additionalFilter = null, $salt = '')
     {
         if ($additionalFilter) {
             $asset = clone $asset;

src/Assetic/Asset/AssetCollection.php

@@ -183,7 +183,7 @@ public function clearFilters()
     /**
      * load
      */
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         // loop through leaves and load each asset
         $parts = [];
@@ -198,7 +198,7 @@ public function load(FilterInterface $additionalFilter = null)
     /**
      * dump
      */
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         // loop through leaves and dump each asset
         $parts = [];

src/Assetic/Asset/AssetInterface.php

@@ -35,7 +35,7 @@ public function clearFilters();
      *
      * @param FilterInterface $additionalFilter An additional filter
      */
-    public function load(FilterInterface $additionalFilter = null);
+    public function load(?FilterInterface $additionalFilter = null);
 
     /**
      * Applies dump filters and returns the asset as a string.
@@ -51,7 +51,7 @@ public function load(FilterInterface $additionalFilter = null);
      *
      * @return string The filtered content of the current asset
      */
-    public function dump(FilterInterface $additionalFilter = null);
+    public function dump(?FilterInterface $additionalFilter = null);
 
     /**
      * Returns the loaded content of the current asset.

src/Assetic/Asset/BaseAsset.php

@@ -106,7 +106,7 @@ public function clearFilters()
      * @param string          $content          The asset content
      * @param FilterInterface $additionalFilter An additional filter
      */
-    protected function doLoad($content, FilterInterface $additionalFilter = null)
+    protected function doLoad($content, ?FilterInterface $additionalFilter = null)
     {
         $filter = clone $this->filters;
         if ($additionalFilter) {
@@ -122,7 +122,7 @@ protected function doLoad($content, FilterInterface $additionalFilter = null)
         $this->loaded = true;
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         if (!$this->loaded) {
             $this->load();

src/Assetic/Asset/FileAsset.php

@@ -53,7 +53,7 @@ public function __construct($source, $filters = [], $sourceRoot = null, $sourceP
     /**
      * load
      */
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $source = VarUtils::resolve($this->source, $this->getVars(), $this->getValues());
 

src/Assetic/Asset/GlobAsset.php

@@ -52,7 +52,7 @@ public function all()
     /**
      * load
      */
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         if (!$this->initialized) {
             $this->initialize();
@@ -64,7 +64,7 @@ public function load(FilterInterface $additionalFilter = null)
     /**
      * dump
      */
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         if (!$this->initialized) {
             $this->initialize();

src/Assetic/Asset/HttpAsset.php

@@ -53,7 +53,7 @@ public function __construct($sourceUrl, $filters = [], $ignoreErrors = false, ar
     /**
      * load
      */
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $content = @file_get_contents(
             VarUtils::resolve($this->sourceUrl, $this->getVars(), $this->getValues())

src/Assetic/Asset/Iterator/AssetCollectionIterator.php

@@ -61,11 +61,11 @@ public function __construct(AssetCollectionInterface $coll, SplObjectStorage $cl
     /**
      * Returns a copy of the current asset with filters and a target URL applied.
      *
-     * @param Boolean $raw Returns the unmodified asset if true
+     * @param bool $raw Returns the unmodified asset if true
      *
      * @return \October\Rain\Assetic\Asset\AssetInterface
      */
-    public function current($raw = false)
+    public function current($raw = false): mixed
     {
         $asset = current($this->assets);
 
@@ -95,7 +95,7 @@ public function current($raw = false)
         return $clone;
     }
 
-    public function key()
+    public function key(): mixed
     {
         return key($this->assets);
     }

src/Assetic/Asset/StringAsset.php

@@ -30,7 +30,7 @@ public function __construct($content, $filters = [], $sourceRoot = null, $source
     /**
      * load
      */
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $this->doLoad($this->string, $additionalFilter);
     }

src/Assetic/Combiner.php

@@ -63,7 +63,7 @@ public function prepareCombiner(array $assets, $options = [])
         $files = [];
         $filesSalt = null;
         foreach ($assets as $asset) {
-            $filters = $this->getFilters(File::extension($asset), $production);
+            $filters = $this->getFilters(File::extension($asset), (bool) $production);
 
             $path = File::symbolizePath($asset);
             if (!file_exists($path) && file_exists($this->localPath . $asset)) {
@@ -190,7 +190,7 @@ public function resetFilters($extension = null)
     /**
      * getFilters returns all defined filters for a given extension
      */
-    public function getFilters(string $extension = null, $isProduction = false): array
+    public function getFilters(?string $extension = null, bool $isProduction = false): array
     {
         if ($isProduction) {
             if ($extension === null) {

src/Assetic/Exception/FilterException.php

@@ -10,7 +10,7 @@ class FilterException extends \RuntimeException implements Exception
     private $originalMessage;
     private $input;
 
-    public function __construct($message, $code = 0, \Exception $previous = null)
+    public function __construct($message, $code = 0, ?\Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 

src/Assetic/Filter/CssImportFilter.php

@@ -29,7 +29,7 @@ class CssImportFilter extends BaseCssFilter implements HashableInterface, Depend
      *
      * @param FilterInterface $importFilter Filter for each imported asset
      */
-    public function __construct(FilterInterface $importFilter = null)
+    public function __construct(?FilterInterface $importFilter = null)
     {
         $this->importFilter = $importFilter ?: new CssRewriteFilter();
     }

src/Assetic/Filter/FilterCollection.php

@@ -1,6 +1,7 @@
 <?php namespace October\Rain\Assetic\Filter;
 
 use October\Rain\Assetic\Asset\AssetInterface;
+use Traversable;
 
 /**
  * FilterCollection is a collection of filters.
@@ -59,12 +60,12 @@ public function filterDump(AssetInterface $asset)
         }
     }
 
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new \ArrayIterator($this->filters);
     }
 
-    public function count()
+    public function count(): int
     {
         return count($this->filters);
     }

src/Auth/AuthException.php

@@ -47,7 +47,7 @@ class AuthException extends ApplicationException
      * @param int $code
      * @param Exception $previous
      */
-    public function __construct($message = '', $code = 0, Exception $previous = null)
+    public function __construct($message = '', $code = 0, ?Exception $previous = null)
     {
         if ($this->useSoftErrors()) {
             $message = static::$errorMessage;

src/Auth/Models/Role.php

@@ -178,7 +178,7 @@ public function hasAnyAccess(array $permissions)
 
     /**
      * setPermissionsAttribute validates the permissions when set
-     * @param  array  $permissions
+     * @param  string  $permissions
      * @return void
      */
     public function setPermissionsAttribute($permissions)

src/Auth/Models/User.php

@@ -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/Composer/Concerns/HasOutput.php

@@ -23,7 +23,7 @@ trait HasOutput
     /**
      * setOutput
      */
-    public function setOutput(IOInterface $output = null)
+    public function setOutput(?IOInterface $output = null)
     {
         if ($output === null) {
             $this->output = new NullIO();

src/Database/Builder.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
         ]);