Merge branch '2023.11' into 2024.11

tine-groupware · Jan 31, 2024 · c421b96 · c421b96
2 parents 08404b7 + 093358a
commit c421b96
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/tine20/Tinebase/Controller/Record/Abstract.php b/tine20/Tinebase/Controller/Record/Abstract.php
@@ -1761,7 +1761,7 @@ protected function _setSystemNotes($_updatedRecord, $_systemNoteType = Tinebase_
     protected function _inspectBeforeUpdate($_record, $_oldRecord)
     {
         if (null !== ($mc = $_record::getConfiguration())) {
-            foreach ($mc->{Tinebase_ModelConfiguration_Const::CONTROLLER_HOOK_BEFORE_UPDATE} as $hook) {
+            foreach ($mc->getControllerHooksBeforeUpdate() as $hook) {
                 if (count($hook) > 2) {
                     $params = array_slice($hook, 2);
                     $hook = array_slice($hook, 0, 2);
@@ -1772,7 +1772,7 @@ protected function _inspectBeforeUpdate($_record, $_oldRecord)
                     call_user_func_array($hook, array_merge($params, [$_record, $_oldRecord]));
                 } else {
                     if (Tinebase_Core::isLogLevel(Zend_Log::NOTICE)) Tinebase_Core::getLogger()->notice(
-                        __METHOD__ . '::' . __LINE__ . ' hook is not callable: ' . print_r($hook, true));
+                        __METHOD__ . '::' . __LINE__ . ' Hook is not callable: ' . print_r($hook, true));
                 }
             }
         }

diff --git a/tine20/Tinebase/ModelConfiguration.php b/tine20/Tinebase/ModelConfiguration.php
@@ -407,14 +407,6 @@ class Tinebase_ModelConfiguration extends Tinebase_ModelConfiguration_Const {
      */
     protected $_controllerHookBeforeUpdate = [];
 
-    /**
-     * FIXME do we need both?? this might be needed because php 8.2 deprecates dynamic props
-     * FIXME adding this breaks Sales_Document_JsonTest::testOfferBoilerplates
-     *
-     * @var array
-     */
-    // public $controllerHookBeforeUpdate = [];
-
     protected $_jsonFacadeFields = [];
 
     /**
@@ -2555,14 +2547,21 @@ public static function resolveRecordsPropertiesForRecordSet(Tinebase_Record_Reco
      *
      * @return array
      */
-    public function getVirtualFields() {
+    public function getVirtualFields()
+    {
         return $this->_virtualFields;
     }
 
-    public function hasField($_field) {
+    public function hasField($_field)
+    {
         return isset($this->_fields[$_field]);
     }
 
+    public function getControllerHooksBeforeUpdate(): array
+    {
+        return $this->_controllerHookBeforeUpdate;
+    }
+
     /**
      * reset cache vars
      */

diff --git a/tine20/Tinebase/ModelConfiguration/Const.php b/tine20/Tinebase/ModelConfiguration/Const.php
@@ -33,7 +33,7 @@ class Tinebase_ModelConfiguration_Const {
     public const CONFIG = 'config';
     public const CONTROLLER = 'controller';
     public const CONTROLLER_CLASS_NAME = 'controllerClassName';
-    public const CONTROLLER_HOOK_BEFORE_UPDATE = 'controllerHookBeforeUpdate';
+    public const CONTROLLER_HOOK_BEFORE_UPDATE = '_controllerHookBeforeUpdate';
     public const CONVERTERS = 'converters';
     public const COLUMNS = 'columns';
     public const COPY_OMIT = 'copyOmit';