From e85b969e11e6b5ab5ed6fba16d693a38ba48bd9d Mon Sep 17 00:00:00 2001
From: Alexey Stoletniy <stoletniy@gmail.com>
Date: Tue, 9 May 2017 09:12:20 +0300
Subject: [PATCH] Rename initApi() to init() in workers [PREMIUM-4]

---
 lib/Cron/Workers/Bounce.php                            |  2 +-
 lib/Cron/Workers/KeyCheck/KeyCheckWorker.php           |  2 +-
 lib/Cron/Workers/SimpleWorker.php                      | 10 +++-------
 tests/unit/Cron/Workers/BounceTest.php                 |  2 +-
 .../unit/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php  |  2 +-
 .../Cron/Workers/SimpleWorkerMockImplementation.php    |  2 +-
 tests/unit/Cron/Workers/SimpleWorkerTest.php           |  4 ++--
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/lib/Cron/Workers/Bounce.php b/lib/Cron/Workers/Bounce.php
index 9a42d2de98..3b1330ca04 100644
--- a/lib/Cron/Workers/Bounce.php
+++ b/lib/Cron/Workers/Bounce.php
@@ -21,7 +21,7 @@ class Bounce extends SimpleWorker {
 
   public $api;
 
-  function initApi() {
+  function init() {
     if(!$this->api) {
       $mailer_config = Mailer::getMailerConfig();
       $this->api = new API($mailer_config['mailpoet_api_key']);
diff --git a/lib/Cron/Workers/KeyCheck/KeyCheckWorker.php b/lib/Cron/Workers/KeyCheck/KeyCheckWorker.php
index 60945d20ba..5febe5657b 100644
--- a/lib/Cron/Workers/KeyCheck/KeyCheckWorker.php
+++ b/lib/Cron/Workers/KeyCheck/KeyCheckWorker.php
@@ -13,7 +13,7 @@ abstract class KeyCheckWorker extends SimpleWorker {
 
   public $bridge;
 
-  function initApi() {
+  function init() {
     if(!$this->bridge) {
       $this->bridge = new Bridge();
     }
diff --git a/lib/Cron/Workers/SimpleWorker.php b/lib/Cron/Workers/SimpleWorker.php
index b94b23f555..b860f2369f 100644
--- a/lib/Cron/Workers/SimpleWorker.php
+++ b/lib/Cron/Workers/SimpleWorker.php
@@ -19,12 +19,6 @@ abstract class SimpleWorker {
     CronHelper::enforceExecutionLimit($this->timer);
   }
 
-  function init() {
-    if(is_callable(array($this, 'initApi'))) {
-      $this->initApi();
-    }
-  }
-
   function checkProcessingRequirements() {
     return true;
   }
@@ -34,7 +28,9 @@ abstract class SimpleWorker {
       return false;
     }
 
-    $this->init();
+    if(is_callable(array($this, 'init'))) {
+      $this->init();
+    }
 
     $scheduled_queues = self::getScheduledQueues();
     $running_queues = self::getRunningQueues();
diff --git a/tests/unit/Cron/Workers/BounceTest.php b/tests/unit/Cron/Workers/BounceTest.php
index e227184cab..659c482a4f 100644
--- a/tests/unit/Cron/Workers/BounceTest.php
+++ b/tests/unit/Cron/Workers/BounceTest.php
@@ -38,7 +38,7 @@ class BounceTest extends MailPoetTest {
   function testItCanInitializeBridgeAPI() {
     $this->setMailPoetSendingMethod();
     $worker = new Bounce(microtime(true));
-    $worker->initApi();
+    $worker->init();
     expect($worker->api instanceof API)->true();
   }
 
diff --git a/tests/unit/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php b/tests/unit/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php
index d0d3196dfc..325c23de97 100644
--- a/tests/unit/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php
+++ b/tests/unit/Cron/Workers/KeyCheck/KeyCheckWorkerTest.php
@@ -15,7 +15,7 @@ class KeyCheckWorkerTest extends MailPoetTest {
   }
 
   function testItCanInitializeBridgeAPI() {
-    $this->worker->initApi();
+    $this->worker->init();
     expect($this->worker->bridge instanceof Bridge)->true();
   }
 
diff --git a/tests/unit/Cron/Workers/SimpleWorkerMockImplementation.php b/tests/unit/Cron/Workers/SimpleWorkerMockImplementation.php
index 26301c8788..df8f7ca84a 100644
--- a/tests/unit/Cron/Workers/SimpleWorkerMockImplementation.php
+++ b/tests/unit/Cron/Workers/SimpleWorkerMockImplementation.php
@@ -6,7 +6,7 @@ if(!defined('ABSPATH')) exit;
 class MockSimpleWorker extends SimpleWorker {
   const TASK_TYPE = 'mock_simple_worker';
 
-  function initApi() {
+  function init() {
     // to be mocked
   }
 }
diff --git a/tests/unit/Cron/Workers/SimpleWorkerTest.php b/tests/unit/Cron/Workers/SimpleWorkerTest.php
index 57b7f08ea2..9fed1a824e 100644
--- a/tests/unit/Cron/Workers/SimpleWorkerTest.php
+++ b/tests/unit/Cron/Workers/SimpleWorkerTest.php
@@ -116,10 +116,10 @@ class SimpleWorkerTest extends MailPoetTest {
     expect($worker->process())->false();
   }
 
-  function testItCanInitAPIBeforeProcessing() {
+  function testItCanInitBeforeProcessing() {
     $worker = Stub::make(
       $this->worker,
-      array('initApi' => Stub::once()),
+      array('init' => Stub::once()),
       $this
     );
     $worker->process();