Skip to content

Commit 57b546f

Browse files
committed
again try to prevent condesniffer from complaining
see issue squizlabs/PHP_CodeSniffer#2857
1 parent 060af04 commit 57b546f

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

src/SimpleAPI.php

+27-9
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,33 @@ public function __construct() {
3535
Config::LoadConfigs( static::$CONFIGURATION_FILE );
3636
$this->AllowedOrigins = ALLOWED_ORIGINS;
3737
$this->AllowedReferers = ALLOWED_REFERERS;
38-
$this->AllowedAcceptHeaders = AcceptHeader::areValid( ALLOWED_ACCEPT_HEADERS )
39-
? ALLOWED_ACCEPT_HEADERS
40-
: die("Please check your API configuration. The allowed accept headers you have defined do not seem to be valid: " . implode( ', ', ALLOWED_ACCEPT_HEADERS ) . ". Valid accept headers are: " . implode(', ', AcceptHeader::$values ));
41-
$this->AllowedRequestMethods = RequestMethod::areValid( ALLOWED_REQUEST_METHODS )
42-
? ALLOWED_REQUEST_METHODS
43-
: die("Please check your API configuration. The allowed request methods you have defined do not seem to be valid: " . implode( ', ', ALLOWED_REQUEST_METHODS ) . ". Valid request methods are: " . implode(', ', RequestMethod::$values ));
44-
$this->AllowedRequestContentTypes = RequestContentType::areValid( ALLOWED_REQUEST_CONTENT_TYPES )
45-
? ALLOWED_REQUEST_CONTENT_TYPES
46-
: die("Please check your API configuration. The allowed request content types you have defined do not seem to be valid: " . implode( ', ', ALLOWED_REQUEST_CONTENT_TYPES ) . ". Valid request content types are: " . implode(', ', RequestContentType::$values ));
38+
if( AcceptHeader::areValid( ALLOWED_ACCEPT_HEADERS ) ) {
39+
$this->AllowedAcceptHeaders = ALLOWED_ACCEPT_HEADERS;
40+
} else {
41+
$message = "Please check your API configuration. The allowed accept headers you have defined do not seem to be valid: ";
42+
$message .= implode( ', ', ALLOWED_ACCEPT_HEADERS );
43+
$message .= ". Valid accept headers are: ";
44+
$message .= implode(', ', AcceptHeader::$values );
45+
die( $message );
46+
}
47+
if( RequestMethod::areValid( ALLOWED_REQUEST_METHODS ) ) {
48+
$this->AllowedRequestMethods = ALLOWED_REQUEST_METHODS;
49+
} else {
50+
$message = "Please check your API configuration. The allowed request methods you have defined do not seem to be valid: ";
51+
$message .= implode( ', ', ALLOWED_REQUEST_METHODS );
52+
$message .= ". Valid request methods are: ";
53+
$message .= implode(', ', RequestMethod::$values );
54+
die( $message );
55+
}
56+
if( RequestContentType::areValid( ALLOWED_REQUEST_CONTENT_TYPES ) ) {
57+
$this->AllowedRequestContentTypes = ALLOWED_REQUEST_CONTENT_TYPES;
58+
} else {
59+
$message = "Please check your API configuration. The allowed request content types you have defined do not seem to be valid: ";
60+
$message .= implode( ', ', ALLOWED_REQUEST_CONTENT_TYPES );
61+
$message .= ". Valid request content types are: ";
62+
$message .= implode(', ', RequestContentType::$values );
63+
die( $message );
64+
}
4765
$this->AllowedResponseTypes = array_map(fn($mimeType): string => ResponseType::fromMimeType($mimeType), ALLOWED_ACCEPT_HEADERS);
4866
$this->DefaultResponseContentType = DEFAULT_MIME_TYPE;
4967
$this->RequestHeaders = getallheaders();

0 commit comments

Comments
 (0)