silverstripe / silverstripe-mimevalidator

code/MimeUploadValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	 * Check if the temporary file has a valid MIME type for it's extension.
 	 *
 	 * @uses finfo php extension
-	 * @return boolean|null
+	 * @return boolean
 	 */
 	public function isValidMime() {
                 $extension = strtolower(pathinfo($this->tmpFile['name'], PATHINFO_EXTENSION));

Indentation +3 added lines, -3 removed lines

@@ -29,10 +29,10 @@
 	 * @return boolean|null
 	 */
 	public function isValidMime() {
-                $extension = strtolower(pathinfo($this->tmpFile['name'], PATHINFO_EXTENSION));
+				$extension = strtolower(pathinfo($this->tmpFile['name'], PATHINFO_EXTENSION));
 
-                // we can't check filenames without an extension or no temp file path, let them pass validation.
-                if(!$extension || !$this->tmpFile['tmp_name']) return true;
+				// we can't check filenames without an extension or no temp file path, let them pass validation.
+				if(!$extension || !$this->tmpFile['tmp_name']) return true;
 
 		$expectedMimes = $this->getExpectedMimeTypes($this->tmpFile);
 		if(empty($expectedMimes)) {

Spacing +12 added lines, -12 removed lines

@@ -32,10 +32,10 @@ 
                 $extension = strtolower(pathinfo($this->tmpFile['name'], PATHINFO_EXTENSION));
 
                 // we can't check filenames without an extension or no temp file path, let them pass validation.
-                if(!$extension || !$this->tmpFile['tmp_name']) return true;
+                if (!$extension || !$this->tmpFile['tmp_name']) return true;
 
 		$expectedMimes = $this->getExpectedMimeTypes($this->tmpFile);
-		if(empty($expectedMimes)) {
+		if (empty($expectedMimes)) {
 			throw new MimeUploadValidator_Exception(
 				sprintf('Could not find a MIME type for extension %s', $extension)
 			);
@@ -43,14 +43,14 @@ 
 
 		$finfo = new finfo(FILEINFO_MIME_TYPE);
 		$foundMime = $finfo->file($this->tmpFile['tmp_name']);
-		if(!$foundMime) {
+		if (!$foundMime) {
 			throw new MimeUploadValidator_Exception(
 				sprintf('Could not find a MIME type for file %s', $this->tmpFile['tmp_name'])
 			);
 		}
 
-		foreach($expectedMimes as $expected) {
-			if($this->compareMime($foundMime, $expected)) return true;
+		foreach ($expectedMimes as $expected) {
+			if ($this->compareMime($foundMime, $expected)) return true;
 		}
 		return false;
 	}
@@ -64,7 +64,7 @@ 
 		$extension = strtolower(pathinfo($tmpFile['name'], PATHINFO_EXTENSION));
 
 		// if the finfo php extension isn't loaded, we can't complete this check.
-		if(!class_exists('finfo')) {
+		if (!class_exists('finfo')) {
 			throw new MimeUploadValidator_Exception('PHP extension finfo is not loaded');
 		}
 
@@ -73,14 +73,14 @@ 
 
 		// Get the mime types set in framework core
 		$knownMimes = Config::inst()->get('HTTP', 'MimeTypes');
-		if(isset($knownMimes[$extension])) {
+		if (isset($knownMimes[$extension])) {
 			$expectedMimes[] = $knownMimes[$extension];
 		}
 
 		// Get the mime types and their variations from mimevalidator
 		$knownMimes = Config::inst()->get(get_class($this), 'MimeTypes');
-		if(isset($knownMimes[$extension])) {
-			if(is_array($knownMimes[$extension])) {
+		if (isset($knownMimes[$extension])) {
+			if (is_array($knownMimes[$extension])) {
 				$expectedMimes += $knownMimes[$extension];
 			} else {
 				$expectedMimes[] = $knownMimes[$extension];
@@ -109,18 +109,18 @@ 
 	}
 
 	public function validate() {
-		if(parent::validate() === false) return false;
+		if (parent::validate() === false) return false;
 
 		try {
 			$result = $this->isValidMime();
-			if($result === false) {
+			if ($result === false) {
 				$this->errors[] = _t(
 					'File.INVALIDMIME',
 					'File extension does not match known MIME type'
 				);
 				return false;
 			}
-		} catch(MimeUploadValidator_Exception $e) {
+		} catch (MimeUploadValidator_Exception $e) {
 			$this->errors[] = _t(
 				'File.FAILEDMIMECHECK',
 				'MIME validation failed: {message}',

Braces +9 added lines, -3 removed lines

@@ -32,7 +32,9 @@ 
                 $extension = strtolower(pathinfo($this->tmpFile['name'], PATHINFO_EXTENSION));
 
                 // we can't check filenames without an extension or no temp file path, let them pass validation.
-                if(!$extension || !$this->tmpFile['tmp_name']) return true;
+                if(!$extension || !$this->tmpFile['tmp_name']) {
+                	return true;
+                }
 
 		$expectedMimes = $this->getExpectedMimeTypes($this->tmpFile);
 		if(empty($expectedMimes)) {
@@ -50,7 +52,9 @@ 
 		}
 
 		foreach($expectedMimes as $expected) {
-			if($this->compareMime($foundMime, $expected)) return true;
+			if($this->compareMime($foundMime, $expected)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -109,7 +113,9 @@ 
 	}
 
 	public function validate() {
-		if(parent::validate() === false) return false;
+		if(parent::validate() === false) {
+			return false;
+		}
 
 		try {
 			$result = $this->isValidMime();

tests/MimeUploadValidatorTest.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 		$tmpFileName = 'UploadTest-testUpload.jpg';
 		$tmpFilePath = TEMP_FOLDER . '/' . $tmpFileName;
 		$tmpFileContent = '';
-		for($i=0; $i<10000; $i++) $tmpFileContent .= '0';
+		for ($i = 0; $i < 10000; $i++) $tmpFileContent .= '0';
 		file_put_contents($tmpFilePath, $tmpFileContent);
 
 		// emulates the $_FILES array
@@ -34,7 +34,7 @@ 
 		$tmpFileName = 'text.TXT';
 		$tmpFilePath = TEMP_FOLDER . '/' . $tmpFileName;
 		$tmpFileContent = '';
-		for($i=0; $i<10000; $i++) $tmpFileContent .= '0';
+		for ($i = 0; $i < 10000; $i++) $tmpFileContent .= '0';
 		file_put_contents($tmpFilePath, $tmpFileContent);
 
 		$validator = new MimeUploadValidator();

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 		$tmpFileName = 'UploadTest-testUpload.jpg';
 		$tmpFilePath = TEMP_FOLDER . '/' . $tmpFileName;
 		$tmpFileContent = '';
-		for($i=0; $i<10000; $i++) $tmpFileContent .= '0';
+		for($i=0; $i<10000; $i++) {
+			$tmpFileContent .= '0';
+		}
 		file_put_contents($tmpFilePath, $tmpFileContent);
 
 		// emulates the $_FILES array
@@ -34,7 +36,9 @@ 
 		$tmpFileName = 'text.TXT';
 		$tmpFilePath = TEMP_FOLDER . '/' . $tmpFileName;
 		$tmpFileContent = '';
-		for($i=0; $i<10000; $i++) $tmpFileContent .= '0';
+		for($i=0; $i<10000; $i++) {
+			$tmpFileContent .= '0';
+		}
 		file_put_contents($tmpFilePath, $tmpFileContent);
 
 		$validator = new MimeUploadValidator();