Update deprecated Twig code.

app/Support/Twig/General.php

@@ -27,16 +27,15 @@ use FireflyIII\Models\Account;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\User\UserRepositoryInterface;
 use League\CommonMark\CommonMarkConverter;
-use Log;
 use Route;
-use Twig_Extension;
-use Twig_SimpleFilter;
-use Twig_SimpleFunction;
+use Twig\Extension\AbstractExtension;
+use Twig\TwigFilter;
+use Twig\TwigFunction;
 
 /**
  * Class TwigSupport.
  */
-class General extends Twig_Extension
+class General extends AbstractExtension
 {
     /**
      * @return array
@@ -71,13 +70,13 @@ class General extends Twig_Extension
      * Will return "active" when a part of the route matches the argument.
      * ie. "accounts" will match "accounts.index".
      *
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function activeRoutePartial(): Twig_SimpleFunction
+    protected function activeRoutePartial(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'activeRoutePartial',
-            function (): string {
+            static function (): string {
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
                 $name  = Route::getCurrentRoute()->getName() ?? '';
@@ -94,11 +93,11 @@ class General extends Twig_Extension
      * This function will return "active" when the current route matches the first argument (even partly)
      * but, the variable $what has been set and matches the second argument.
      *
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function activeRoutePartialObjectType(): Twig_SimpleFunction
+    protected function activeRoutePartialObjectType(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'activeRoutePartialObjectType',
             static function ($context): string {
                 [, $route, $objectType] = func_get_args();
@@ -118,13 +117,13 @@ class General extends Twig_Extension
      * Will return "active" when the current route matches the given argument
      * exactly.
      *
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function activeRouteStrict(): Twig_SimpleFunction
+    protected function activeRouteStrict(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'activeRouteStrict',
-            function (): string {
+            static function (): string {
                 $args  = func_get_args();
                 $route = $args[0]; // name of the route.
 
@@ -140,11 +139,11 @@ class General extends Twig_Extension
     /**
      * Show account balance. Only used on the front page of Firefly III.
      *
-     * @return Twig_SimpleFilter
+     * @return TwigFilter
      */
-    protected function balance(): Twig_SimpleFilter
+    protected function balance(): TwigFilter
     {
-        return new Twig_SimpleFilter(
+        return new TwigFilter(
             'balance',
             static function (?Account $account): string {
                 if (null === $account) {
@@ -161,11 +160,11 @@ class General extends Twig_Extension
     /**
      * Formats a string as a thing by converting it to a Carbon first.
      *
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function formatDate(): Twig_SimpleFunction
+    protected function formatDate(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'formatDate',
             function (string $date, string $format): string {
                 $carbon = new Carbon($date);
@@ -178,13 +177,13 @@ class General extends Twig_Extension
     /**
      * Used to convert 1024 to 1kb etc.
      *
-     * @return Twig_SimpleFilter
+     * @return TwigFilter
      */
-    protected function formatFilesize(): Twig_SimpleFilter
+    protected function formatFilesize(): TwigFilter
     {
-        return new Twig_SimpleFilter(
+        return new TwigFilter(
             'filesize',
-            function (int $size): string {
+            static function (int $size): string {
                 // less than one GB, more than one MB
                 if ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {
                     return round($size / (1024 * 1024), 2) . ' MB';
@@ -201,11 +200,11 @@ class General extends Twig_Extension
     }
 
     /**
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function getMetaField(): Twig_SimpleFunction
+    protected function getMetaField(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'accountGetMetaField',
             static function (Account $account, string $field): string {
                 /** @var AccountRepositoryInterface $repository */
@@ -223,11 +222,11 @@ class General extends Twig_Extension
     /**
      * Will return true if the user is of role X.
      *
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function hasRole(): Twig_SimpleFunction
+    protected function hasRole(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'hasRole',
             static function (string $role): bool {
                 $repository = app(UserRepositoryInterface::class);
@@ -241,11 +240,11 @@ class General extends Twig_Extension
     }
 
     /**
-     * @return Twig_SimpleFilter
+     * @return TwigFilter
      */
-    protected function markdown(): Twig_SimpleFilter
+    protected function markdown(): TwigFilter
     {
-        return new Twig_SimpleFilter(
+        return new TwigFilter(
             'markdown',
             static function (string $text): string {
                 $converter = new CommonMarkConverter;
@@ -258,11 +257,11 @@ class General extends Twig_Extension
     /**
      * Show icon with attachment.
      *
-     * @return Twig_SimpleFilter
+     * @return TwigFilter
      */
-    protected function mimeIcon(): Twig_SimpleFilter
+    protected function mimeIcon(): TwigFilter
     {
-        return new Twig_SimpleFilter(
+        return new TwigFilter(
             'mimeIcon',
             static function (string $string): string {
                 switch ($string) {
@@ -337,11 +336,11 @@ class General extends Twig_Extension
     /**
      * Basic example thing for some views.
      *
-     * @return Twig_SimpleFunction
+     * @return TwigFunction
      */
-    protected function phpdate(): Twig_SimpleFunction
+    protected function phpdate(): TwigFunction
     {
-        return new Twig_SimpleFunction(
+        return new TwigFunction(
             'phpdate',
             static function (string $str): string {
                 return date($str);