From 87ebf688da5000dc2ce43a32131c7279f8aa1dfd Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 24 Sep 2020 11:23:20 +1200
Subject: [PATCH] dev/core#2044 Make contact_id optional on v4 api for Address,
 phone, email

It's optional in the schema for events etc
---
 .../Service/Spec/Provider/AddressCreationSpecProvider.php     | 1 -
 Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php | 1 -
 Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php | 1 -
 tests/phpunit/api/v3/AddressTest.php                          | 4 +++-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php
index 1b29d79350..b929cb9da5 100644
--- a/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/AddressCreationSpecProvider.php
@@ -27,7 +27,6 @@ class AddressCreationSpecProvider implements Generic\SpecProviderInterface {
    * @param \Civi\Api4\Service\Spec\RequestSpec $spec
    */
   public function modifySpec(RequestSpec $spec) {
-    $spec->getFieldByName('contact_id')->setRequired(TRUE);
     $spec->getFieldByName('location_type_id')->setRequired(TRUE);
   }
 
diff --git a/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
index a7b0dd8a7e..8bbb299b45 100644
--- a/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/EmailCreationSpecProvider.php
@@ -27,7 +27,6 @@ class EmailCreationSpecProvider implements Generic\SpecProviderInterface {
    * @inheritDoc
    */
   public function modifySpec(RequestSpec $spec) {
-    $spec->getFieldByName('contact_id')->setRequired(TRUE);
     $spec->getFieldByName('email')->setRequired(TRUE);
     $spec->getFieldByName('on_hold')->setRequired(FALSE);
     $spec->getFieldByName('is_bulkmail')->setRequired(FALSE);
diff --git a/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php b/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php
index 27aef02c9a..4faecb1c55 100644
--- a/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php
+++ b/Civi/Api4/Service/Spec/Provider/PhoneCreationSpecProvider.php
@@ -27,7 +27,6 @@ class PhoneCreationSpecProvider implements Generic\SpecProviderInterface {
    * @inheritDoc
    */
   public function modifySpec(RequestSpec $spec) {
-    $spec->getFieldByName('contact_id')->setRequired(TRUE);
     $spec->getFieldByName('phone')->setRequired(TRUE);
   }
 
diff --git a/tests/phpunit/api/v3/AddressTest.php b/tests/phpunit/api/v3/AddressTest.php
index 2a12ef95f5..400dacabb4 100644
--- a/tests/phpunit/api/v3/AddressTest.php
+++ b/tests/phpunit/api/v3/AddressTest.php
@@ -57,11 +57,13 @@ class api_v3_AddressTest extends CiviUnitTestCase {
 
   /**
    * @param int $version
+   *
    * @dataProvider versionThreeAndFour
+   * @throws \CRM_Core_Exception
    */
   public function testCreateAddress($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPIAndDocument('address', 'create', $this->_params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument('Address', 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $this->assertNotNull($result['values'][$result['id']]['id']);
     $this->getAndCheck($this->_params, $result['id'], 'address');
-- 
2.25.1