silverstripe / silverstripe-spellcheck

code/handling/SpellController.php

Spacing +9 added lines, -9 removed lines

@@ -128,7 +128,7 @@ 
 		$this->setHeaders();
 
 		// Check security token
-		if(self::config()->enable_security_token && !SecurityToken::inst()->checkRequest($this->request)) {
+		if (self::config()->enable_security_token && !SecurityToken::inst()->checkRequest($this->request)) {
 			return $this->error(
 				_t(
 					'SpellController.SecurityMissing',
@@ -140,31 +140,31 @@ 
 
 		// Check permission
 		$permission = self::config()->required_permission;
-		if($permission && !Permission::check($permission)) {
+		if ($permission && !Permission::check($permission)) {
 			return $this->error(_t('SpellController.SecurityDenied', 'Permission Denied'), 403);
 		}
 
 		// Check data
 		$data = $this->getRequestData();
-		if(empty($data)) {
+		if (empty($data)) {
 			return $this->error(_t('SpellController.MissingData', "Could not get raw post data"), 400);
 		}
 
 		// Check params and request type
-		if(!Director::is_ajax() || empty($data['method']) || empty($data['params']) || count($data['params']) < 2) {
+		if (!Director::is_ajax() || empty($data['method']) || empty($data['params']) || count($data['params']) < 2) {
 			return $this->error(_t('SpellController.InvalidRequest', 'Invalid request'), 400);
 		}
 
 		// Check locale
 		$params = $data['params'];
 		$locale = $params[0];
-		if(!in_array($locale, self::get_locales())) {
+		if (!in_array($locale, self::get_locales())) {
 			return $this->error(_t('SpellController.InvalidLocale', 'Not supported locale'), 400);
 		}
 
 		// Check provider
 		$provider = $this->getProvider();
-		if(empty($provider)) {
+		if (empty($provider)) {
 			return $this->error(_t('SpellController.MissingProviders', "No spellcheck module installed"), 500);
 		}
 
@@ -172,7 +172,7 @@ 
 		try {
 			$method = $data['method'];
 			$words = $params[1];
-			switch($method) {
+			switch ($method) {
 				case 'checkWords':
 					return $this->success($provider->checkWords($locale, $words));
 				case 'getSuggestions':
@@ -187,7 +187,7 @@ 
 						400
 					);
 			}
-		} catch(SpellException $ex) {
+		} catch (SpellException $ex) {
 			return $this->error($ex->getMessage(), $ex->getCode());
 		}
 	}
@@ -212,7 +212,7 @@ 
 	 */
 	protected function getRequestData() {
 		// Check if data needs to be parsed
-		if($this->data === null) {
+		if ($this->data === null) {
 			// Parse data from input
 			$result = $this->request->requestVar('json_data')
 				?: file_get_contents("php://input");

code/handling/SpellRequestFilter.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	public function preRequest(\SS_HTTPRequest $request, \Session $session, \DataModel $model) {
 		// Check languages to set
 		$languages = array();
-		foreach(SpellController::get_locales() as $locale) {
+		foreach (SpellController::get_locales() as $locale) {
 			$languages[] = i18n::get_locale_name($locale).'='.$locale;
 		}
 

code/providers/HunSpellProvider.php

Spacing +7 added lines, -7 removed lines

@@ -25,14 +25,14 @@ 
 	 */
 	protected function invoke($locale, $input, &$stdout, &$stderr) {
 		// Prepare arguments
-		$command = 'hunspell -d ' . escapeshellarg($locale);
+		$command = 'hunspell -d '.escapeshellarg($locale);
 		$descriptorSpecs = array(
 			0 => array("pipe", "r"),
 			1 => array("pipe", "w"),
 			2 => array("pipe", "w")
 		);
 		$env = array(
-			'LANG' => $locale . '.utf-8'
+			'LANG' => $locale.'.utf-8'
 		);
 		// Invoke command
 		$proc = proc_open($command, $descriptorSpecs, $pipes, null, $env);
@@ -64,17 +64,17 @@ 
 		// Invoke HunSpell
 		$input = implode(' ', $words);
 		$return = $this->invoke($locale, $input, $stdout, $stderr);
-		if($stderr) {
+		if ($stderr) {
 			throw new SpellException($stderr, 500);
-		} elseif($return) {
+		} elseif ($return) {
 			throw new SpellException("An unidentified error has occurred", 500);
 		}
 
 		// Parse results
 		$pattern = Config::inst()->get(__CLASS__, 'pattern');
 		$results = array();
-		foreach(preg_split('/$\R?^/m', $stdout) as $line) {
-			if(preg_match($pattern, $line, $matches)) {
+		foreach (preg_split('/$\R?^/m', $stdout) as $line) {
+			if (preg_match($pattern, $line, $matches)) {
 				$results[$matches['original']] = explode(', ', $matches['misses']);
 			}
 		}
@@ -88,6 +88,6 @@ 
 
 	public function getSuggestions($locale, $word) {
 		$results = $this->getResults($locale, array($word));
-		if(isset($results[$word])) return $results[$word];
+		if (isset($results[$word])) return $results[$word];
 	}
 }

tests/SpellControllerTest.php

Spacing +7 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
 	}
 
 	public function tearDown() {
-		if($this->securityWasEnabled) SecurityToken::enable();
+		if ($this->securityWasEnabled) SecurityToken::enable();
 		else SecurityToken::disable();
 		Injector::unnest();
 		Config::unnest();
@@ -144,7 +144,7 @@ 
 			)
 		);
 		$response = $this->post('spellcheck', array('ajax' => 1, 'json_data' => json_encode($dataCheckWords)));
-		$this->assertEquals(200,  $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 		$jsonBody = json_decode($response->getBody());
 		$this->assertEquals('c0', $jsonBody->id);
 		$this->assertEquals(array("collor", "color", "onee"), $jsonBody->result);
@@ -160,14 +160,14 @@ 
 			)
 		);
 		$response = $this->post('spellcheck', array('ajax' => 1, 'json_data' => json_encode($dataGetSuggestions)));
-		$this->assertEquals(200,  $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 		$jsonBody = json_decode($response->getBody());
 		$this->assertEquals('c1', $jsonBody->id);
 		$this->assertEquals(array('collar', 'colour'), $jsonBody->result);
 
 		// Test non-ajax rejection
 		$response = $this->post('spellcheck', array('json_data' => json_encode($dataCheckWords)));
-		$this->assertEquals(400,  $response->getStatusCode());
+		$this->assertEquals(400, $response->getStatusCode());
 		$jsonBody = json_decode($response->getBody());
 		$this->assertEquals($invalidRequest, $jsonBody->error->errstr);
 
@@ -175,7 +175,7 @@ 
 		$dataInvalidMethod = $dataCheckWords;
 		$dataInvalidMethod['method'] = 'validate';
 		$response = $this->post('spellcheck', array('ajax' => 1, 'json_data' => json_encode($dataInvalidMethod)));
-		$this->assertEquals(400,  $response->getStatusCode());
+		$this->assertEquals(400, $response->getStatusCode());
 		$jsonBody = json_decode($response->getBody());
 		$this->assertEquals(
 			_t('SpellController.UnsupportedMethod', "Unsupported method '{method}'", array('method' => 'validate')),
@@ -186,7 +186,7 @@ 
 		$dataNoMethod = $dataCheckWords;
 		unset($dataNoMethod['method']);
 		$response = $this->post('spellcheck', array('ajax' => 1, 'json_data' => json_encode($dataNoMethod)));
-		$this->assertEquals(400,  $response->getStatusCode());
+		$this->assertEquals(400, $response->getStatusCode());
 		$jsonBody = json_decode($response->getBody());
 		$this->assertEquals($invalidRequest, $jsonBody->error->errstr);
 
@@ -197,7 +197,7 @@ 
 			array('collor', 'colour', 'color', 'onee', 'correct')
 		);
 		$response = $this->post('spellcheck', array('ajax' => 1, 'json_data' => json_encode($dataWrongLocale)));
-		$this->assertEquals(400,  $response->getStatusCode());
+		$this->assertEquals(400, $response->getStatusCode());
 		$jsonBody = json_decode($response->getBody());
 		$this->assertEquals(_t('SpellController.InvalidLocale', 'Not supported locale'), $jsonBody->error->errstr);
 	}