Merge branch 'master' into catch-exceptions

resources/sass/_reset.scss

@@ -93,11 +93,19 @@ img {
   height: auto;
 }
 
+dl > * {
+  break-inside: avoid;
+}
+
+dl > div {
+  margin-top: 0;
+  padding-bottom: 1rem;
+}
+
 dt {
   break-after: avoid;
 }
 
 dd {
-  break-inside: avoid;
   break-before: avoid;
 }

resources/views/dashboard/laravelConfig.blade.php

@@ -3,9 +3,11 @@
     Laravel configuration
   </header>
   <dl class="columns-narrow">
-    @foreach(['app.name', 'app.url', 'app.env', 'app.debug', 'mail.from.address', 'mail.from.name', 'kontour.guard', 'session.cookie', 'session.lifetime', 'database.default', 'cache.default', 'filesystems.default'] as $configKey)
-    <dt><code>{{ $configKey }}</code></dt>
-    <dd>{{ config($configKey) }}</dd>
+    @foreach(['app.name', 'app.url', 'app.env', 'app.debug', 'mail.from.address', 'mail.from.name', 'auth.defaults.guard', 'kontour.guard', 'session.cookie', 'session.lifetime', 'database.default', 'cache.default', 'filesystems.default'] as $configKey)
+      <div>
+        <dt><code>{{ $configKey }}</code></dt>
+        <dd>{{ config($configKey) }}</dd>
+      </div>
     @endforeach
   </dl>
 </section>

src/Concerns/AuthorizesAdminRequests.php

@@ -53,11 +53,13 @@ protected function authorizeAdminVisit(
         string $linkDescription = null,
         $abilityArguments = []
     ): AdminLink {
-        [$ability, $abilityArguments] = $this->parseAbilityAndArguments($ability, $abilityArguments);
+        $link = AdminLink::create($linkName, url()->full(), $linkDescription);
 
-        $result = $this->authorizeForUser($this->adminUser(), $ability, $abilityArguments);
+        if (!is_null($ability)) {
+            $result = $this->authorizeForUser($this->adminUser(), $ability, $abilityArguments);
+            $link->registerAbilityForAuthorization($ability, $abilityArguments);
+        }
 
-        return AdminLink::create($linkName, url()->full(), $linkDescription)
-            ->registerAbilityForAuthorization($ability, $abilityArguments);
+        return $link;
     }
 }

src/Concerns/AuthorizesWithAbility.php

@@ -26,11 +26,11 @@ trait AuthorizesWithAbility
 
     /**
      * Register a policy or gate to be used for the authorization
-     * @param string $ability name from a Gate/Policy
+     * @param string|null $ability name from a Gate/Policy, or null to unset
      * @param array|mixed $arguments for the ability check, typically a model instance
      * @return $this
      */
-    public function registerAbilityForAuthorization(string $ability, $arguments = []): AuthorizesWithAbilityContract
+    public function registerAbilityForAuthorization(?string $ability, $arguments = []): AuthorizesWithAbilityContract
     {
         $this->authorizesWithAbilityName = $ability;
         $this->authorizesWithAbilityArguments = $arguments;

src/Contracts/AuthorizesWithAbility.php

@@ -8,11 +8,11 @@ interface AuthorizesWithAbility extends Authorizes
 {
     /**
      * Register a policy or gate to be used for the authorization
-     * @param string $ability name from a Gate/Policy
+     * @param string|null $ability name from a Gate/Policy, or null to unset
      * @param array|mixed $arguments for the ability check, typically a model instance
      * @return $this
      */
-    public function registerAbilityForAuthorization(string $ability, $arguments = []): AuthorizesWithAbility;
+    public function registerAbilityForAuthorization(?string $ability, $arguments = []): AuthorizesWithAbility;
 
     /**
      * Register a guard to be used for the authorization