Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use camel case in new variables

Browse Source 
[MAILPOET-2431]
This commit is contained in:
Jan Jakeš
2020-01-14 18:00:33 +01:00
committed by Jack Kitterhing
parent 7fb08a495c
commit f5927ea8ab
4 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/API/JSON/v1/Premium.php
View File

@ -18,35 +18,35 @@ class Premium extends APIEndpoint {
];
/** @var ServicesChecker */
private $services_checker;
private $servicesChecker;
/** @var WPFunctions */
private $wp;
public function __construct(
ServicesChecker $services_checker,
ServicesChecker $servicesChecker,
WPFunctions $wp
) {
$this->services_checker = $services_checker;
$this->servicesChecker = $servicesChecker;
$this->wp = $wp;
}
public function installPlugin() {
$premium_key_valid = $this->services_checker->isPremiumKeyValid(false);
if (!$premium_key_valid) {
$premiumKeyValid = $this->servicesChecker->isPremiumKeyValid(false);
if (!$premiumKeyValid) {
return $this->error($this->wp->__('Premium key is not valid.', 'mailpoet'));
}
$plugin_info = $this->wp->pluginsApi('plugin_information', [
$pluginInfo = $this->wp->pluginsApi('plugin_information', [
'slug' => self::PREMIUM_PLUGIN_SLUG,
]);
if (!$plugin_info || $plugin_info instanceof WP_Error) {
if (!$pluginInfo || $pluginInfo instanceof WP_Error) {
return $this->error($this->wp->__('Error when installing MailPoet Premium plugin.', 'mailpoet'));
}
$plugin_info = (array)$plugin_info;
$result = $this->wp->installPlugin($plugin_info['download_link']);
$pluginInfo = (array)$pluginInfo;
$result = $this->wp->installPlugin($pluginInfo['download_link']);
if ($result !== true) {
return $this->error($this->wp->__('Error when installing MailPoet Premium plugin.', 'mailpoet'));
}
@ -54,8 +54,8 @@ class Premium extends APIEndpoint {
}
public function activatePlugin() {
$premium_key_valid = $this->services_checker->isPremiumKeyValid(false);
if (!$premium_key_valid) {
$premiumKeyValid = $this->servicesChecker->isPremiumKeyValid(false);
if (!$premiumKeyValid) {
return $this->error($this->wp->__('Premium key is not valid.', 'mailpoet'));
}

6
lib/WP/Functions.php
View File

@ -590,12 +590,12 @@ class Functions {
/**
* @param string $plugin
* @param string $redirect
* @param bool $network_wide
* @param bool $networkWide
* @param bool $silent
* @return WP_Error|null
*/
public function activatePlugin($plugin, $redirect = '', $network_wide = false, $silent = false) {
return activate_plugin($plugin, $redirect, $network_wide, $silent);
public function activatePlugin($plugin, $redirect = '', $networkWide = false, $silent = false) {
return activate_plugin($plugin, $redirect, $networkWide, $silent);
}
/**

6
tests/_support/CleanupExtension.php
View File

@ -70,9 +70,9 @@ class CleanupExtension extends Extension { // phpcs:ignore PSR1.Classes.ClassDec
exec('rm -rf ' . self::MAILHOG_DATA_PATH . '/*', $output);
// ensure Premium plugin is not installed
$premium_plugin_path = ABSPATH . 'wp-content/plugins/mailpoet-premium';
if (file_exists($premium_plugin_path)) {
exec("rm -rf $premium_plugin_path", $output);
$premiumPluginPath = ABSPATH . 'wp-content/plugins/mailpoet-premium';
if (file_exists($premiumPluginPath)) {
exec("rm -rf $premiumPluginPath", $output);
}
// cleanup EntityManager for data factories that are using it

28
tests/unit/API/JSON/PremiumTest.php
View File

@ -11,7 +11,7 @@ use MailPoet\WP\Functions as WPFunctions;
class PremiumTest extends \MailPoetUnitTest {
public function testItInstallsPlugin() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(true),
]);
@ -22,13 +22,13 @@ class PremiumTest extends \MailPoetUnitTest {
'installPlugin' => Expected::once(true),
]);
$premium = new Premium($services_checker, $wp);
$premium = new Premium($servicesChecker, $wp);
$response = $premium->installPlugin();
expect($response)->isInstanceOf(SuccessResponse::class);
}
public function testInstallationFailsWhenKeyInvalid() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(false),
]);
@ -37,7 +37,7 @@ class PremiumTest extends \MailPoetUnitTest {
'installPlugin' => Expected::never(),
]);
$premium = new Premium($services_checker, $wp);
$premium = new Premium($servicesChecker, $wp);
$response = $premium->installPlugin();
expect($response)->isInstanceOf(ErrorResponse::class);
expect($response->getData()['errors'][0])->same([
@ -47,7 +47,7 @@ class PremiumTest extends \MailPoetUnitTest {
}
public function testInstallationFailsWhenNoPluginInfo() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(true),
]);
@ -56,7 +56,7 @@ class PremiumTest extends \MailPoetUnitTest {
'installPlugin' => Expected::never(),
]);
$premium = new Premium($services_checker, $wp);
$premium = new Premium($servicesChecker, $wp);
$response = $premium->installPlugin();
expect($response)->isInstanceOf(ErrorResponse::class);
expect($response->getData()['errors'][0])->same([
@ -66,7 +66,7 @@ class PremiumTest extends \MailPoetUnitTest {
}
public function testInstallationFailsOnError() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(true),
]);
@ -77,7 +77,7 @@ class PremiumTest extends \MailPoetUnitTest {
'installPlugin' => Expected::once(false),
]);
$premium = new Premium($services_checker, $wp);
$premium = new Premium($servicesChecker, $wp);
$response = $premium->installPlugin();
expect($response)->isInstanceOf(ErrorResponse::class);
expect($response->getData()['errors'][0])->same([
@ -87,7 +87,7 @@ class PremiumTest extends \MailPoetUnitTest {
}
public function testItActivatesPlugin() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(true),
]);
@ -95,17 +95,17 @@ class PremiumTest extends \MailPoetUnitTest {
'activatePlugin' => Expected::once(null),
]);
$premium = new Premium($services_checker, $wp);
$premium = new Premium($servicesChecker, $wp);
$response = $premium->activatePlugin();
expect($response)->isInstanceOf(SuccessResponse::class);
}
public function testActivationFailsWhenKeyInvalid() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(false),
]);
$premium = new Premium($services_checker, new WPFunctions());
$premium = new Premium($servicesChecker, new WPFunctions());
$response = $premium->activatePlugin();
expect($response)->isInstanceOf(ErrorResponse::class);
expect($response->getData()['errors'][0])->same([
@ -115,7 +115,7 @@ class PremiumTest extends \MailPoetUnitTest {
}
public function testActivationFailsOnError() {
$services_checker = $this->makeEmpty(ServicesChecker::class, [
$servicesChecker = $this->makeEmpty(ServicesChecker::class, [
'isPremiumKeyValid' => Expected::once(true),
]);
@ -123,7 +123,7 @@ class PremiumTest extends \MailPoetUnitTest {
'activatePlugin' => Expected::once('error'),
]);
$premium = new Premium($services_checker, $wp);
$premium = new Premium($servicesChecker, $wp);
$response = $premium->activatePlugin();
expect($response)->isInstanceOf(ErrorResponse::class);
expect($response->getData()['errors'][0])->same([