diff --git a/src/Database/Traits/NestedTree.php b/src/Database/Traits/NestedTree.php index 7ffe7dd07..30220dbc2 100644 --- a/src/Database/Traits/NestedTree.php +++ b/src/Database/Traits/NestedTree.php @@ -4,7 +4,6 @@ use October\Rain\Database\Collection; use October\Rain\Database\TreeCollection; use October\Rain\Database\Scopes\NestedTreeScope; -use Illuminate\Database\Eloquent\SoftDeletingScope; use Exception; /** @@ -120,15 +119,13 @@ public function initializeNestedTree() $this->deleteDescendants(); }); - if (static::hasGlobalScope(SoftDeletingScope::class)) { - $this->bindEvent('model.beforeRestore', function () { - $this->shiftSiblingsForRestore(); - }); + $this->bindEvent('model.beforeRestore', function () { + $this->shiftSiblingsForRestore(); + }); - $this->bindEvent('model.afterRestore', function () { - $this->restoreDescendants(); - }); - } + $this->bindEvent('model.afterRestore', function () { + $this->restoreDescendants(); + }); } /** diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php index 073262b3e..f71dfd653 100644 --- a/src/Foundation/Application.php +++ b/src/Foundation/Application.php @@ -347,7 +347,7 @@ public function registerCoreContainerAliases() 'queue' => [\Illuminate\Queue\QueueManager::class, \Illuminate\Contracts\Queue\Factory::class, \Illuminate\Contracts\Queue\Monitor::class], 'queue.connection' => [\Illuminate\Contracts\Queue\Queue::class], 'queue.failer' => [\Illuminate\Queue\Failed\FailedJobProviderInterface::class], - 'redirect' => [\October\Rain\Router\CoreRedirector::class], + 'redirect' => [\October\Rain\Router\CoreRedirector::class, \Illuminate\Routing\Redirector::class], 'redis' => [\Illuminate\Redis\RedisManager::class, \Illuminate\Contracts\Redis\Factory::class], 'redis.connection' => [\Illuminate\Redis\Connections\Connection::class, \Illuminate\Contracts\Redis\Connection::class], 'request' => [\Illuminate\Http\Request::class, \Symfony\Component\HttpFoundation\Request::class], diff --git a/src/Resize/Resizer.php b/src/Resize/Resizer.php index 3c39fbf62..ba9e45b39 100644 --- a/src/Resize/Resizer.php +++ b/src/Resize/Resizer.php @@ -153,11 +153,11 @@ public function reset(): Resizer public function setOptions(array $options): Resizer { $this->options = array_merge([ - 'mode' => 'auto', - 'offset' => [0, 0], - 'sharpen' => 0, + 'mode' => 'crop', + 'offset' => [0, 0], + 'sharpen' => 0, 'interlace' => false, - 'quality' => 90 + 'quality' => 90 ], $options); return $this;