v2.5.0 -- Allow symfony 7.x and don't use public-read when uploading …

…to s3
triniti · Jan 26, 2024 · 18a1447 · 18a1447
1 parent bf677c1
commit 18a1447
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 22 deletions.
diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
@@ -2,6 +2,12 @@
 This changelog references the relevant changes done in 2.x versions.
 
 
+## v2.5.0
+* Require php 8.3.
+* Allow symfony 7.x
+* Do not use public-read when uploading to s3.
+
+
 ## v2.4.4
 * Check for empty unslotted nodes in SearchTeasersRequestHandler and SearchArticlesRequestHandler.
 

diff --git a/composer.json b/composer.json
@@ -4,30 +4,30 @@
   "type": "library",
   "license": "Apache-2.0",
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.3",
     "ext-apcu": "*",
     "ext-json": "*",
     "ext-openssl": "*",
     "ext-redis": "*",
     "ext-zlib": "*",
-    "aws/aws-sdk-php-symfony": "^2.2",
-    "gdbots/app-bundle": "^2.4",
-    "gdbots/crypto-bundle": "^3.1",
+    "aws/aws-sdk-php-symfony": "^2.6",
+    "gdbots/app-bundle": "^2.5",
+    "gdbots/crypto-bundle": "^3.2",
     "gdbots/enrichments": "^3.0",
-    "gdbots/iam-bundle": "^3.0",
-    "google/apiclient": "^2.9",
-    "guzzlehttp/oauth-subscriber": "~0.5",
-    "ruflin/elastica": "^7.1",
-    "symfony/asset": "^6.2",
-    "symfony/expression-language": "^6.2",
-    "symfony/monolog-bundle": "^3.7",
-    "symfony/twig-bundle": "^6.2",
-    "symfony/web-link": "^6.2",
-    "symfony/yaml": "^6.2",
+    "gdbots/iam-bundle": "^3.1",
+    "google/apiclient": "^2.15",
+    "guzzlehttp/oauth-subscriber": "~0.6",
+    "ruflin/elastica": "^7.3",
+    "symfony/asset": "^6.4 || ^7.0",
+    "symfony/expression-language": "^6.4 || ^7.0",
+    "symfony/monolog-bundle": "^3.10",
+    "symfony/twig-bundle": "^6.4 || ^7.0",
+    "symfony/web-link": "^6.4 || ^7.0",
+    "symfony/yaml": "^6.4 || ^7.0",
     "triniti/schemas": "^3.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
+    "phpunit/phpunit": "^10.5",
     "triniti/acme-schemas": "^3.0"
   },
   "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -4,6 +4,7 @@
   <testsuites>
     <testsuite name="Triniti">
       <directory>tests/</directory>
+      <exclude>tests/AbstractPbjxTest.php</exclude>
     </testsuite>
   </testsuites>
 

diff --git a/src/Dam/AssetUploader.php b/src/Dam/AssetUploader.php
@@ -63,7 +63,7 @@ protected function uploadToS3(AssetId $assetId, string $filename, array $options
             'Key'          => $options['key'] ?? $assetId->toFilePath($version, $quality),
             'SourceFile'   => $filename,
             'ContentType'  => $mimeType,
-            'ACL'          => $options['acl'] ?? 'public-read',
+            'ACL'          => $options['acl'] ?? 'bucket-owner-full-control',
             'CacheControl' => 'max-age=31536000', // 1 year
             'Metadata'     => $metadata,
         ]);

diff --git a/src/Dam/GetUploadUrlsRequestHandler.php b/src/Dam/GetUploadUrlsRequestHandler.php
@@ -73,7 +73,7 @@ public function handleRequest(Message $request, Pbjx $pbjx): Message
                 $command = $this->s3Client->getCommand('PutObject', [
                     'Bucket'       => $this->bucket,
                     'Key'          => $assetId->toFilePath($version, $quality),
-                    'ACL'          => 'public-read',
+                    // 'ACL'          => 'public-read',
                     'CacheControl' => 'max-age=31536000', // 1 year
                     'Metadata'     => [
                         'asset-ref' => $this->assetIdToNodeRef($assetId)->toString(),

diff --git a/tests/AppleNews/AppleNewsApiTest.php b/tests/AppleNews/AppleNewsApiTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
                     'secret',
                 ]
             )
-            ->setMethods(
+            ->onlyMethods(
                 [
                     'getGuzzleClient',
                 ]
@@ -278,7 +278,7 @@ public function testCreateArticleNotification(): void
         $this->assertTrue($response['ok']);
     }
 
-    public function providerTestRequestInvalidStatusCode(): array
+    public static function providerTestRequestInvalidStatusCode(): array
     {
         /* status code*/
         return [

diff --git a/tests/AppleNews/ArticleDocumentTest.php b/tests/AppleNews/ArticleDocumentTest.php
@@ -87,7 +87,7 @@ public function testJsonSerialize(): void
         $this->assertJsonStringEqualsJsonString($expectedJson, json_encode($this->articleDocument));
     }
 
-    public function providerTestMissingGlobalSettings(): array
+    public static function providerTestMissingGlobalSettings(): array
     {
         $docMissingComponentLayout = new ArticleDocument();
         $docMissingComponentLayout->setIdentifier('identifier');

diff --git a/tests/Curator/TeaserableWatcherTest.php b/tests/Curator/TeaserableWatcherTest.php
@@ -26,6 +26,8 @@
 
 final class TeaserableWatcherTest extends AbstractPbjxTest
 {
+    protected MockNcr $ncr;
+
     public function setup(): void
     {
         parent::setup();

diff --git a/tests/Dam/AssetEnricherTest.php b/tests/Dam/AssetEnricherTest.php
@@ -24,7 +24,7 @@ public function testEnrichWithS3Object(): void
         /** @var S3Client|MockObject $s3Client */
         $s3Client = $this->getMockBuilder(S3Client::class)
             ->disableOriginalConstructor()
-            ->setMethods(['headObject'])
+            ->addMethods(['headObject'])
             ->getMock();
         $s3Client->method('headObject')
             ->willReturn([

diff --git a/tests/Notify/Notifier/AppleNewsNotifierTest.php b/tests/Notify/Notifier/AppleNewsNotifierTest.php
@@ -67,7 +67,7 @@ protected function setup(): void
                     $marshaler,
                 ]
             )
-            ->setMethods(
+            ->onlyMethods(
                 [
                     'createArticleDocument',
                     'updateArticleDocument',