From: Pradeep Nayak Date: Fri, 24 Aug 2018 16:03:45 +0000 (+0100) Subject: fixes to Unit and api test X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=52f56bf0bc82f4b569a9c4f6b70d6cc41fd86885;p=civicrm-core.git fixes to Unit and api test --- diff --git a/CRM/Core/DAO/Component.php b/CRM/Core/DAO/Component.php index a4823bf118..e1fafce1a3 100644 --- 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 62202dc02b..fa0dbe649c 100644 --- 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 0a9f7e13f2..c5ceff329d 100644 --- a/xml/schema/Core/Component.xml +++ b/xml/schema/Core/Component.xml @@ -7,6 +7,7 @@ 2.0 id + Component ID int unsigned true Component ID