Fix (some) property types in tests

Ethan3600 · Dec 29, 2023 · 0201856 · 0201856
1 parent 7ee8e60
commit 0201856
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 41 deletions.
diff --git a/Test/Integration/CleanRunningJobsTest.php b/Test/Integration/CleanRunningJobsTest.php
@@ -8,7 +8,7 @@
 use EthanYehuda\CronjobManager\Model\ErrorNotificationInterface;
 use EthanYehuda\CronjobManager\Test\Util\FakeClock;
 use Magento\Cron\Model\Schedule;
-use Magento\Framework\ObjectManager\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\Event;
@@ -23,9 +23,7 @@ class CleanRunningJobsTest extends TestCase
     protected const REMOTE_HOSTNAME = 'hostname.example.net';
     protected const DEAD_PID = 99999999;
 
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     /**

diff --git a/Test/Integration/ErrorNotificationEmailTest.php b/Test/Integration/ErrorNotificationEmailTest.php
@@ -8,9 +8,9 @@
 use Magento\Cron\Model\Schedule;
 use Magento\Framework\Mail\Message;
 use Magento\Framework\Mail\Template\TransportBuilder;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
-use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -19,19 +19,15 @@
  */
 class ErrorNotificationEmailTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     /**
      * @var ErrorNotificationEmail
      */
     private $errorNotificationEmail;
 
-    /**
-     * @var \Magento\TestFramework\Mail\Template\TransportBuilderMock
-     */
+    /** @var TransportBuilderMock */
     private $transportBuilder;
 
     protected function setUp(): void

diff --git a/Test/Integration/ErrorNotificationTest.php b/Test/Integration/ErrorNotificationTest.php
@@ -9,17 +9,17 @@
 use EthanYehuda\CronjobManager\Model\ClockInterface;
 use EthanYehuda\CronjobManager\Model\ErrorNotificationInterface;
 use EthanYehuda\CronjobManager\Model\ErrorNotificationEmail;
-use EthanYehuda\CronjobManager\Plugin\Cron\Model\ScheduleResourcePlugin;
 use EthanYehuda\CronjobManager\Test\Util\FakeClock;
 use EthanYehuda\CronjobManager\Test\Util\FakeJobConfig;
 use Magento\Cron\Model\ConfigInterface;
 use Magento\Cron\Model\Schedule;
 use Magento\Cron\Observer\ProcessCronQueueObserver;
 use Magento\Framework\Api\SearchCriteria;
-use Magento\Framework\Event;
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\DateTime\DateTime;
-use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -31,9 +31,7 @@ class ErrorNotificationTest extends TestCase
 {
     protected const NOW = '2019-02-09 18:33:00';
 
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     /**
@@ -51,14 +49,10 @@ class ErrorNotificationTest extends TestCase
      */
     private $clock;
 
-    /**
-     * @var \Magento\Framework\App\CacheInterface
-     */
+    /** @var CacheInterface */
     private $cache;
 
-    /**
-     * @var ErrorNotificationInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
+    /** @var (ErrorNotificationInterface&MockObject)|MockObject */
     private $errorNotification;
 
     /**
@@ -82,7 +76,7 @@ protected function setUp(): void
         $this->setUpMocks();
         $this->scheduleManagement = $this->objectManager->get(ScheduleManagementInterface::class);
         $this->scheduleRepository = $this->objectManager->get(ScheduleRepositoryInterface::class);
-        $this->cache = $this->objectManager->get(\Magento\Framework\App\CacheInterface::class);
+        $this->cache = $this->objectManager->get(CacheInterface::class);
         $this->processCronQueueObserver = $this->objectManager->get(ProcessCronQueueObserver::class);
         $this->cleanSchedule();
     }

diff --git a/Test/Integration/HostnameTest.php b/Test/Integration/HostnameTest.php
@@ -6,7 +6,7 @@
 
 use Magento\Cron\Model\ResourceModel\Schedule as ScheduleResource;
 use Magento\Cron\Model\Schedule;
-use Magento\Framework\ObjectManager\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -16,9 +16,7 @@
  */
 class HostnameTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     protected $objectManager;
 
     /**

diff --git a/Test/Integration/Model/ScheduleManagementTest.php b/Test/Integration/Model/ScheduleManagementTest.php
@@ -7,8 +7,8 @@
 use EthanYehuda\CronjobManager\Api\ScheduleManagementInterface;
 use Magento\Cron\Model\Schedule;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -21,9 +21,7 @@ class ScheduleManagementTest extends TestCase
      */
     private $scheduleManagement;
 
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     protected const NOW = '2019-02-09 18:33:00';

diff --git a/Test/Integration/ProcessIdTest.php b/Test/Integration/ProcessIdTest.php
@@ -5,7 +5,7 @@
 namespace EthanYehuda\CronjobManager\Test\Integration;
 
 use Magento\Cron\Model\Schedule;
-use Magento\Framework\ObjectManager\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -15,9 +15,7 @@
  */
 class ProcessIdTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     protected function setUp(): void

diff --git a/Test/Integration/ProcessKillRequestsTest.php b/Test/Integration/ProcessKillRequestsTest.php
@@ -11,7 +11,7 @@
 use EthanYehuda\CronjobManager\Test\Util\FakeClock;
 use Magento\Cron\Model\Schedule;
 use Magento\Framework\Event;
-use Magento\Framework\ObjectManager\ObjectManager;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -30,9 +30,7 @@ class ProcessKillRequestsTest extends TestCase
      */
     private $childPid = 0;
 
-    /**
-     * @var ObjectManager
-     */
+    /** @var ObjectManagerInterface */
     private $objectManager;
 
     /**

diff --git a/Test/Unit/Console/Command/RunjobTest.php b/Test/Unit/Console/Command/RunjobTest.php
@@ -14,7 +14,7 @@
 
 class RunjobTest extends TestCase
 {
-    /** @var Runner|(Runner&MockObject)|MockObject */
+    /** @var (Runner&MockObject)|MockObject */
     protected $runner;
 
     protected function setUp(): void