Added socket failure exception formatting

composer.json

@@ -19,6 +19,7 @@
  "php": ">=5.4.0",
  "xenolope/quahog": "2.*",
  "illuminate/support": ">=4.2",
+ "laravel/framework": ">=4.2",
  "illuminate/validation": ">=4.1.21"
  },
  "require-dev": {

src/ClamavValidator/ClamavValidator.php

@@ -52,7 +52,7 @@ public function validateClamav($attribute, $value, $parameters)
  try {
  $socket = (new Factory())->createClient($clamavSocket);
  } catch (\Exception $e) {
- throw new Exception('Unable to initiate a virus check.');
+ throw new ClamavValidatorException($e, $attribute, $this);
  }
 
  // Create a new instance of the Client
@@ -62,14 +62,14 @@ public function validateClamav($attribute, $value, $parameters)
  $oldPerms = fileperms($file);
  chmod($file, 0666);
  clearstatcache(true, $file);
- 
+
  // Scan the file
  $result = $quahog->scanFile($file);
- 
+
  // Restore permissions
  chmod($file, $oldPerms);
  clearstatcache(true, $file);
- 
+
 
  if (self::CLAMAV_STATUS_ERROR === $result['status']) {
  throw new ClamavValidatorException($result['reason']);

src/ClamavValidator/ClamavValidatorException.php

@@ -1,7 +1,37 @@
 <?php namespace Sunspikes\ClamavValidator;
 
-use Exception;
+use Illuminate\Validation\ValidationException;
 
-class ClamavValidatorException extends Exception
+class ClamavValidatorException extends ValidationException
 {
+ protected $exception;
+
+ public $attribute;
+
+ public function __construct(\Exception $exception, string $attribute, \Illuminate\Contracts\Validation\Validator $validator, $response = null)
+ {
+ $this->exception = $exception;
+ $this->attribute = $attribute;
+
+ parent::__construct($validator, $this->makeResponse());
+ }
+
+ public function makeResponse()
+ {
+ $message = $this->exception->getMessage();
+
+ if (substr_count($message, 'SOCKET_ECONNREFUSED')) {
+ $message = 'Unable to initiate antivirus check. Please try later.';
+ }
+
+ if (request()->expectsJson()) {
+ return response()->json([
+ $this->attribute => $message
+ ], 422);
+ }
+
+ return redirect()->back()->withInput(
+ request()->input()
+ );
+ }
 }