constants are PascalCase

Author: dg

.phpstorm.meta.php

@@ -5,72 +5,72 @@
 namespace PHPSTORM_META;
 
 registerArgumentsSet('nette_http_codes',
-	\Nette\Http\IResponse::S100_CONTINUE,
-	\Nette\Http\IResponse::S101_SWITCHING_PROTOCOLS,
-	\Nette\Http\IResponse::S102_PROCESSING,
+	\Nette\Http\IResponse::S100_Continue,
+	\Nette\Http\IResponse::S101_SwitchingProtocols,
+	\Nette\Http\IResponse::S102_Processing,
 	\Nette\Http\IResponse::S200_OK,
-	\Nette\Http\IResponse::S201_CREATED,
-	\Nette\Http\IResponse::S202_ACCEPTED,
-	\Nette\Http\IResponse::S203_NON_AUTHORITATIVE_INFORMATION,
-	\Nette\Http\IResponse::S204_NO_CONTENT,
-	\Nette\Http\IResponse::S205_RESET_CONTENT,
-	\Nette\Http\IResponse::S206_PARTIAL_CONTENT,
-	\Nette\Http\IResponse::S207_MULTI_STATUS,
-	\Nette\Http\IResponse::S208_ALREADY_REPORTED,
-	\Nette\Http\IResponse::S226_IM_USED,
-	\Nette\Http\IResponse::S300_MULTIPLE_CHOICES,
-	\Nette\Http\IResponse::S301_MOVED_PERMANENTLY,
-	\Nette\Http\IResponse::S302_FOUND,
-	\Nette\Http\IResponse::S303_SEE_OTHER,
-	\Nette\Http\IResponse::S303_POST_GET,
-	\Nette\Http\IResponse::S304_NOT_MODIFIED,
-	\Nette\Http\IResponse::S305_USE_PROXY,
-	\Nette\Http\IResponse::S307_TEMPORARY_REDIRECT,
-	\Nette\Http\IResponse::S308_PERMANENT_REDIRECT,
-	\Nette\Http\IResponse::S400_BAD_REQUEST,
-	\Nette\Http\IResponse::S401_UNAUTHORIZED,
-	\Nette\Http\IResponse::S402_PAYMENT_REQUIRED,
-	\Nette\Http\IResponse::S403_FORBIDDEN,
-	\Nette\Http\IResponse::S404_NOT_FOUND,
-	\Nette\Http\IResponse::S405_METHOD_NOT_ALLOWED,
-	\Nette\Http\IResponse::S406_NOT_ACCEPTABLE,
-	\Nette\Http\IResponse::S407_PROXY_AUTHENTICATION_REQUIRED,
-	\Nette\Http\IResponse::S408_REQUEST_TIMEOUT,
-	\Nette\Http\IResponse::S409_CONFLICT,
-	\Nette\Http\IResponse::S410_GONE,
-	\Nette\Http\IResponse::S411_LENGTH_REQUIRED,
-	\Nette\Http\IResponse::S412_PRECONDITION_FAILED,
-	\Nette\Http\IResponse::S413_REQUEST_ENTITY_TOO_LARGE,
-	\Nette\Http\IResponse::S414_REQUEST_URI_TOO_LONG,
-	\Nette\Http\IResponse::S415_UNSUPPORTED_MEDIA_TYPE,
-	\Nette\Http\IResponse::S416_REQUESTED_RANGE_NOT_SATISFIABLE,
-	\Nette\Http\IResponse::S417_EXPECTATION_FAILED,
-	\Nette\Http\IResponse::S421_MISDIRECTED_REQUEST,
-	\Nette\Http\IResponse::S422_UNPROCESSABLE_ENTITY,
-	\Nette\Http\IResponse::S423_LOCKED,
-	\Nette\Http\IResponse::S424_FAILED_DEPENDENCY,
-	\Nette\Http\IResponse::S426_UPGRADE_REQUIRED,
-	\Nette\Http\IResponse::S428_PRECONDITION_REQUIRED,
-	\Nette\Http\IResponse::S429_TOO_MANY_REQUESTS,
-	\Nette\Http\IResponse::S431_REQUEST_HEADER_FIELDS_TOO_LARGE,
-	\Nette\Http\IResponse::S451_UNAVAILABLE_FOR_LEGAL_REASONS,
-	\Nette\Http\IResponse::S500_INTERNAL_SERVER_ERROR,
-	\Nette\Http\IResponse::S501_NOT_IMPLEMENTED,
-	\Nette\Http\IResponse::S502_BAD_GATEWAY,
-	\Nette\Http\IResponse::S503_SERVICE_UNAVAILABLE,
-	\Nette\Http\IResponse::S504_GATEWAY_TIMEOUT,
-	\Nette\Http\IResponse::S505_HTTP_VERSION_NOT_SUPPORTED,
-	\Nette\Http\IResponse::S506_VARIANT_ALSO_NEGOTIATES,
-	\Nette\Http\IResponse::S507_INSUFFICIENT_STORAGE,
-	\Nette\Http\IResponse::S508_LOOP_DETECTED,
-	\Nette\Http\IResponse::S510_NOT_EXTENDED,
-	\Nette\Http\IResponse::S511_NETWORK_AUTHENTICATION_REQUIRED
+	\Nette\Http\IResponse::S201_Created,
+	\Nette\Http\IResponse::S202_Accepted,
+	\Nette\Http\IResponse::S203_NonAuthoritativeInformation,
+	\Nette\Http\IResponse::S204_NoContent,
+	\Nette\Http\IResponse::S205_ResetContent,
+	\Nette\Http\IResponse::S206_PartialContent,
+	\Nette\Http\IResponse::S207_MultiStatus,
+	\Nette\Http\IResponse::S208_AlreadyReported,
+	\Nette\Http\IResponse::S226_ImUsed,
+	\Nette\Http\IResponse::S300_MultipleChoices,
+	\Nette\Http\IResponse::S301_MovedPermanently,
+	\Nette\Http\IResponse::S302_Found,
+	\Nette\Http\IResponse::S303_SeeOther,
+	\Nette\Http\IResponse::S303_PostGet,
+	\Nette\Http\IResponse::S304_NotModified,
+	\Nette\Http\IResponse::S305_UseProxy,
+	\Nette\Http\IResponse::S307_TemporaryRedirect,
+	\Nette\Http\IResponse::S308_PermanentRedirect,
+	\Nette\Http\IResponse::S400_BadRequest,
+	\Nette\Http\IResponse::S401_Unauthorized,
+	\Nette\Http\IResponse::S402_PaymentRequired,
+	\Nette\Http\IResponse::S403_Forbidden,
+	\Nette\Http\IResponse::S404_NotFound,
+	\Nette\Http\IResponse::S405_MethodNotAllowed,
+	\Nette\Http\IResponse::S406_NotAcceptable,
+	\Nette\Http\IResponse::S407_ProxyAuthenticationRequired,
+	\Nette\Http\IResponse::S408_RequestTimeout,
+	\Nette\Http\IResponse::S409_Conflict,
+	\Nette\Http\IResponse::S410_Gone,
+	\Nette\Http\IResponse::S411_LengthRequired,
+	\Nette\Http\IResponse::S412_PreconditionFailed,
+	\Nette\Http\IResponse::S413_RequestEntityTooLarge,
+	\Nette\Http\IResponse::S414_RequestUriTooLong,
+	\Nette\Http\IResponse::S415_UnsupportedMediaType,
+	\Nette\Http\IResponse::S416_RequestedRangeNotSatisfiable,
+	\Nette\Http\IResponse::S417_ExpectationFailed,
+	\Nette\Http\IResponse::S421_MisdirectedRequest,
+	\Nette\Http\IResponse::S422_UnprocessableEntity,
+	\Nette\Http\IResponse::S423_Locked,
+	\Nette\Http\IResponse::S424_FailedDependency,
+	\Nette\Http\IResponse::S426_UpgradeRequired,
+	\Nette\Http\IResponse::S428_PreconditionRequired,
+	\Nette\Http\IResponse::S429_TooManyRequests,
+	\Nette\Http\IResponse::S431_RequestHeaderFieldsTooLarge,
+	\Nette\Http\IResponse::S451_UnavailableForLegalReasons,
+	\Nette\Http\IResponse::S500_InternalServerError,
+	\Nette\Http\IResponse::S501_NotImplemented,
+	\Nette\Http\IResponse::S502_BadGateway,
+	\Nette\Http\IResponse::S503_ServiceUnavailable,
+	\Nette\Http\IResponse::S504_GatewayTimeout,
+	\Nette\Http\IResponse::S505_HttpVersionNotSupported,
+	\Nette\Http\IResponse::S506_VariantAlsoNegotiates,
+	\Nette\Http\IResponse::S507_InsufficientStorage,
+	\Nette\Http\IResponse::S508_LoopDetected,
+	\Nette\Http\IResponse::S510_NotExtended,
+	\Nette\Http\IResponse::S511_NetworkAuthenticationRequired
 );
 
 registerArgumentsSet('nette_same_site',
-	\Nette\Http\IResponse::SAME_SITE_LAX,
-	\Nette\Http\IResponse::SAME_SITE_STRICT,
-	\Nette\Http\IResponse::SAME_SITE_NONE
+	\Nette\Http\IResponse::SameSiteLax,
+	\Nette\Http\IResponse::SameSiteStrict,
+	\Nette\Http\IResponse::SameSiteNone
 );
 
 expectedArguments(\Nette\Http\IResponse::setCode(), 0, argumentsSet('nette_http_codes'));

readme.md

@@ -232,7 +232,7 @@ setCode(int $code, string $reason = null)
 Changes a status [response code](https://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10). For better source code readability it is recommended to use [predefined constants](https://api.nette.org/3.0/Nette/Http/IResponse.html) instead of actual numbers.
 
 ```php
-$httpResponse->setCode(Nette\Http\Response::S404_NOT_FOUND);
+$httpResponse->setCode(Nette\Http\Response::S404_NotFound);
 ```
 
 getCode(): int

src/Bridges/HttpDI/SessionExtension.php

@@ -41,7 +41,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 			'expiration' => Expect::string()->dynamic(),
 			'handler' => Expect::string()->dynamic(),
 			'readAndClose' => Expect::bool(),
-			'cookieSamesite' => Expect::anyOf(IResponse::SAME_SITE_LAX, IResponse::SAME_SITE_STRICT, IResponse::SAME_SITE_NONE, true)
+			'cookieSamesite' => Expect::anyOf(IResponse::SameSiteLax, IResponse::SameSiteStrict, IResponse::SameSiteNone, true)
 				->firstIsDefault(),
 		])->otherItems('mixed');
 	}
@@ -74,7 +74,7 @@ public function loadConfiguration()
 
 		if ($config->cookieSamesite === true) {
 			trigger_error("In 'session\u{a0}›\u{a0}cookieSamesite' replace true with 'Lax'.", E_USER_DEPRECATED);
-			$config->cookieSamesite = IResponse::SAME_SITE_LAX;
+			$config->cookieSamesite = IResponse::SameSiteLax;
 		}
 
 		$this->compiler->addExportedType(Nette\Http\IRequest::class);

src/Http/Context.php

@@ -77,7 +77,7 @@ public function isModified($lastModified = null, ?string $etag = null): bool
 			return true;
 		}
 
-		$this->response->setCode(IResponse::S304_NOT_MODIFIED);
+		$this->response->setCode(IResponse::S304_NotModified);
 		return false;
 	}
 

src/Http/FileUpload.php

@@ -29,7 +29,10 @@ final class FileUpload
 {
 	use Nette\SmartObject;
 
-	public const IMAGE_MIME_TYPES = ['image/gif', 'image/png', 'image/jpeg', 'image/webp'];
+	public const ImageMimeTypes = ['image/gif', 'image/png', 'image/jpeg', 'image/webp'];
+
+	/** @deprecated use FileUpload::ImageMimeTypes */
+	public const IMAGE_MIME_TYPES = self::ImageMimeTypes;
 
 	/** @var string */
 	private $name;
@@ -216,7 +219,7 @@ function (string $message) use ($dest): void {
 	 */
 	public function isImage(): bool
 	{
-		return in_array($this->getContentType(), self::IMAGE_MIME_TYPES, true);
+		return in_array($this->getContentType(), self::ImageMimeTypes, true);
 	}
 
 

src/Http/Helpers.php

@@ -21,7 +21,10 @@ final class Helpers
 	use Nette\StaticClass;
 
 	/** @internal */
-	public const STRICT_COOKIE_NAME = '_nss';
+	public const StrictCookieName = '_nss';
+
+	/** @deprecated */
+	public const STRICT_COOKIE_NAME = self::StrictCookieName;
 
 
 	/**
@@ -55,6 +58,6 @@ public static function ipMatch(string $ip, string $mask): bool
 
 	public static function initCookie(IRequest $request, IResponse $response)
 	{
-		$response->setCookie(self::STRICT_COOKIE_NAME, '1', 0, '/', null, null, true, IResponse::SAME_SITE_STRICT);
+		$response->setCookie(self::StrictCookieName, '1', 0, '/', null, null, true, IResponse::SameSiteStrict);
 	}
 }

src/Http/IRequest.php

@@ -19,13 +19,34 @@ interface IRequest
 {
 	/** HTTP request method */
 	public const
-		GET = 'GET',
-		POST = 'POST',
-		HEAD = 'HEAD',
-		PUT = 'PUT',
-		DELETE = 'DELETE',
-		PATCH = 'PATCH',
-		OPTIONS = 'OPTIONS';
+		Get = 'GET',
+		Post = 'POST',
+		Head = 'HEAD',
+		Put = 'PUT',
+		Delete = 'DELETE',
+		Patch = 'PATCH',
+		Options = 'OPTIONS';
+
+	/** @deprecated use IRequest::Get */
+	public const GET = self::Get;
+
+	/** @deprecated use IRequest::Post */
+	public const POST = self::Post;
+
+	/** @deprecated use IRequest::Head */
+	public const HEAD = self::Head;
+
+	/** @deprecated use IRequest::Put */
+	public const PUT = self::Put;
+
+	/** @deprecated use IRequest::Delete */
+	public const DELETE = self::Delete;
+
+	/** @deprecated use IRequest::Patch */
+	public const PATCH = self::Patch;
+
+	/** @deprecated use IRequest::Options */
+	public const OPTIONS = self::Options;
 
 	/**
 	 * Returns URL object.