From: Dan Brown <redacted>
Date: Sat, 3 Jul 2021 11:02:13 +0000 (+0100)
Subject: Merge branch 'v21.05.x'
X-Git-Tag: v21.08~1^2~28
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/1c43602f4bed60a84f47735ca8bc4a399018e013?ds=inline;hp=-c

Merge branch 'v21.05.x'
---

1c43602f4bed60a84f47735ca8bc4a399018e013
diff --combined app/Theming/ThemeService.php
index 6fe80559e,44605bf32..602abaf1c
--- a/app/Theming/ThemeService.php
+++ b/app/Theming/ThemeService.php
@@@ -1,6 -1,4 +1,6 @@@
 -<?php namespace BookStack\Theming;
 +<?php
 +
 +namespace BookStack\Theming;
  
  use BookStack\Auth\Access\SocialAuthService;
  
@@@ -28,7 -26,6 +28,7 @@@ class ThemeServic
       *
       * If a callback returns a non-null value, this method will
       * stop and return that value itself.
 +     *
       * @return mixed
       */
      public function dispatch(string $event, ...$args)
@@@ -39,7 -36,6 +39,7 @@@
                  return $result;
              }
          }
 +
          return null;
      }
  
@@@ -49,7 -45,7 +49,7 @@@
      public function readThemeActions()
      {
          $themeActionsFile = theme_path('functions.php');
-         if (file_exists($themeActionsFile)) {
+         if ($themeActionsFile && file_exists($themeActionsFile)) {
              require $themeActionsFile;
          }
      }
@@@ -62,4 -58,4 +62,4 @@@
          $socialAuthService = app()->make(SocialAuthService::class);
          $socialAuthService->addSocialDriver($driverName, $config, $socialiteHandler, $configureForRedirect);
      }
 -}
 +}
diff --combined app/Translation/FileLoader.php
index 1ed7b06cc,e65146677..775eefc47
--- a/app/Translation/FileLoader.php
+++ b/app/Translation/FileLoader.php
@@@ -1,6 -1,4 +1,6 @@@
 -<?php namespace BookStack\Translation;
 +<?php
 +
 +namespace BookStack\Translation;
  
  use Illuminate\Translation\FileLoader as BaseLoader;
  
@@@ -10,11 -8,9 +10,11 @@@ class FileLoader extends BaseLoade
       * Load the messages for the given locale.
       * Extends Laravel's translation FileLoader to look in multiple directories
       * so that we can load in translation overrides from the theme file if wanted.
 -     * @param  string  $locale
 -     * @param  string  $group
 -     * @param  string|null  $namespace
 +     *
 +     * @param string      $locale
 +     * @param string      $group
 +     * @param string|null $namespace
 +     *
       * @return array
       */
      public function load($locale, $group, $namespace = null)
@@@ -24,9 -20,9 +24,9 @@@
          }
  
          if (is_null($namespace) || $namespace === '*') {
-             $themeTranslations = $this->loadPath(theme_path('lang'), $locale, $group);
-             $originalTranslations = $this->loadPath($this->path, $locale, $group);
- 
+             $themePath = theme_path('lang');
+             $themeTranslations = $themePath ? $this->loadPath($themePath, $locale, $group) : [];
+             $originalTranslations =  $this->loadPath($this->path, $locale, $group);
              return array_merge($originalTranslations, $themeTranslations);
          }
  
diff --combined app/helpers.php
index 618c71bee,a5a04f113..9edc22c40
--- a/app/helpers.php
+++ b/app/helpers.php
@@@ -7,7 -7,6 +7,7 @@@ use BookStack\Settings\SettingService
  
  /**
   * Get the path to a versioned file.
 + *
   * @throws Exception
   */
  function versioned_asset(string $file = ''): string
@@@ -25,7 -24,6 +25,7 @@@
      }
  
      $path = $file . '?version=' . urlencode($version) . $additional;
 +
      return url($path);
  }
  
@@@ -66,7 -64,6 +66,7 @@@ function userCan(string $permission, Mo
  
      // Check permission on ownable item
      $permissionService = app(PermissionService::class);
 +
      return $permissionService->checkOwnableUserAccess($ownable, $permission);
  }
  
@@@ -77,13 -74,11 +77,13 @@@
  function userCanOnAny(string $permission, string $entityClass = null): bool
  {
      $permissionService = app(PermissionService::class);
 +
      return $permissionService->checkUserHasPermissionOnAnything($permission, $entityClass);
  }
  
  /**
   * Helper to access system settings.
 + *
   * @return mixed|SettingService
   */
  function setting(string $key = null, $default = null)
@@@ -99,16 -94,18 +99,18 @@@
  
  /**
   * Get a path to a theme resource.
+  * Returns null if a theme is not configured and
+  * therefore a full path is not available for use.
   */
- function theme_path(string $path = ''): string
+ function theme_path(string $path = ''): ?string
  {
      $theme = config('view.theme');
  
      if (!$theme) {
-         return '';
+         return null;
      }
  
 -    return base_path('themes/' . $theme .($path ? DIRECTORY_SEPARATOR.$path : $path));
 +    return base_path('themes/' . $theme . ($path ? DIRECTORY_SEPARATOR . $path : $path));
  }
  
  /**
@@@ -127,7 -124,7 +129,7 @@@ function icon(string $name, array $attr
      ], $attrs);
      $attrString = ' ';
      foreach ($attrs as $attrName => $attr) {
 -        $attrString .=  $attrName . '="' . $attr . '" ';
 +        $attrString .= $attrName . '="' . $attr . '" ';
      }
  
      $iconPath = resource_path('icons/' . $name . '.svg');
@@@ -135,12 -132,11 +137,12 @@@
  
      if ($themeIconPath && file_exists($themeIconPath)) {
          $iconPath = $themeIconPath;
 -    } else if (!file_exists($iconPath)) {
 +    } elseif (!file_exists($iconPath)) {
          return '';
      }
  
      $fileContents = file_get_contents($iconPath);
 +
      return  str_replace('<svg', '<svg' . $attrString, $fileContents);
  }
  
diff --combined composer.lock
index 0647038cc,d9be2f6f5..29ec67fed
--- a/composer.lock
+++ b/composer.lock
@@@ -4,20 -4,20 +4,20 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
 -    "content-hash": "eb3108f1a3a757df9b9a3a4f82b5db3b",
 +    "content-hash": "d1109d0dc4a6ab525cdbf64ed21f6dd4",
      "packages": [
          {
              "name": "aws/aws-sdk-php",
-             "version": "3.185.2",
+             "version": "3.185.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/aws/aws-sdk-php.git",
-                 "reference": "0e6ece3f9c4ab26bb20183c697fd36e1d55c1053"
+                 "reference": "35310302912fdc3b4a0e829b84424c41e3fd9727"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0e6ece3f9c4ab26bb20183c697fd36e1d55c1053",
-                 "reference": "0e6ece3f9c4ab26bb20183c697fd36e1d55c1053",
+                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/35310302912fdc3b4a0e829b84424c41e3fd9727",
+                 "reference": "35310302912fdc3b4a0e829b84424c41e3fd9727",
                  "shasum": ""
              },
              "require": {
@@@ -92,9 -92,9 +92,9 @@@
              "support": {
                  "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                  "issues": "https://github.com/aws/aws-sdk-php/issues",
-                 "source": "https://github.com/aws/aws-sdk-php/tree/3.185.2"
+                 "source": "https://github.com/aws/aws-sdk-php/tree/3.185.6"
              },
-             "time": "2021-06-25T18:19:14+00:00"
+             "time": "2021-07-02T18:13:18+00:00"
          },
          {
              "name": "barryvdh/laravel-dompdf",
@@@ -2118,95 -2118,6 +2118,95 @@@
              },
              "time": "2020-10-08T18:58:37+00:00"
          },
 +        {
 +            "name": "league/html-to-markdown",
 +            "version": "5.0.0",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/thephpleague/html-to-markdown.git",
 +                "reference": "c4dbebbebe0fe454b6b38e6c683a977615bd7dc2"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/c4dbebbebe0fe454b6b38e6c683a977615bd7dc2",
 +                "reference": "c4dbebbebe0fe454b6b38e6c683a977615bd7dc2",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "ext-dom": "*",
 +                "ext-xml": "*",
 +                "php": "^7.2.5 || ^8.0"
 +            },
 +            "require-dev": {
 +                "mikehaertl/php-shellcommand": "^1.1.0",
 +                "phpstan/phpstan": "^0.12.82",
 +                "phpunit/phpunit": "^8.5 || ^9.2",
 +                "scrutinizer/ocular": "^1.6",
 +                "unleashedtech/php-coding-standard": "^2.7",
 +                "vimeo/psalm": "^4.6"
 +            },
 +            "bin": [
 +                "bin/html-to-markdown"
 +            ],
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "5.1-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "League\\HTMLToMarkdown\\": "src/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Colin O'Dell",
 +                    "email": "colinodell@gmail.com",
 +                    "homepage": "https://www.colinodell.com",
 +                    "role": "Lead Developer"
 +                },
 +                {
 +                    "name": "Nick Cernis",
 +                    "email": "nick@cern.is",
 +                    "homepage": "http://modernnerd.net",
 +                    "role": "Original Author"
 +                }
 +            ],
 +            "description": "An HTML-to-markdown conversion helper for PHP",
 +            "homepage": "https://github.com/thephpleague/html-to-markdown",
 +            "keywords": [
 +                "html",
 +                "markdown"
 +            ],
 +            "support": {
 +                "issues": "https://github.com/thephpleague/html-to-markdown/issues",
 +                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.0.0"
 +            },
 +            "funding": [
 +                {
 +                    "url": "https://www.colinodell.com/sponsor",
 +                    "type": "custom"
 +                },
 +                {
 +                    "url": "https://www.paypal.me/colinpodell/10.00",
 +                    "type": "custom"
 +                },
 +                {
 +                    "url": "https://github.com/colinodell",
 +                    "type": "github"
 +                },
 +                {
 +                    "url": "https://www.patreon.com/colinodell",
 +                    "type": "patreon"
 +                }
 +            ],
 +            "time": "2021-03-29T01:29:08+00:00"
 +        },
          {
              "name": "league/mime-type-detection",
              "version": "1.7.0",
@@@ -2497,16 -2408,16 +2497,16 @@@
          },
          {
              "name": "nesbot/carbon",
-             "version": "2.49.0",
+             "version": "2.50.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/briannesbitt/Carbon.git",
-                 "reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee"
+                 "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/93d9db91c0235c486875d22f1e08b50bdf3e6eee",
-                 "reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee",
+                 "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
+                 "reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
                  "shasum": ""
              },
              "require": {
@@@ -2558,15 -2469,15 +2558,15 @@@
                  {
                      "name": "Brian Nesbitt",
                      "email": "brian@nesbot.com",
-                     "homepage": "http://nesbot.com"
+                     "homepage": "https://markido.com"
                  },
                  {
                      "name": "kylekatarnls",
-                     "homepage": "http://github.com/kylekatarnls"
+                     "homepage": "https://github.com/kylekatarnls"
                  }
              ],
              "description": "An API extension for DateTime that supports 281 different languages.",
-             "homepage": "http://carbon.nesbot.com",
+             "homepage": "https://carbon.nesbot.com",
              "keywords": [
                  "date",
                  "datetime",
@@@ -2586,7 -2497,7 +2586,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-06-02T07:31:40+00:00"
+             "time": "2021-06-28T22:38:45+00:00"
          },
          {
              "name": "nunomaduro/collision",
@@@ -4161,16 -4072,16 +4161,16 @@@
          },
          {
              "name": "symfony/console",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/console.git",
-                 "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095"
+                 "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/console/zipball/a62acecdf5b50e314a4f305cd01b5282126f3095",
-                 "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095",
+                 "url": "https://api.github.com/repos/symfony/console/zipball/9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
+                 "reference": "9aa1eb46c1b12fada74dc0c529e93d1ccef22576",
                  "shasum": ""
              },
              "require": {
@@@ -4230,7 -4141,7 +4230,7 @@@
              "description": "Eases the creation of beautiful and testable command line interfaces",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/console/tree/v4.4.25"
+                 "source": "https://github.com/symfony/console/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -4246,7 -4157,7 +4246,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-26T11:20:16+00:00"
+             "time": "2021-06-06T09:12:27+00:00"
          },
          {
              "name": "symfony/css-selector",
@@@ -4451,16 -4362,16 +4451,16 @@@
          },
          {
              "name": "symfony/error-handler",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/error-handler.git",
-                 "reference": "310a756cec00d29d89a08518405aded046a54a8b"
+                 "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/error-handler/zipball/310a756cec00d29d89a08518405aded046a54a8b",
-                 "reference": "310a756cec00d29d89a08518405aded046a54a8b",
+                 "url": "https://api.github.com/repos/symfony/error-handler/zipball/4001f01153d0eb5496fe11d8c76d1e56b47fdb88",
+                 "reference": "4001f01153d0eb5496fe11d8c76d1e56b47fdb88",
                  "shasum": ""
              },
              "require": {
@@@ -4500,7 -4411,7 +4500,7 @@@
              "description": "Provides tools to manage errors and ease debugging PHP code",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/error-handler/tree/v4.4.25"
+                 "source": "https://github.com/symfony/error-handler/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -4516,7 -4427,7 +4516,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-26T17:39:37+00:00"
+             "time": "2021-06-24T07:57:22+00:00"
          },
          {
              "name": "symfony/event-dispatcher",
@@@ -4821,16 -4732,16 +4821,16 @@@
          },
          {
              "name": "symfony/http-foundation",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/http-foundation.git",
-                 "reference": "0c79d5a65ace4fe66e49702658c024a419d2438b"
+                 "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0c79d5a65ace4fe66e49702658c024a419d2438b",
-                 "reference": "0c79d5a65ace4fe66e49702658c024a419d2438b",
+                 "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8759ed5c27c2a8a47cb60f367f4be6727f08d58b",
+                 "reference": "8759ed5c27c2a8a47cb60f367f4be6727f08d58b",
                  "shasum": ""
              },
              "require": {
@@@ -4869,7 -4780,7 +4869,7 @@@
              "description": "Defines an object-oriented layer for the HTTP specification",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/http-foundation/tree/v4.4.25"
+                 "source": "https://github.com/symfony/http-foundation/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -4885,20 -4796,20 +4885,20 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-26T11:20:16+00:00"
+             "time": "2021-06-26T21:56:04+00:00"
          },
          {
              "name": "symfony/http-kernel",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/http-kernel.git",
-                 "reference": "3795165596fe81a52296b78c9aae938d434069cc"
+                 "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3795165596fe81a52296b78c9aae938d434069cc",
-                 "reference": "3795165596fe81a52296b78c9aae938d434069cc",
+                 "url": "https://api.github.com/repos/symfony/http-kernel/zipball/e08b2fb8a6eedd81c70522e514bad9b2c1fff881",
+                 "reference": "e08b2fb8a6eedd81c70522e514bad9b2c1fff881",
                  "shasum": ""
              },
              "require": {
@@@ -4973,7 -4884,7 +4973,7 @@@
              "description": "Provides a structured process for converting a Request into a Response",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/http-kernel/tree/v4.4.25"
+                 "source": "https://github.com/symfony/http-kernel/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -4989,7 -4900,7 +4989,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-06-01T07:12:08+00:00"
+             "time": "2021-06-30T08:18:06+00:00"
          },
          {
              "name": "symfony/mime",
@@@ -5724,16 -5635,16 +5724,16 @@@
          },
          {
              "name": "symfony/process",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/process.git",
-                 "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9"
+                 "reference": "7e812c84c3f2dba173d311de6e510edf701685a8"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/process/zipball/cd61e6dd273975c6625316de9d141ebd197f93c9",
-                 "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9",
+                 "url": "https://api.github.com/repos/symfony/process/zipball/7e812c84c3f2dba173d311de6e510edf701685a8",
+                 "reference": "7e812c84c3f2dba173d311de6e510edf701685a8",
                  "shasum": ""
              },
              "require": {
@@@ -5765,7 -5676,7 +5765,7 @@@
              "description": "Executes commands in sub-processes",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/process/tree/v4.4.25"
+                 "source": "https://github.com/symfony/process/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -5781,7 -5692,7 +5781,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-26T11:20:16+00:00"
+             "time": "2021-06-09T14:57:04+00:00"
          },
          {
              "name": "symfony/routing",
@@@ -5952,16 -5863,16 +5952,16 @@@
          },
          {
              "name": "symfony/translation",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/translation.git",
-                 "reference": "dfe132c5c6d89f90ce7f961742cc532e9ca16dd4"
+                 "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/translation/zipball/dfe132c5c6d89f90ce7f961742cc532e9ca16dd4",
-                 "reference": "dfe132c5c6d89f90ce7f961742cc532e9ca16dd4",
+                 "url": "https://api.github.com/repos/symfony/translation/zipball/2f7fa60b8d10ca71c30dc46b0870143183a8f131",
+                 "reference": "2f7fa60b8d10ca71c30dc46b0870143183a8f131",
                  "shasum": ""
              },
              "require": {
@@@ -6020,7 -5931,7 +6020,7 @@@
              "description": "Provides tools to internationalize your application",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/translation/tree/v4.4.25"
+                 "source": "https://github.com/symfony/translation/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -6036,7 -5947,7 +6036,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-26T17:39:37+00:00"
+             "time": "2021-06-06T08:51:46+00:00"
          },
          {
              "name": "symfony/translation-contracts",
@@@ -6118,16 -6029,16 +6118,16 @@@
          },
          {
              "name": "symfony/var-dumper",
-             "version": "v4.4.25",
+             "version": "v4.4.26",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/var-dumper.git",
-                 "reference": "31ea689a8e7d2410016b0d25fc15a1ba05a6e2e0"
+                 "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/var-dumper/zipball/31ea689a8e7d2410016b0d25fc15a1ba05a6e2e0",
-                 "reference": "31ea689a8e7d2410016b0d25fc15a1ba05a6e2e0",
+                 "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a586efdf2aa832d05b9249e9115d24f6a2691160",
+                 "reference": "a586efdf2aa832d05b9249e9115d24f6a2691160",
                  "shasum": ""
              },
              "require": {
@@@ -6187,7 -6098,7 +6187,7 @@@
                  "dump"
              ],
              "support": {
-                 "source": "https://github.com/symfony/var-dumper/tree/v4.4.25"
+                 "source": "https://github.com/symfony/var-dumper/tree/v4.4.26"
              },
              "funding": [
                  {
@@@ -6203,7 -6114,7 +6203,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-27T09:48:32+00:00"
+             "time": "2021-06-17T06:35:48+00:00"
          },
          {
              "name": "tijsverkoyen/css-to-inline-styles",
@@@ -9480,6 -9391,62 +9480,6 @@@
              },
              "time": "2020-07-07T18:42:57+00:00"
          },
 -        {
 -            "name": "squizlabs/php_codesniffer",
 -            "version": "3.6.0",
 -            "source": {
 -                "type": "git",
 -                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
 -                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
 -            },
 -            "dist": {
 -                "type": "zip",
 -                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
 -                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
 -                "shasum": ""
 -            },
 -            "require": {
 -                "ext-simplexml": "*",
 -                "ext-tokenizer": "*",
 -                "ext-xmlwriter": "*",
 -                "php": ">=5.4.0"
 -            },
 -            "require-dev": {
 -                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
 -            },
 -            "bin": [
 -                "bin/phpcs",
 -                "bin/phpcbf"
 -            ],
 -            "type": "library",
 -            "extra": {
 -                "branch-alias": {
 -                    "dev-master": "3.x-dev"
 -                }
 -            },
 -            "notification-url": "https://packagist.org/downloads/",
 -            "license": [
 -                "BSD-3-Clause"
 -            ],
 -            "authors": [
 -                {
 -                    "name": "Greg Sherwood",
 -                    "role": "lead"
 -                }
 -            ],
 -            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
 -            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
 -            "keywords": [
 -                "phpcs",
 -                "standards"
 -            ],
 -            "support": {
 -                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
 -                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
 -                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
 -            },
 -            "time": "2021-04-09T00:54:41+00:00"
 -        },
          {
              "name": "symfony/dom-crawler",
              "version": "v4.4.25",
@@@ -9555,16 -9522,16 +9555,16 @@@
          },
          {
              "name": "symfony/filesystem",
-             "version": "v5.3.0",
+             "version": "v5.3.3",
              "source": {
                  "type": "git",
                  "url": "https://github.com/symfony/filesystem.git",
-                 "reference": "348116319d7fb7d1faa781d26a48922428013eb2"
+                 "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/symfony/filesystem/zipball/348116319d7fb7d1faa781d26a48922428013eb2",
-                 "reference": "348116319d7fb7d1faa781d26a48922428013eb2",
+                 "url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9",
+                 "reference": "19b71c8f313b411172dd5f470fd61f24466d79a9",
                  "shasum": ""
              },
              "require": {
@@@ -9597,7 -9564,7 +9597,7 @@@
              "description": "Provides basic utilities for the filesystem",
              "homepage": "https://symfony.com",
              "support": {
-                 "source": "https://github.com/symfony/filesystem/tree/v5.3.0"
+                 "source": "https://github.com/symfony/filesystem/tree/v5.3.3"
              },
              "funding": [
                  {
@@@ -9613,7 -9580,7 +9613,7 @@@
                      "type": "tidelift"
                  }
              ],
-             "time": "2021-05-26T17:43:10+00:00"
+             "time": "2021-06-30T07:27:52+00:00"
          },
          {
              "name": "theseer/tokenizer",