Fix tests, code typos and style

lib/Config/AccessControl.php

@@ -69,6 +69,7 @@ class AccessControl {
     return array(
       self::PERMISSION_ACCESS_PLUGIN_ADMIN => WPFunctions::get()->__('Admin menu item', 'mailpoet'),
       self::PERMISSION_MANAGE_SETTINGS => WPFunctions::get()->__('Manage settings', 'mailpoet'),
+      self::PERMISSION_MANAGE_USER_FLAGS => WPFunctions::get()->__('Manage user flags', 'mailpoet'),
       self::PERMISSION_MANAGE_EMAILS => WPFunctions::get()->__('Manage emails', 'mailpoet'),
       self::PERMISSION_MANAGE_SUBSCRIBERS => WPFunctions::get()->__('Manage subscribers', 'mailpoet'),
       self::PERMISSION_MANAGE_FORMS => WPFunctions::get()->__('Manage forms', 'mailpoet'),

lib/Config/Populator.php

@@ -10,6 +10,7 @@ use MailPoet\Models\Segment;
 use MailPoet\Models\StatisticsForms;
 use MailPoet\Models\Subscriber;
 use MailPoet\Models\UserFlag;
+use MailPoet\Models\Setting;
 use MailPoet\Segments\WP;
 use MailPoet\Settings\Pages;
 use MailPoet\Settings\SettingsController;
@@ -240,7 +241,7 @@ class Populator {
     
     $prefix = 'user_seen_editor_tutorial';
     $prefix_length = strlen($prefix);
-    $users_seen_editor_tutorial = Settings::whereLike('name', $prefix . '%')->findMany();
+    $users_seen_editor_tutorial = Setting::whereLike('name', $prefix . '%')->findMany();
     if (!empty($users_seen_editor_tutorial)) {
       foreach ($users_seen_editor_tutorial as $setting) {
         $user_id = substr($setting->name, $prefix_length);
@@ -250,7 +251,7 @@ class Populator {
           'value' => $setting->value,
         ]);
       }
-      Settings::whereLike('name', $prefix . '%')->deleteMany();
+      Setting::whereLike('name', $prefix . '%')->deleteMany();
     }
   }
 

lib/Models/Model.php

@@ -58,6 +58,7 @@ if (!defined('ABSPATH')) exit;
  * @method $this whereIdIn($ids)
  * @method static static whereIdIn($ids)
  * @method $this whereLike($column_name, $value=null)
+ * @method static $this whereLike($column_name, $value=null)
  * @method $this whereNotLike($column_name, $value=null)
  * @method $this whereGt($column_name, $value=null)
  * @method static $this whereLt($column_name, $value=null)
@@ -157,7 +158,7 @@ class Model extends \Sudzy\ValidModel {
           $model = $model->where($field, $value);
         }
       }
-      $model = $model->findOne();
+      if ($model) $model = $model->findOne();
     }
 
     if ($model === false) {

lib/Settings/UserFlags.php

@@ -37,7 +37,7 @@ class UserFlags {
     }
   }
 
-  public function get(string $name) {
+  public function get($name) {
     $this->ensureLoaded();
     if (empty(self::$data[$name])) {
       $defaults = $this->getDefaults();
@@ -51,7 +51,7 @@ class UserFlags {
     return array_merge($this->getDefaults(), self::$data);
   }
 
-  public function set(string $name, $value) {
+  public function set($name, $value) {
     $current_user_id = WPFunctions::get()->getCurrentUserId();
     UserFlag::createOrUpdate([
       'user_id' => $current_user_id,
@@ -63,7 +63,7 @@ class UserFlags {
     }
   }
 
-  public function delete(string $name) {
+  public function delete($name) {
     $current_user_id = WPFunctions::get()->getCurrentUserId();
     UserFlag::where('user_id', $current_user_id)
       ->where('name', $name)

tests/integration/API/JSON/v1/UserFlagsTest.php

@@ -57,6 +57,7 @@ class UserFlagsTest extends \MailPoetTest {
   }
 
   function _after() {
+    UserFlagsController::clear();
     \ORM::forTable(UserFlag::$_table)->deleteMany();
   }
 }

tests/integration/Config/AccessControlTest.php

@@ -31,6 +31,12 @@ class AccessControlTest extends \MailPoetTest {
         return array('custom_manage_settings_role');
       }
     );
+    $wp->addFilter(
+      'mailpoet_permission_manage_user_flags',
+      function() {
+        return array('custom_manage_user_flags_role');
+      }
+    );
     $wp->addFilter(
       'mailpoet_permission_manage_emails',
       function() {
@@ -64,6 +70,9 @@ class AccessControlTest extends \MailPoetTest {
         AccessControl::PERMISSION_MANAGE_SETTINGS => array(
           'custom_manage_settings_role'
         ),
+        AccessControl::PERMISSION_MANAGE_USER_FLAGS => array(
+          'custom_manage_user_flags_role'
+        ),
         AccessControl::PERMISSION_MANAGE_EMAILS => array(
           'custom_manage_emails_role'
         ),

tests/integration/Config/MenuTest.php

@@ -8,6 +8,7 @@ use MailPoet\Config\Menu;
 use MailPoet\Config\Renderer;
 use MailPoet\Config\ServicesChecker;
 use MailPoet\Settings\SettingsController;
+use MailPoet\Settings\UserFlags;
 use MailPoet\WooCommerce\Helper as WooCommerceHelper;
 use MailPoet\WP\Functions;
 
@@ -43,7 +44,7 @@ class MenuTest extends \MailPoetTest {
 
   function testItChecksMailpoetAPIKey() {
     $renderer = Stub::make(new Renderer());
-    $menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker);
+    $menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker, new UserFlags);
 
     $_REQUEST['page'] = 'mailpoet-newsletters';
     $checker = Stub::make(
@@ -65,7 +66,7 @@ class MenuTest extends \MailPoetTest {
 
   function testItChecksPremiumKey() {
     $renderer = Stub::make(new Renderer());
-    $menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker);
+    $menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker, new UserFlags);
 
     $_REQUEST['page'] = 'mailpoet-newsletters';
     $checker = Stub::make(

tests/integration/Settings/UserFlagsTest.php

@@ -104,6 +104,7 @@ class UserFlagsTest extends \MailPoetTest {
 
   function _after() {
     UserFlags::clear();
+    WPFunctions::set(new WPFunctions);
     \ORM::raw_execute('TRUNCATE ' . UserFlag::$_table);
   }
 }