🚿 protected -> private in final classes

Author: codemasher

src/Psr7/MultipartStream.php

@@ -24,9 +24,9 @@
  */
 final class MultipartStream extends StreamAbstract{
 
-	protected string $boundary;
+	private string $boundary;
 
-	protected bool $built = false;
+	private bool $built = false;
 
 	/**
 	 * MultipartStream constructor.
@@ -118,7 +118,7 @@ public function addElement(array $e):MultipartStream{
 	/**
 	 *
 	 */
-	protected function setElementHeaders(array $e):array{
+	private function setElementHeaders(array $e):array{
 		$hasFilename = $e['filename'] === '0' || $e['filename'];
 
 		// Set a default content-disposition header if none was provided
@@ -152,7 +152,7 @@ protected function setElementHeaders(array $e):array{
 	/**
 	 *
 	 */
-	protected function hasHeader(array $headers, string $key):bool{
+	private function hasHeader(array $headers, string $key):bool{
 		$lowercaseHeader = strtolower($key);
 
 		foreach($headers as $k => $v){

src/Psr7/UploadedFile.php

@@ -48,7 +48,7 @@ final class UploadedFile implements UploadedFileInterface{
 
 	private bool $moved = false;
 
-	protected StreamFactory $streamFactory;
+	private StreamFactory $streamFactory;
 
 	/**
 	 * @param \Psr\Http\Message\StreamInterface|string|resource $file

src/Psr7/Uri.php

@@ -18,23 +18,23 @@
 
 use const FILTER_FLAG_IPV6, FILTER_VALIDATE_IP;
 
-class Uri implements UriInterface{
+final class Uri implements UriInterface{
 
-	protected string $scheme = '';
+	private string $scheme = '';
 
-	protected string $user = '';
+	private string $user = '';
 
-	protected ?string $pass = null;
+	private ?string $pass = null;
 
-	protected string $host = '';
+	private string $host = '';
 
-	protected ?int $port = null;
+	private ?int $port = null;
 
-	protected string $path = '';
+	private string $path = '';
 
-	protected string $query = '';
+	private string $query = '';
 
-	protected string $fragment = '';
+	private string $fragment = '';
 
 	/**
 	 * Uri constructor.
@@ -101,7 +101,7 @@ public function __toString():string{
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterScheme($scheme):string{
+	private function filterScheme($scheme):string{
 
 		if(!is_string($scheme)){
 			throw new InvalidArgumentException('scheme must be a string');
@@ -146,7 +146,7 @@ public function withScheme($scheme):UriInterface{
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterUser($user):string{
+	private function filterUser($user):string{
 
 		if(!is_string($user)){
 			throw new InvalidArgumentException('user must be a string');
@@ -161,7 +161,7 @@ protected function filterUser($user):string{
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterPass($pass):string{
+	private function filterPass($pass):string{
 
 		if(!is_string($pass)){
 			throw new InvalidArgumentException('pass must be a string');
@@ -228,7 +228,7 @@ public function withUserInfo($user, $password = null):UriInterface{
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterHost($host):string{
+	private function filterHost($host):string{
 
 		if(!is_string($host)){
 			throw new InvalidArgumentException('host must be a string');
@@ -276,7 +276,7 @@ public function withHost($host):UriInterface{
 	 * @return int|null
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterPort($port):?int{
+	private function filterPort($port):?int{
 
 		if($port === null){
 			return null;
@@ -327,7 +327,7 @@ public function withPort($port):UriInterface{
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterPath($path):string{
+	private function filterPath($path):string{
 
 		if(!is_string($path)){
 			throw new InvalidArgumentException('path must be a string');
@@ -371,7 +371,7 @@ public function withPath($path):UriInterface{
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
-	protected function filterQuery($query):string{
+	private function filterQuery($query):string{
 
 		if(!is_string($query)){
 			throw new InvalidArgumentException('query and fragment must be a string');
@@ -414,7 +414,7 @@ public function withQuery($query):UriInterface{
 	 *
 	 * @return string
 	 */
-	protected function filterFragment($fragment):string{
+	private function filterFragment($fragment):string{
 		return $this->filterQuery($fragment);
 	}
 
@@ -448,7 +448,7 @@ public function withFragment($fragment):UriInterface{
 	 *
 	 * @return void
 	 */
-	protected function parseUriParts(array $parts):void{
+	private function parseUriParts(array $parts):void{
 
 		foreach(['scheme', 'user', 'pass', 'host', 'port', 'path', 'query', 'fragment'] as $part){
 
@@ -468,7 +468,7 @@ protected function parseUriParts(array $parts):void{
 	 *
 	 * @return string
 	 */
-	protected function replaceChars(string $str, bool $query = null):string{
+	private function replaceChars(string $str, bool $query = null):string{
 		/** @noinspection RegExpRedundantEscape, RegExpUnnecessaryNonCapturingGroup */
 		return preg_replace_callback(
 			'/(?:[^a-z\d_\-\.~!\$&\'\(\)\*\+,;=%:@\/'.($query ? '\?' : '').']++|%(?![a-f\d]{2}))/i',
@@ -481,7 +481,7 @@ protected function replaceChars(string $str, bool $query = null):string{
 	/**
 	 * @return void
 	 */
-	protected function removeDefaultPort():void{
+	private function removeDefaultPort():void{
 
 		if(uriIsDefaultPort($this)){
 			$this->port = null;
@@ -492,7 +492,7 @@ protected function removeDefaultPort():void{
 	/**
 	 * @return void
 	 */
-	protected function validateState():void{
+	private function validateState():void{
 
 		if(empty($this->host) && ($this->scheme === 'http' || $this->scheme === 'https')){
 			$this->host = 'localhost';