fixes to Unit and api test

diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php
index a4823bf1180a0e499f213047ae0d42b27e06c8e6..e1fafce1a3341937b65d190b3036339162048de6 100644 (file)
--- a/CRM/Core/DAO/Component.php
+++ b/CRM/Core/DAO/Component.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Core/Component.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:14ca0040d5a5656fd5dd91ad60a8ac89)
+ * (GenCodeChecksum:d0152fb407a743b3e15fd20c35f41c67)
  */
 
 /**
@@ -69,6 +69,7 @@ class CRM_Core_DAO_Component extends CRM_Core_DAO {
         'id' => [
           'name' => 'id',
           'type' => CRM_Utils_Type::T_INT,
+          'title' => ts('Component ID'),
           'description' => 'Component ID',
           'required' => TRUE,
           'table_name' => 'civicrm_component',

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 62202dc02b24c229fe4efdb02ea9c8e940b48f95..fa0dbe649c78286ead06c42daedeb01daadaaaf2 100644 (file)
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -842,7 +842,6 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
     $this->createLoggedInUser();// so subsidiary activities are created
 
     $entitiesWithNamingIssues = [
-      'MailingComponent' => 'Component',
       'SmsProvider' => 'Provider',
       'AclRole' => 'EntityRole',
       'MailingEventQueue' => 'Queue',

diff --git a/xml/schema/Core/Component.xml b/xml/schema/Core/Component.xml
index 0a9f7e13f28a6cf5eefb45077776fae2f6cb7670..c5ceff329d92e6e0259561ec0eeeaa6b7544b6ff 100644 (file)
--- a/xml/schema/Core/Component.xml
+++ b/xml/schema/Core/Component.xml
@@ -7,6 +7,7 @@
   <add>2.0</add>
   <field>
     <name>id</name>
+    <title>Component ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>Component ID</comment>