Avoid overriding the exception message with the raw message (#1516)

stof · web-flow · commit fa2fdaaf67e9 · 2023-07-08T18:13:55.000+02:00
diff --git a/src/Exception/CodeStorageExceededException.php b/src/Exception/CodeStorageExceededException.php
@@ -30,8 +30,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/EC2AccessDeniedException.php b/src/Exception/EC2AccessDeniedException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/EC2ThrottledException.php b/src/Exception/EC2ThrottledException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/EC2UnexpectedException.php b/src/Exception/EC2UnexpectedException.php
@@ -35,9 +35,6 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
         $this->ec2ErrorCode = isset($data['EC2ErrorCode']) ? (string) $data['EC2ErrorCode'] : null;
     }
 }
diff --git a/src/Exception/EFSIOException.php b/src/Exception/EFSIOException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/EFSMountConnectivityException.php b/src/Exception/EFSMountConnectivityException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/EFSMountFailureException.php b/src/Exception/EFSMountFailureException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/EFSMountTimeoutException.php b/src/Exception/EFSMountTimeoutException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/ENILimitReachedException.php b/src/Exception/ENILimitReachedException.php
@@ -28,8 +28,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/InvalidParameterValueException.php b/src/Exception/InvalidParameterValueException.php
@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/InvalidRequestContentException.php b/src/Exception/InvalidRequestContentException.php
@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/InvalidRuntimeException.php b/src/Exception/InvalidRuntimeException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/InvalidSecurityGroupIDException.php b/src/Exception/InvalidSecurityGroupIDException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/InvalidSubnetIDException.php b/src/Exception/InvalidSubnetIDException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/InvalidZipFileException.php b/src/Exception/InvalidZipFileException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/KMSAccessDeniedException.php b/src/Exception/KMSAccessDeniedException.php
@@ -26,8 +26,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/KMSDisabledException.php b/src/Exception/KMSDisabledException.php
@@ -26,8 +26,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/KMSInvalidStateException.php b/src/Exception/KMSInvalidStateException.php
@@ -26,8 +26,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/KMSNotFoundException.php b/src/Exception/KMSNotFoundException.php
@@ -26,8 +26,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/PolicyLengthExceededException.php b/src/Exception/PolicyLengthExceededException.php
@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/PreconditionFailedException.php b/src/Exception/PreconditionFailedException.php
@@ -28,8 +28,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/RecursiveInvocationException.php b/src/Exception/RecursiveInvocationException.php
@@ -28,8 +28,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/RequestTooLargeException.php b/src/Exception/RequestTooLargeException.php
@@ -28,8 +28,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/ResourceConflictException.php b/src/Exception/ResourceConflictException.php
@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/ResourceNotFoundException.php b/src/Exception/ResourceNotFoundException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/ResourceNotReadyException.php b/src/Exception/ResourceNotReadyException.php
@@ -28,8 +28,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/ServiceException.php b/src/Exception/ServiceException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/SnapStartException.php b/src/Exception/SnapStartException.php
@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/SnapStartNotReadyException.php b/src/Exception/SnapStartNotReadyException.php
@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/SnapStartTimeoutException.php b/src/Exception/SnapStartTimeoutException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/SubnetIPAddressLimitReachedException.php b/src/Exception/SubnetIPAddressLimitReachedException.php
@@ -26,8 +26,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }
diff --git a/src/Exception/TooManyRequestsException.php b/src/Exception/TooManyRequestsException.php
@@ -57,9 +57,6 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
         $this->reason = isset($data['Reason']) ? (string) $data['Reason'] : null;
     }
 }
diff --git a/src/Exception/UnsupportedMediaTypeException.php b/src/Exception/UnsupportedMediaTypeException.php
@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void
         $data = $response->toArray(false);
 
         $this->type = isset($data['Type']) ? (string) $data['Type'] : null;
-        if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {
-            $this->message = $v;
-        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,5 @@ protected function populateResult(ResponseInterface $response): void`
`30`	`30`	`$data = $response->toArray(false);`
`31`	`31`
`32`	`32`	`$this->type = isset($data['Type']) ? (string) $data['Type'] : null;`
`33`		`- if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {`
`34`		`- $this->message = $v;`
`35`		`- }`
`36`	`33`	`}`
`37`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,5 @@ protected function populateResult(ResponseInterface $response): void`
`25`	`25`	`$data = $response->toArray(false);`
`26`	`26`
`27`	`27`	`$this->type = isset($data['Type']) ? (string) $data['Type'] : null;`
`28`		`- if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {`
`29`		`- $this->message = $v;`
`30`		`- }`
`31`	`28`	`}`
`32`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,9 +35,6 @@ protected function populateResult(ResponseInterface $response): void`
`35`	`35`	`$data = $response->toArray(false);`
`36`	`36`
`37`	`37`	`$this->type = isset($data['Type']) ? (string) $data['Type'] : null;`
`38`		`- if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {`
`39`		`- $this->message = $v;`
`40`		`- }`
`41`	`38`	`$this->ec2ErrorCode = isset($data['EC2ErrorCode']) ? (string) $data['EC2ErrorCode'] : null;`
`42`	`39`	`}`
`43`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,5 @@ protected function populateResult(ResponseInterface $response): void`
`28`	`28`	`$data = $response->toArray(false);`
`29`	`29`
`30`	`30`	`$this->type = isset($data['Type']) ? (string) $data['Type'] : null;`
`31`		`- if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {`
`32`		`- $this->message = $v;`
`33`		`- }`
`34`	`31`	`}`
`35`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,5 @@ protected function populateResult(ResponseInterface $response): void`
`27`	`27`	`$data = $response->toArray(false);`
`28`	`28`
`29`	`29`	`$this->type = isset($data['Type']) ? (string) $data['Type'] : null;`
`30`		`- if (null !== $v = (isset($data['message']) ? (string) $data['message'] : null)) {`
`31`		`- $this->message = $v;`
`32`		`- }`
`33`	`30`	`}`
`34`	`31`	`}`