PB-36607 Update Cake core to 4.5.7

passbolt · Nov 11, 2024 · ac0085c · ac0085c
1 parent ed7ffde
commit ac0085c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -75,7 +75,7 @@
         "ext-pdo": "*",
         "ext-curl": "*",
         "composer/composer": "^2.8.1",
-        "cakephp/cakephp": "^4.5",
+        "cakephp/cakephp": "^4.5.7",
         "cakephp/chronos": "2.4.*",
         "longwave/laminas-diactoros": "^2.14.1",
         "cakephp/migrations": "dev-master#cab2143c0b477eae213b472cdb5a3faa1ea1d0ff",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline-v5-upgrade.xml b/psalm-baseline-v5-upgrade.xml
@@ -5,11 +5,6 @@
       <code><![CDATA[$user->id]]></code>
     </InvalidPropertyFetch>
   </file>
-  <file src="plugins/PassboltCe/EmailNotificationSettings/src/Utility/EmailNotificationSettingsDefinitionRegisterEvent.php">
-    <MissingTemplateParam>
-      <code>EmailNotificationSettingsDefinitionRegisterEvent</code>
-    </MissingTemplateParam>
-  </file>
   <file src="plugins/PassboltCe/EmailNotificationSettings/tests/TestCase/Utility/EmailNotificationSettingsTest.php">
     <InvalidPropertyFetch>
       <code><![CDATA[$dbEmailNotifSettings->value]]></code>
@@ -527,24 +522,9 @@
       <code>$senderEmail</code>
     </InvalidCast>
   </file>
-  <file src="src/Controller/Events/ControllerFindIndexOptionsBeforeMarshal.php">
-    <MissingTemplateParam>
-      <code>ControllerFindIndexOptionsBeforeMarshal</code>
-    </MissingTemplateParam>
-  </file>
   <file src="src/Controller/Settings/SettingsIndexController.php">
     <InvalidConstantAssignmentValue>
       <code><![CDATA[SETTINGS_VISIBILITY_KEY = 'settingsVisibility']]></code>
     </InvalidConstantAssignmentValue>
   </file>
-  <file src="src/Model/Event/TableFindIndexBefore.php">
-    <MissingTemplateParam>
-      <code>TableFindIndexBefore</code>
-    </MissingTemplateParam>
-  </file>
-  <file src="src/Notification/Email/CollectSubscribedEmailRedactorEvent.php">
-    <MissingTemplateParam>
-      <code>CollectSubscribedEmailRedactorEvent</code>
-    </MissingTemplateParam>
-  </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
@@ -31,4 +31,8 @@
             <directory name="plugins/PassboltCe/Metadata/templates/" />
         </ignoreFiles>
     </projectFiles>
+
+    <issueHandlers>
+        <MissingTemplateParam errorLevel="suppress"/>
+    </issueHandlers>
 </psalm>
diff --git a/src/ORM/Association/PassboltBelongsToMany.php b/src/ORM/Association/PassboltBelongsToMany.php
@@ -29,6 +29,9 @@
  * Add the following option to the ORM query to remove any _jointData from the returned result.
  *
  *   $query->applyOptions(["excludeJunctionProperty" => true]);
+ *
+ * @template T of \Cake\ORM\Table
+ * @mixin T
  */
 class PassboltBelongsToMany extends BelongsToMany
 {