Merge pull request opencart#14061 from TheCartpenter/patch-120

Upgraded aws/aws-sdk-php vendor to v3.316.7

upload/admin/view/template/catalog/category.twig

@@ -18,32 +18,32 @@
   </div>
   <div class="container-fluid">
     <div class="row">
-    <div id="filter-category" class="col-lg-3 col-md-12 order-lg-last d-none d-lg-block mb-3">
-      <div class="card">
-        <div class="card-header"><i class="fa-solid fa-filter"></i> {{ text_filter }}</div>
-        <div class="card-body">
-          <form id="form-filter">
-          <div class="mb-3">
-            <label for="input-name" class="form-label">{{ entry_name }}</label>
-            <input type="text" name="filter_name" value="{{ filter_name }}" placeholder="{{ entry_name }}" id="input-name" data-oc-target="autocomplete-name" class="form-control" autocomplete="off"/>
-            <ul id="autocomplete-name" class="dropdown-menu"></ul>
-          </div>
-          <div class="mb-3">
-            <label for="input-status" class="form-label">{{ entry_status }}</label>
-            <select name="filter_status" id="input-status" class="form-select">
-              <option value=""></option>
-              <option value="1"{% if filter_status == '1' %} selected{% endif %}>{{ text_enabled }}</option>
-              <option value="0"{% if filter_status == '0' %} selected{% endif %}>{{ text_disabled }}</option>
-            </select>
-          </div>
-          <div class="text-end">
-            <button type="button" id="button-filter" class="btn btn-light"><i class="fa-solid fa-filter"></i> {{ button_filter }}</button>
-            <button type="reset" data-bs-toggle="tooltip" title="{{ button_reset }}" class="btn btn-outline-secondary"><i class="fa-solid fa-filter-circle-xmark"></i></button>
+      <div id="filter-category" class="col-lg-3 col-md-12 order-lg-last d-none d-lg-block mb-3">
+        <div class="card">
+          <div class="card-header"><i class="fa-solid fa-filter"></i> {{ text_filter }}</div>
+          <div class="card-body">
+            <form id="form-filter">
+              <div class="mb-3">
+                <label for="input-name" class="form-label">{{ entry_name }}</label>
+                <input type="text" name="filter_name" value="{{ filter_name }}" placeholder="{{ entry_name }}" id="input-name" data-oc-target="autocomplete-name" class="form-control" autocomplete="off"/>
+                <ul id="autocomplete-name" class="dropdown-menu"></ul>
+              </div>
+              <div class="mb-3">
+                <label for="input-status" class="form-label">{{ entry_status }}</label>
+                <select name="filter_status" id="input-status" class="form-select">
+                  <option value=""></option>
+                  <option value="1"{% if filter_status == '1' %} selected{% endif %}>{{ text_enabled }}</option>
+                  <option value="0"{% if filter_status == '0' %} selected{% endif %}>{{ text_disabled }}</option>
+                </select>
+              </div>
+              <div class="text-end">
+                <button type="button" id="button-filter" class="btn btn-light"><i class="fa-solid fa-filter"></i> {{ button_filter }}</button>
+                <button type="reset" data-bs-toggle="tooltip" title="{{ button_reset }}" class="btn btn-outline-secondary"><i class="fa-solid fa-filter-circle-xmark"></i></button>
+              </div>
+            </form>
           </div>
-          </form>
         </div>
       </div>
-    </div>
       <div class="col col-lg-9 col-md-12">
         <div class="card">
           <div class="card-header"><i class="fa-solid fa-list"></i> {{ text_list }}</div>
@@ -97,13 +97,13 @@ $('#button-filter').on('click', function() {
     var filter_name = $('#input-name').val();
 
     if (filter_name !== '') {
-      url += '&filter_name=' + encodeURIComponent(filter_name);
+        url += '&filter_name=' + encodeURIComponent(filter_name);
     }
 
     var filter_status = $('#input-status').val();
 
     if (filter_status !== '') {
-      url += '&filter_status=' + filter_status;
+        url += '&filter_status=' + filter_status;
     }
 
     window.history.pushState({}, null, 'index.php?route=catalog/category&user_token={{ user_token }}' + url);

upload/system/storage/vendor/aws/aws-sdk-php/src/CleanRooms/CleanRoomsClient.php

@@ -23,6 +23,8 @@
  * @method \GuzzleHttp\Promise\Promise createConfiguredTableAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result createConfiguredTableAssociation(array $args = [])
  * @method \GuzzleHttp\Promise\Promise createConfiguredTableAssociationAsync(array $args = [])
+ * @method \Aws\Result createConfiguredTableAssociationAnalysisRule(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise createConfiguredTableAssociationAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result createIdMappingTable(array $args = [])
  * @method \GuzzleHttp\Promise\Promise createIdMappingTableAsync(array $args = [])
  * @method \Aws\Result createIdNamespaceAssociation(array $args = [])
@@ -43,6 +45,8 @@
  * @method \GuzzleHttp\Promise\Promise deleteConfiguredTableAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result deleteConfiguredTableAssociation(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteConfiguredTableAssociationAsync(array $args = [])
+ * @method \Aws\Result deleteConfiguredTableAssociationAnalysisRule(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise deleteConfiguredTableAssociationAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result deleteIdMappingTable(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteIdMappingTableAsync(array $args = [])
  * @method \Aws\Result deleteIdNamespaceAssociation(array $args = [])
@@ -73,6 +77,8 @@
  * @method \GuzzleHttp\Promise\Promise getConfiguredTableAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result getConfiguredTableAssociation(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getConfiguredTableAssociationAsync(array $args = [])
+ * @method \Aws\Result getConfiguredTableAssociationAnalysisRule(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise getConfiguredTableAssociationAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result getIdMappingTable(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getIdMappingTableAsync(array $args = [])
  * @method \Aws\Result getIdNamespaceAssociation(array $args = [])
@@ -147,6 +153,8 @@
  * @method \GuzzleHttp\Promise\Promise updateConfiguredTableAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result updateConfiguredTableAssociation(array $args = [])
  * @method \GuzzleHttp\Promise\Promise updateConfiguredTableAssociationAsync(array $args = [])
+ * @method \Aws\Result updateConfiguredTableAssociationAnalysisRule(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise updateConfiguredTableAssociationAnalysisRuleAsync(array $args = [])
  * @method \Aws\Result updateIdMappingTable(array $args = [])
  * @method \GuzzleHttp\Promise\Promise updateIdMappingTableAsync(array $args = [])
  * @method \Aws\Result updateIdNamespaceAssociation(array $args = [])

upload/system/storage/vendor/aws/aws-sdk-php/src/DataZone/DataZoneClient.php

@@ -115,6 +115,8 @@
  * @method \GuzzleHttp\Promise\Promise getEnvironmentBlueprintAsync(array $args = [])
  * @method \Aws\Result getEnvironmentBlueprintConfiguration(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getEnvironmentBlueprintConfigurationAsync(array $args = [])
+ * @method \Aws\Result getEnvironmentCredentials(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise getEnvironmentCredentialsAsync(array $args = [])
  * @method \Aws\Result getEnvironmentProfile(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getEnvironmentProfileAsync(array $args = [])
  * @method \Aws\Result getFormType(array $args = [])

upload/system/storage/vendor/aws/aws-sdk-php/src/Ecr/EcrClient.php

@@ -20,6 +20,8 @@
  * @method \GuzzleHttp\Promise\Promise createPullThroughCacheRuleAsync(array $args = [])
  * @method \Aws\Result createRepository(array $args = [])
  * @method \GuzzleHttp\Promise\Promise createRepositoryAsync(array $args = [])
+ * @method \Aws\Result createRepositoryCreationTemplate(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise createRepositoryCreationTemplateAsync(array $args = [])
  * @method \Aws\Result deleteLifecyclePolicy(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteLifecyclePolicyAsync(array $args = [])
  * @method \Aws\Result deletePullThroughCacheRule(array $args = [])
@@ -28,6 +30,8 @@
  * @method \GuzzleHttp\Promise\Promise deleteRegistryPolicyAsync(array $args = [])
  * @method \Aws\Result deleteRepository(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteRepositoryAsync(array $args = [])
+ * @method \Aws\Result deleteRepositoryCreationTemplate(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise deleteRepositoryCreationTemplateAsync(array $args = [])
  * @method \Aws\Result deleteRepositoryPolicy(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteRepositoryPolicyAsync(array $args = [])
  * @method \Aws\Result describeImageReplicationStatus(array $args = [])
@@ -42,6 +46,8 @@
  * @method \GuzzleHttp\Promise\Promise describeRegistryAsync(array $args = [])
  * @method \Aws\Result describeRepositories(array $args = [])
  * @method \GuzzleHttp\Promise\Promise describeRepositoriesAsync(array $args = [])
+ * @method \Aws\Result describeRepositoryCreationTemplates(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise describeRepositoryCreationTemplatesAsync(array $args = [])
  * @method \Aws\Result getAuthorizationToken(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getAuthorizationTokenAsync(array $args = [])
  * @method \Aws\Result getDownloadUrlForLayer(array $args = [])
@@ -88,6 +94,8 @@
  * @method \GuzzleHttp\Promise\Promise untagResourceAsync(array $args = [])
  * @method \Aws\Result updatePullThroughCacheRule(array $args = [])
  * @method \GuzzleHttp\Promise\Promise updatePullThroughCacheRuleAsync(array $args = [])
+ * @method \Aws\Result updateRepositoryCreationTemplate(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise updateRepositoryCreationTemplateAsync(array $args = [])
  * @method \Aws\Result uploadLayerPart(array $args = [])
  * @method \GuzzleHttp\Promise\Promise uploadLayerPartAsync(array $args = [])
  * @method \Aws\Result validatePullThroughCacheRule(array $args = [])

upload/system/storage/vendor/aws/aws-sdk-php/src/ElasticLoadBalancingV2/ElasticLoadBalancingV2Client.php

@@ -27,6 +27,8 @@
  * @method \GuzzleHttp\Promise\Promise deleteLoadBalancerAsync(array $args = [])
  * @method \Aws\Result deleteRule(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteRuleAsync(array $args = [])
+ * @method \Aws\Result deleteSharedTrustStoreAssociation(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise deleteSharedTrustStoreAssociationAsync(array $args = [])
  * @method \Aws\Result deleteTargetGroup(array $args = [])
  * @method \GuzzleHttp\Promise\Promise deleteTargetGroupAsync(array $args = [])
  * @method \Aws\Result deleteTrustStore(array $args = [])
@@ -61,6 +63,8 @@
  * @method \GuzzleHttp\Promise\Promise describeTrustStoreRevocationsAsync(array $args = [])
  * @method \Aws\Result describeTrustStores(array $args = [])
  * @method \GuzzleHttp\Promise\Promise describeTrustStoresAsync(array $args = [])
+ * @method \Aws\Result getResourcePolicy(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise getResourcePolicyAsync(array $args = [])
  * @method \Aws\Result getTrustStoreCaCertificatesBundle(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getTrustStoreCaCertificatesBundleAsync(array $args = [])
  * @method \Aws\Result getTrustStoreRevocationContent(array $args = [])

upload/system/storage/vendor/aws/aws-sdk-php/src/Sdk.php

@@ -775,7 +775,7 @@
  */
 class Sdk
 {
-    const VERSION = '3.316.6';
+    const VERSION = '3.316.8';
 
     /** @var array Arguments for creating clients */
     private $args;

upload/system/storage/vendor/aws/aws-sdk-php/src/data/ecr/2015-09-21/paginators-1.json.php

@@ -1,3 +1,3 @@
 <?php
 // This file was auto-generated from sdk-root/src/data/ecr/2015-09-21/paginators-1.json
-return [ 'pagination' => [ 'DescribeImageScanFindings' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'non_aggregate_keys' => [ 'registryId', 'repositoryName', 'imageId', 'imageScanStatus', 'imageScanFindings', ], 'output_token' => 'nextToken', 'result_key' => [ 'imageScanFindings.findings', 'imageScanFindings.enhancedFindings', ], ], 'DescribeImages' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'imageDetails', ], 'DescribePullThroughCacheRules' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'pullThroughCacheRules', ], 'DescribeRepositories' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'repositories', ], 'GetLifecyclePolicyPreview' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'non_aggregate_keys' => [ 'registryId', 'repositoryName', 'lifecyclePolicyText', 'status', 'summary', ], 'output_token' => 'nextToken', 'result_key' => 'previewResults', ], 'ListImages' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'imageIds', ], ],];
+return [ 'pagination' => [ 'DescribeImageScanFindings' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'non_aggregate_keys' => [ 'registryId', 'repositoryName', 'imageId', 'imageScanStatus', 'imageScanFindings', ], 'output_token' => 'nextToken', 'result_key' => [ 'imageScanFindings.findings', 'imageScanFindings.enhancedFindings', ], ], 'DescribeImages' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'imageDetails', ], 'DescribePullThroughCacheRules' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'pullThroughCacheRules', ], 'DescribeRepositories' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'repositories', ], 'DescribeRepositoryCreationTemplates' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'non_aggregate_keys' => [ 'registryId', ], 'output_token' => 'nextToken', 'result_key' => 'repositoryCreationTemplates', ], 'GetLifecyclePolicyPreview' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'non_aggregate_keys' => [ 'registryId', 'repositoryName', 'lifecyclePolicyText', 'status', 'summary', ], 'output_token' => 'nextToken', 'result_key' => 'previewResults', ], 'ListImages' => [ 'input_token' => 'nextToken', 'limit_key' => 'maxResults', 'output_token' => 'nextToken', 'result_key' => 'imageIds', ], ],];

upload/system/storage/vendor/composer/installed.json

@@ -59,17 +59,17 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.316.6",
-            "version_normalized": "3.316.6.0",
+            "version": "3.316.8",
+            "version_normalized": "3.316.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "230094aae21026df7b0c223dbdbcc09f952f0395"
+                "reference": "9aff2e655c3f0139f5abe20195ee235b19fff603"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/230094aae21026df7b0c223dbdbcc09f952f0395",
-                "reference": "230094aae21026df7b0c223dbdbcc09f952f0395",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9aff2e655c3f0139f5abe20195ee235b19fff603",
+                "reference": "9aff2e655c3f0139f5abe20195ee235b19fff603",
                 "shasum": ""
             },
             "require": {
@@ -110,7 +110,7 @@
                 "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
                 "ext-sockets": "To use client-side monitoring"
             },
-            "time": "2024-07-23T18:11:01+00:00",
+            "time": "2024-07-25T19:29:46+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -151,7 +151,7 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.316.6"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.316.8"
             },
             "install-path": "../aws/aws-sdk-php"
         },

upload/system/storage/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'opencart/opencart',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'dbb39e25332db4989836f9ff495fa247501cda55',
+        'reference' => 'e6d41b58138d2f8b64612e6fde6bc1847a87c2bb',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../../../../',
         'aliases' => array(),
@@ -20,9 +20,9 @@
             'dev_requirement' => false,
         ),
         'aws/aws-sdk-php' => array(
-            'pretty_version' => '3.316.6',
-            'version' => '3.316.6.0',
-            'reference' => '230094aae21026df7b0c223dbdbcc09f952f0395',
+            'pretty_version' => '3.316.8',
+            'version' => '3.316.8.0',
+            'reference' => '9aff2e655c3f0139f5abe20195ee235b19fff603',
             'type' => 'library',
             'install_path' => __DIR__ . '/../aws/aws-sdk-php',
             'aliases' => array(),
@@ -67,7 +67,7 @@
         'opencart/opencart' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'dbb39e25332db4989836f9ff495fa247501cda55',
+            'reference' => 'e6d41b58138d2f8b64612e6fde6bc1847a87c2bb',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../../../../',
             'aliases' => array(),