Adding fix for Role feature state check

Backporting #2851

application/classes/Ushahidi/Core.php

@@ -737,6 +737,7 @@ public static function init()
 		];
 		$di->params['Ushahidi_Validator_Role_Update'] = [
 			'permission_repo' => $di->lazyGet('repository.permission'),
+			'feature_enabled' => $di->lazyGet('roles.enabled'),
 		];
 
 		// Validator Setters

application/classes/Ushahidi/Validator/Role/Update.php

@@ -15,11 +15,13 @@
 class Ushahidi_Validator_Role_Update extends Validator
 {
 	protected $permission_repo;
+	protected $feature_enabled;
 	protected $default_error_source = 'role';
 
-	public function __construct(PermissionRepository $permission_repo)
+	public function __construct(PermissionRepository $permission_repo, $feature_enabled)
 	{
 		$this->permission_repo = $permission_repo;
+		$this->feature_enabled = (bool) $feature_enabled;
 	}
 
 	protected function getRules()
@@ -30,10 +32,23 @@ protected function getRules()
 			],
 			'permissions' => [
 				[[$this, 'checkPermissions'], [':validation', ':value']],
+
+			],
+			'name' => [
+				[[$this, 'checkRolesEnabled'], [':validation']],
 			],
 		];
 	}
 
+	public function checkRolesEnabled(Validation $validation)
+	{
+		if (!$this->feature_enabled) {
+			$validation->error('name', 'rolesNotEnabled');
+			return;
+		}
+		return;
+	}
+
 	public function checkPermissions(Validation $validation, $permissions)
 	{
 		if (!$permissions) {

application/messages/role.php

@@ -0,0 +1,5 @@
+<?php
+
+return array(
+	'rolesNotEnabled'    => 'The roles feature is not enabled for your deployment.'
+);

tests/integration/roles.feature

@@ -143,3 +143,21 @@ Feature: Testing the Roles API
 		And the response has a "protected" property
 		And the "protected" property is true
         Then the guzzle status code should be 200
+
+#    @rolesDisabled
+#    Scenario: Cannot update role when roles disabled
+#       Given that I want to update a "Role"
+#       And that the oauth token is "testadminuser"
+#       And that the request "data" is:
+#           """
+#           {
+#               "name":"supervisor",
+#               "display_name":"Supervisor",
+#               "permissions":["Manage Users"]
+#           }
+#            """
+#        And that its "id" is "1"
+#        When I request "/roles"
+#        Then the response is JSON
+#		And the response has a "errors" property
+#        Then the guzzle status code should be 422

tests/unit/App/Validator/Role/UpdateTest.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Unit tests for Signature Verifier
+ *
+ * @author     Ushahidi Team <team@ushahidi.com>
+ * @package    Ushahidi\Application\Tests
+ * @copyright  2013 Ushahidi
+ * @license    https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License Version 3 (AGPL3)
+ */
+
+namespace Tests\Unit\Core\Tool;
+
+use Ushahidi_Validator_Role_Update;
+use Ushahidi\Core\Entity\PermissionRepository;
+
+/**
+ * @backupGlobals disabled
+ * @preserveGlobalState disabled
+ */
+class RoleUpdateTest extends \PHPUnit\Framework\TestCase
+{
+
+	public function testRoleDisabled()
+	{
+		$validationMock = $this->createMock(\Validation::class);
+
+		$validator = new Ushahidi_Validator_Role_Update($this->createMock(PermissionRepository::class), false);
+		$validationMock
+			->expects($this->once())
+            ->method('error')
+            ->with(
+				'name',
+				'rolesNotEnabled'
+			);
+		$validator->checkRolesEnabled($validationMock);
+	}
+
+	public function testRoleEnabled()
+	{
+		$validationMock = $this->createMock(\Validation::class);
+		$validator = new Ushahidi_Validator_Role_Update($this->createMock(PermissionRepository::class), true);
+		$validationMock
+			->expects($this->never())
+			->method('error')
+			// ->with(
+			// 	'name',
+			// 	'rolesNotEnabled'
+			// )
+			;
+		$validator->checkRolesEnabled($validationMock);
+	}
+}