chore(s3): fully resolve conflict in S3ObjectTrait

joshtrichards · web-flow · commit 1989ae986520 · 2026-04-25T11:16:56.000-04:00
Signed-off-by: Josh &lt;josh.t.richards@gmail.com&gt;
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -272,7 +272,7 @@ public function deleteObject($urn) {
 	 * @throws S3Exception|\Exception if there is an unhandled exception
 	 */
 	public function objectExists($urn) {
-		return $this->getConnection()->doesObjectExistV2($this->bucket, $urn, false, $this->getSSECParameters());
+		return $this->getConnection()->doesObjectExistV2($this->bucket, $urn, false, $this->getServerSideEncryptionParameters());
 	}
 
 	public function copyObject($from, $to, array $options = []) {

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public function deleteObject($urn) {`
`272`	`272`	`* @throws S3Exception\|\Exception if there is an unhandled exception`
`273`	`273`	`*/`
`274`	`274`	`public function objectExists($urn) {`
`275`		`- return $this->getConnection()->doesObjectExistV2($this->bucket, $urn, false, $this->getSSECParameters());`
	`275`	`+ return $this->getConnection()->doesObjectExistV2($this->bucket, $urn, false, $this->getServerSideEncryptionParameters());`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`public function copyObject($from, $to, array $options = []) {`