From 53db865946f9b3f65e9593dbdd9fd5c23351abda Mon Sep 17 00:00:00 2001
From: Pierre du Plessis <pierre@pcservice.co.za>
Date: Mon, 4 Jul 2022 18:36:45 +0200
Subject: [PATCH] Various small fixes

---
 Command/CreateNotifyTokenCommand.php | 2 +-
 Command/DebugGatewayCommand.php      | 2 +-
 Controller/PayumController.php       | 2 +-
 UPGRADE.md                           | 5 -----
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Command/CreateNotifyTokenCommand.php b/Command/CreateNotifyTokenCommand.php
index 90bed7a6..4021137a 100644
--- a/Command/CreateNotifyTokenCommand.php
+++ b/Command/CreateNotifyTokenCommand.php
@@ -30,7 +30,7 @@ public function __construct(Payum $payum)
     protected function configure(): void
     {
         $this
-            ->setName(self::$defaultName)
+            ->setName(static::$defaultName)
             ->addArgument('gateway-name', InputArgument::REQUIRED, 'The gateway name associated with the token')
             ->addOption('model-class', null, InputOption::VALUE_OPTIONAL, 'The model class associated with the token')
             ->addOption('model-id', null, InputOption::VALUE_OPTIONAL, 'The model id associated with the token')
diff --git a/Command/DebugGatewayCommand.php b/Command/DebugGatewayCommand.php
index 446e1cd4..4f14bbb0 100644
--- a/Command/DebugGatewayCommand.php
+++ b/Command/DebugGatewayCommand.php
@@ -32,7 +32,7 @@ public function __construct(Payum $payum)
     protected function configure(): void
     {
         $this
-            ->setName(self::$defaultName)
+            ->setName(static::$defaultName)
             ->setAliases(['payum:gateway:debug'])
             ->addArgument('gateway-name', InputArgument::OPTIONAL, 'The gateway name you want to get information about.')
             ->addOption('show-supports', null, InputOption::VALUE_NONE, 'Show what actions supports.')
diff --git a/Controller/PayumController.php b/Controller/PayumController.php
index de33c7d8..09a23238 100644
--- a/Controller/PayumController.php
+++ b/Controller/PayumController.php
@@ -18,7 +18,7 @@ public function __construct(?Payum $payum = null)
         if ($payum === null) {
             @trigger_error(
                 sprintf(
-                    '%s requires an instance of %s asd the first argument. Not passing this object is deprecated and it will be required in payum/payum-bundle 2.0.',
+                    '%s requires an instance of %s asd the first argument. Not passing this object is deprecated and it will be required in payum/payum-bundle 3.0.',
                     __METHOD__,
                     Payum::class
                 ),
diff --git a/UPGRADE.md b/UPGRADE.md
index 1788cb39..e0706cc3 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -2,11 +2,6 @@
 
 Library [upgrades](https://github.com/Payum/Payum/blob/master/UPGRADE.md).
 
-## 2.4 to 2.5
- 
-* deprecated function `PayumController->getHttpRequestVerifier()` removed. Use `payum->getHttpRequestVerifier()`
-* deprecated function `PayumController->getTokenFactory()` removed. Use `payum->getTokenFactory()`
-
 ## 2.0 to 2.1
 
 * `payum.http_client` service was removed. Use gateway's config to overwrite it.