Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit 1a155d9

Browse files
SimantovYousoufovSimantovYousoufov
authored
Merge pull request #1 from fuzz-productions/feature-1.1-heavy-refactor
refactored http exceptions to new structure
2 parents 7902d60 + 821a160 commit 1a155d9

22 files changed

+480
-305
lines changed

Diff for: ‎.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
language: php
22
php:
3-
- '5.6'
43
- '7.0'
4+
- '7.1'
55
- nightly
66
install:
77
- composer install
8-

Diff for: ‎composer.json

+16-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,30 @@
55
"authors": [
66
{
77
"name": "Fuzz Web",
8-
"email": "web@fuzzproductions.com"
8+
"email": "opensource@fuzzproductions.com"
99
}
1010
],
11+
"require": {
12+
"php": ">=7.0"
13+
},
1114
"require-dev": {
12-
"phpunit/phpunit": "~5.0"
15+
"phpunit/phpunit": "~5.6"
1316
},
1417
"autoload": {
1518
"psr-4": {
1619
"Fuzz\\HttpException\\": "src/",
1720
"Fuzz\\HttpException\\Tests\\": "tests/"
1821
}
1922
},
20-
"require": {}
23+
"scripts": {
24+
"test": [
25+
"vendor/bin/phpunit"
26+
],
27+
"test-coverage": [
28+
"vendor/bin/phpunit --coverage-html tests/coverage"
29+
],
30+
"open-coverage": [
31+
"open -a \"Google Chrome\" tests/coverage/index.html"
32+
]
33+
}
2134
}

Diff for: ‎src/AccessDeniedHttpException.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ class AccessDeniedHttpException extends HttpException
1414
/**
1515
* Error code storage;
1616
*
17-
* @var string
17+
* @const string
1818
*/
19-
protected $error_name = 'access_denied';
19+
const ERROR = 'access_denied';
2020

2121
/**
22-
* NotFoundHttpException constructor.
22+
* AccessDeniedHttpException constructor.
2323
*
24-
* @param string $message
25-
* @param string $error_formatted
26-
* @param array $error_data
27-
* @param array $headers
28-
* @param \Exception $previous
24+
* @param string|null $errorDescription
25+
* @param array $errorData
26+
* @param string|null $userTitle
27+
* @param null $userMessage
28+
* @param array $headers
29+
* @param \Exception|null $previous
2930
*/
30-
public function __construct($message = null, array $error_data = [], $error_formatted = null, array $headers = [], \Exception $previous = null)
31+
public function __construct(string $errorDescription = null, array $errorData = [], string $userTitle = null, $userMessage = null, array $headers = [], \Exception $previous = null)
3132
{
32-
parent::__construct($message, $error_formatted, $error_data, $headers, self::HTTP_CODE, $previous);
33+
parent::__construct(self::HTTP_CODE, self::ERROR, $errorDescription, $errorData, $userTitle, $userMessage, $headers, $previous);
3334
}
3435
}

Diff for: ‎src/BadRequestHttpException.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ class BadRequestHttpException extends HttpException
1414
/**
1515
* Error code storage;
1616
*
17-
* @var string
17+
* @const string
1818
*/
19-
protected $error_name = 'bad_request';
19+
const ERROR = 'bad_request';
2020

2121
/**
22-
* NotFoundHttpException constructor.
22+
* BadRequestHttpException constructor.
2323
*
24-
* @param string $message
25-
* @param string $error_formatted
26-
* @param array $error_data
27-
* @param array $headers
28-
* @param \Exception $previous
24+
* @param string|null $errorDescription
25+
* @param array $errorData
26+
* @param string|null $userTitle
27+
* @param null $userMessage
28+
* @param array $headers
29+
* @param \Exception|null $previous
2930
*/
30-
public function __construct($message = null, array $error_data = [], $error_formatted = null, array $headers = [], \Exception $previous = null)
31+
public function __construct(string $errorDescription = null, array $errorData = [], string $userTitle = null, $userMessage = null, array $headers = [], \Exception $previous = null)
3132
{
32-
parent::__construct($message, $error_formatted, $error_data, $headers, self::HTTP_CODE, $previous);
33+
parent::__construct(self::HTTP_CODE, self::ERROR, $errorDescription, $errorData, $userTitle, $userMessage, $headers, $previous);
3334
}
3435
}

Diff for: ‎src/ConflictHttpException.php

+12-11
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ class ConflictHttpException extends HttpException
1414
/**
1515
* Error code storage;
1616
*
17-
* @var string
17+
* @const string
1818
*/
19-
protected $error_name = 'conflict';
20-
19+
const ERROR = 'conflict';
20+
2121
/**
22-
* NotFoundHttpException constructor.
22+
* ConflictHttpException constructor.
2323
*
24-
* @param string $message
25-
* @param string $error_formatted
26-
* @param array $error_data
27-
* @param array $headers
28-
* @param \Exception $previous
24+
* @param string|null $errorDescription
25+
* @param array $errorData
26+
* @param string|null $userTitle
27+
* @param null $userMessage
28+
* @param array $headers
29+
* @param \Exception|null $previous
2930
*/
30-
public function __construct($message = null, array $error_data = [], $error_formatted = null, array $headers = [], \Exception $previous = null)
31+
public function __construct(string $errorDescription = null, array $errorData = [], string $userTitle = null, $userMessage = null, array $headers = [], \Exception $previous = null)
3132
{
32-
parent::__construct($message, $error_formatted, $error_data, $headers, self::HTTP_CODE, $previous);
33+
parent::__construct(self::HTTP_CODE, self::ERROR, $errorDescription, $errorData, $userTitle, $userMessage, $headers, $previous);
3334
}
3435
}

Diff for: ‎src/Contracts/HttpExceptionInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public function getStatusCode();
1616
*
1717
* @return array
1818
*/
19-
public function getHeaders();
19+
public function getHttpHeaders();
2020

2121
/**
2222
* Data corresponding to the error
@@ -32,12 +32,12 @@ public function getErrorData();
3232
*
3333
* @return string
3434
*/
35-
public function getErrorName();
35+
public function getError();
3636

3737
/**
3838
* A user-friendly error description
3939
*
4040
* @return string
4141
*/
42-
public function getErrorFormatted();
42+
public function getUserMessage();
4343
}

Diff for: ‎src/GoneHttpException.php

+11-10
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,22 @@ class GoneHttpException extends HttpException
1414
/**
1515
* Error code storage;
1616
*
17-
* @var string
17+
* @const string
1818
*/
19-
protected $error_name = 'gone';
19+
const ERROR = 'gone';
2020

2121
/**
22-
* NotFoundHttpException constructor.
22+
* GoneHttpException constructor.
2323
*
24-
* @param string $message
25-
* @param string $error_formatted
26-
* @param array $error_data
27-
* @param array $headers
28-
* @param \Exception $previous
24+
* @param string|null $errorDescription
25+
* @param array $errorData
26+
* @param string|null $userTitle
27+
* @param null $userMessage
28+
* @param array $headers
29+
* @param \Exception|null $previous
2930
*/
30-
public function __construct($message = null, array $error_data = [], $error_formatted = null, array $headers = [], \Exception $previous = null)
31+
public function __construct(string $errorDescription = null, array $errorData = [], string $userTitle = null, $userMessage = null, array $headers = [], \Exception $previous = null)
3132
{
32-
parent::__construct($message, $error_formatted, $error_data, $headers, self::HTTP_CODE, $previous);
33+
parent::__construct(self::HTTP_CODE, self::ERROR, $errorDescription, $errorData, $userTitle, $userMessage, $headers, $previous);
3334
}
3435
}

0 commit comments

Comments
 (0)