Lexical: Updated tests for node changes

[bookstack] / app / App / helpers.php

diff --git a/app/App/helpers.php b/app/App/helpers.php
index b59a63448340d716fd5a24e5b2328f2c2b7d273e..af6dbcfc39787da06e9d9387685733e932da17b6 100644 (file)
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -49,7 +49,7 @@ function userCan(string $permission, Model $ownable = null): bool
     }
 
     // Check permission on ownable item
     }
 
     // Check permission on ownable item

-    $permissions = app(PermissionApplicator::class);
+    $permissions = app()->make(PermissionApplicator::class);

 
     return $permissions->checkOwnableUserAccess($ownable, $permission);
 }
 
     return $permissions->checkOwnableUserAccess($ownable, $permission);
 }


@@ -60,7 +60,7 @@ function userCan(string $permission, Model $ownable = null): bool
  */
 function userCanOnAny(string $action, string $entityClass = ''): bool
 {
  */
 function userCanOnAny(string $action, string $entityClass = ''): bool
 {

-    $permissions = app(PermissionApplicator::class);
+    $permissions = app()->make(PermissionApplicator::class);

 
     return $permissions->checkUserHasEntityPermissionOnAny($action, $entityClass);
 }
 
     return $permissions->checkUserHasEntityPermissionOnAny($action, $entityClass);
 }


@@ -72,7 +72,7 @@ function userCanOnAny(string $action, string $entityClass = ''): bool
  */
 function setting(string $key = null, $default = null)
 {
  */
 function setting(string $key = null, $default = null)
 {

-    $settingService = resolve(SettingService::class);
+    $settingService = app()->make(SettingService::class);

 
     if (is_null($key)) {
         return $settingService;
 
     if (is_null($key)) {
         return $settingService;


@@ -97,39 +97,6 @@ function theme_path(string $path = ''): ?string
     return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
 }
 
     return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
 }
 

-/**
- * Get fetch an SVG icon as a string.
- * Checks for icons defined within a custom theme before defaulting back
- * to the 'resources/assets/icons' folder.
- *
- * Returns an empty string if icon file not found.
- */
-function icon(string $name, array $attrs = []): string
-{
-    $attrs = array_merge([
-        'class'     => 'svg-icon',
-        'data-icon' => $name,
-        'role'      => 'presentation',
-    ], $attrs);
-    $attrString = ' ';
-    foreach ($attrs as $attrName => $attr) {
-        $attrString .= $attrName . '="' . $attr . '" ';
-    }
-
-    $iconPath = resource_path('icons/' . $name . '.svg');
-    $themeIconPath = theme_path('icons/' . $name . '.svg');
-
-    if ($themeIconPath && file_exists($themeIconPath)) {
-        $iconPath = $themeIconPath;
-    } elseif (!file_exists($iconPath)) {
-        return '';
-    }
-
-    $fileContents = file_get_contents($iconPath);
-
-    return  str_replace('<svg', '<svg' . $attrString, $fileContents);
-}
-

 /**
  * Generate a URL with multiple parameters for sorting purposes.
  * Works out the logic to set the correct sorting direction
 /**
  * Generate a URL with multiple parameters for sorting purposes.
  * Works out the logic to set the correct sorting direction