Merge pull request #22626 from colemanw/readOnlyRename

APIv4 - Rename 'ReadOnly' trait to 'ReadOnlyEntity' to avoid PHP error
civicrm · Jan 27, 2022 · 01964ce · 01964ce
2 parents e463176 + 405d086
commit 01964ce
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/Civi/Api4/EntityFinancialTrxn.php b/Civi/Api4/EntityFinancialTrxn.php
@@ -22,7 +22,7 @@
  */
 class EntityFinancialTrxn extends Generic\DAOEntity {
   use Generic\Traits\EntityBridge;
-  use Generic\Traits\ReadOnly;
+  use Generic\Traits\ReadOnlyEntity;
 
   /**
    * @return array

diff --git a/Civi/Api4/FinancialItem.php b/Civi/Api4/FinancialItem.php
@@ -22,6 +22,6 @@
  * @package Civi\Api4
  */
 class FinancialItem extends Generic\DAOEntity {
-  use Generic\Traits\ReadOnly;
+  use Generic\Traits\ReadOnlyEntity;
 
 }
diff --git a/Civi/Api4/FinancialTrxn.php b/Civi/Api4/FinancialTrxn.php
@@ -25,6 +25,6 @@
  * @package Civi\Api4
  */
 class FinancialTrxn extends Generic\DAOEntity {
-  use Generic\Traits\ReadOnly;
+  use Generic\Traits\ReadOnlyEntity;
 
 }
diff --git a/Civi/Api4/Generic/Traits/ReadOnly.php → Civi/Api4/Generic/Traits/ReadOnlyEntity.php b/Civi/Api4/Generic/Traits/ReadOnly.php → Civi/Api4/Generic/Traits/ReadOnlyEntity.php
@@ -14,7 +14,7 @@
 /**
  * Trait for Entities not intended to be publicly writable.
  */
-trait ReadOnly {
+trait ReadOnlyEntity {
 
   /**
    * Not intended to be used outside CiviCRM core code.

diff --git a/Civi/Api4/LineItem.php b/Civi/Api4/LineItem.php
@@ -18,6 +18,6 @@
  * @package Civi\Api4
  */
 class LineItem extends Generic\DAOEntity {
-  use Generic\Traits\ReadOnly;
+  use Generic\Traits\ReadOnlyEntity;
 
 }
diff --git a/tests/phpunit/api/v4/Entity/ConformanceTest.php b/tests/phpunit/api/v4/Entity/ConformanceTest.php
@@ -515,7 +515,7 @@ protected function toDataProviderArray($names) {
    * @return bool
    */
   protected function isReadOnly($entityClass) {
-    return in_array('ReadOnly', $entityClass::getInfo()['type'], TRUE);
+    return in_array('ReadOnlyEntity', $entityClass::getInfo()['type'], TRUE);
   }
 
   /**