diff --git a/CHANGELOG.md b/CHANGELOG.md index fd4be6fa..9d7a8155 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ # b24-php-sdk change log +## UPCOMING 1.6.0 – 2025.09.01 -## UPCOMING 1.5.0 – 2025.08.01 +## 1.5.0 – 2025.08.01 ### Added @@ -24,89 +25,97 @@ - `delete` deletes a department, with batch calls support - `update` modifies a department, with batch calls support - `countByFilter` count departments by filter - -### Fixed -- Fixed typehints in Contact batch for method `add`, [see details](https://github.com/bitrix24/b24phpsdk/issues/202) - -### Changed -### Statistics - -## 1.4.0 – 2025.07.01 - -### Added - - Added service `CRM\Requisites\Service\RequisiteUserfield` with support methods, see [add crm.requisite.userfield.* methods](https://github.com/bitrix24/b24phpsdk/issues/188): - - `add` add userfield to requisite - - `get` get userfield to requisite - - `list` list userfields - - `delete` delete userfield - - `update` update userfield + - `add` add userfield to requisite + - `get` get userfield to requisite + - `list` list userfields + - `delete` delete userfield + - `update` update userfield - Added service `CRM\Requisites\Service\RequisiteBankdetail` with support methods: - - `add` add bank detail to requisite - - `get` get bank detail to requisite - - `fields` get fields for bank details - - `list` list bank details - - `delete` delete bank detail - - `update` update bank detail - - `countByFilter` count bank details by filter + - `add` add bank detail to requisite + - `get` get bank detail to requisite + - `fields` get fields for bank details + - `list` list bank details + - `delete` delete bank detail + - `update` update bank detail + - `countByFilter` count bank details by filter - Added service `CRM\Requisites\Service\RequisiteLink` with support methods: - - `register` registers the link between requisites and an object - - `unregister` removes the link between requisites and an object - - `fields` get a formal description of the fields of the requisites link - - `get` returns the link between requisites and an object - - `list` returns a list of links between requisites based on a filter - - `countByFilter` count links by filter + - `register` registers the link between requisites and an object + - `unregister` removes the link between requisites and an object + - `fields` get a formal description of the fields of the requisites link + - `get` returns the link between requisites and an object + - `list` returns a list of links between requisites based on a filter + - `countByFilter` count links by filter - Added service `CRM\Requisites\Service\RequisitePresetField` with support methods: - - `add` adds a customizable field to the requisites template - - `get` returns the description of the custom field in the requisites template by identifier - - `fields` returns the description of the custom field in the requisites template by identifier - - `list` returns a list of all custom fields for a specific requisites template - - `delete` deletes a customizable field from the requisites template - - `update` modifies a custom field in the requisites template - - `availabletoadd` returns fields available for addition to the specified requisites template + - `add` adds a customizable field to the requisites template + - `get` returns the description of the custom field in the requisites template by identifier + - `fields` returns the description of the custom field in the requisites template by identifier + - `list` returns a list of all custom fields for a specific requisites template + - `delete` deletes a customizable field from the requisites template + - `update` modifies a custom field in the requisites template + - `availabletoadd` returns fields available for addition to the specified requisites template - Added service `Services\CRM\Status\Service\Status` with support methods, see [crm.status.* methods](https://github.com/bitrix24/b24phpsdk/issues/194): - - `fields` returns descriptions of reference book fields - - `get` returns an element of the reference book by its identifier - - `list` returns a list of elements of the reference book by filter, with batch calls support - - `add` creates a new element in the specified reference book, with batch calls support - - `delete` deletes an element from the reference book, with batch calls support - - `update` updates an existing element of the reference book, with batch calls support - - `countByFilter` counts elements of the reference book by filter + - `fields` returns descriptions of reference book fields + - `get` returns an element of the reference book by its identifier + - `list` returns a list of elements of the reference book by filter, with batch calls support + - `add` creates a new element in the specified reference book, with batch calls support + - `delete` deletes an element from the reference book, with batch calls support + - `update` updates an existing element of the reference book, with batch calls support + - `countByFilter` counts elements of the reference book by filter - Added service `Services\CRM\Status\Service\StatusEntity` with support methods, - - `items` returns elements of the reference book by its symbolic identifier - - `types` returns descriptions of reference book types + - `items` returns elements of the reference book by its symbolic identifier + - `types` returns descriptions of reference book types - Added service `Services\CRM\Timeline\Service\Comment` with support methods, see [crm.timeline.comment.* methods](https://github.com/bitrix24/b24phpsdk/issues/196): - - `fields` retrieves a list of timeline comment fields - - `get` retrieves information about a comment - - `list` retrieves a list of all comments for a CRM entity, with batch calls support - - `add` adds a new comment to the timeline, with batch calls support - - `delete` deletes a comment, with batch calls support - - `update` updates a comment, with batch calls support - - `countByFilter` count comments by filter + - `fields` retrieves a list of timeline comment fields + - `get` retrieves information about a comment + - `list` retrieves a list of all comments for a CRM entity, with batch calls support + - `add` adds a new comment to the timeline, with batch calls support + - `delete` deletes a comment, with batch calls support + - `update` updates a comment, with batch calls support + - `countByFilter` count comments by filter - Added support for events: - - `OnCrmTimelineCommentAdd` - - `OnCrmTimelineCommentDelete` - - `OnCrmTimelineCommentUpdate` + - `OnCrmTimelineCommentAdd` + - `OnCrmTimelineCommentDelete` + - `OnCrmTimelineCommentUpdate` - Added service `Services\CRM\Timeline\Service\Bindings` with support methods: - - `fields` retrieves the fields of the link between CRM entities and the timeline record - - `list` retrieves a list of links for a timeline record, with batch calls support - - `bind` adds a link between a timeline record and a CRM entity, with batch calls support - - `unbind` removes a link between a timeline record and a CRM entity, with batch calls support - - `countByFilter` count links between a timeline record and CRM entities by filter + - `fields` retrieves the fields of the link between CRM entities and the timeline record + - `list` retrieves a list of links for a timeline record, with batch calls support + - `bind` adds a link between a timeline record and a CRM entity, with batch calls support + - `unbind` removes a link between a timeline record and a CRM entity, with batch calls support + - `countByFilter` count links between a timeline record and CRM entities by filter - Added service `Services\CRM\Item\Productrow\Service\Productrow` with support methods, see [crm.item.productrow.* methods](https://github.com/bitrix24/b24phpsdk/issues/198): - - `fields` retrieves a list of product item fields - - `set` associates a product item with a CRM object - - `get` retrieves information about a product item by id - - `list` retrieves a list of product items, with batch calls support - - `add` adds a product item, with batch calls support - - `delete` deletes a product item, with batch calls support - - `update` updates a product item - - `getAvailableForPayment` retrieves a list of unpaid products - - `countByFilter` counts product items by filter + - `fields` retrieves a list of product item fields + - `set` associates a product item with a CRM object + - `get` retrieves information about a product item by id + - `list` retrieves a list of product items, with batch calls support + - `add` adds a product item, with batch calls support + - `delete` deletes a product item, with batch calls support + - `update` updates a product item + - `getAvailableForPayment` retrieves a list of unpaid products + - `countByFilter` counts product items by filter + +### Fixed +- Fixed typehints in Contact batch for method `add`, [see details](https://github.com/bitrix24/b24phpsdk/issues/202) + +### Changed +- Fixed constructor arguments in tests ApplicationInstallations [see details](https://github.com/bitrix24/b24phpsdk/issues/191) +- Bump giggsey/libphonenumber-for-php version to ^8|^9 + +### Statistics +``` +Bitrix24 API-methods count: 1166 +Supported in bitrix24-php-sdk methods count: 362 +Coverage percentage: 31.05% +``` + +## 1.4.0 – 2025.07.01 + +### Added + - Added service `Services\CRM\Lead\Service\LeadContact` with support methods, see [crm.lead.contact.* methods](https://github.com/bitrix24/b24phpsdk/issues/170): - `fields` get fields for lead contact connection diff --git a/README.md b/README.md index 0c59465d..687d9558 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ If You work on Windows: - please use [WSL - Windows Subsystem for Linux](https://learn.microsoft.com/en-us/windows/wsl/) - if your filesystem is NTFS, You can disable flag `git config --global core.protectNTFS false` for checkout folders started with dot. -Or add `"bitrix24/b24phpsdk": "1.4.*"` to `composer.json` of your application. +Or add `"bitrix24/b24phpsdk": "1.5.*"` to `composer.json` of your application. ## B24PhpSdk ✨FEATURES✨ diff --git a/composer.json b/composer.json index 20565cd2..4b3a97ae 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "ext-intl": "*", "psr/log": "^2 || ^3", "fig/http-message-util": "^1", - "giggsey/libphonenumber-for-php": "^8", + "giggsey/libphonenumber-for-php": "^8 || ^9", "darsyn/ip": "^4 || ^5", "nesbot/carbon": "^3", "moneyphp/money": "^3 || ^4", diff --git a/src/Core/ApiClient.php b/src/Core/ApiClient.php index 01c2ed30..ff242dc4 100644 --- a/src/Core/ApiClient.php +++ b/src/Core/ApiClient.php @@ -38,7 +38,7 @@ class ApiClient implements ApiClientInterface /** * @const string */ - protected const SDK_VERSION = '1.4.0'; + protected const SDK_VERSION = '1.5.0'; protected const SDK_USER_AGENT = 'b24-php-sdk-vendor'; diff --git a/tests/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceTest.php b/tests/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceTest.php index 48d96ef7..47255b84 100644 --- a/tests/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceTest.php +++ b/tests/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceTest.php @@ -36,8 +36,6 @@ abstract class ApplicationInstallationInterfaceTest extends TestCase abstract protected function createApplicationInstallationImplementation( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -54,8 +52,6 @@ abstract protected function createApplicationInstallationImplementation( final public function testGetId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -68,8 +64,6 @@ final public function testGetId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -82,82 +76,12 @@ final public function testGetId( $this->assertEquals($uuid, $installation->getId()); } - #[Test] - #[DataProvider('applicationInstallationDataProvider')] - #[TestDox('test getCreatedAt method')] - final public function testGetCreatedAt( - Uuid $uuid, - ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, - Uuid $bitrix24AccountUuid, - ApplicationStatus $applicationStatus, - PortalLicenseFamily $portalLicenseFamily, - ?int $portalUsersCount, - ?Uuid $clientContactPersonUuid, - ?Uuid $partnerContactPersonUuid, - ?Uuid $partnerUuid, - ?string $externalId - ): void { - $installation = $this->createApplicationInstallationImplementation( - $uuid, - $applicationInstallationStatus, - $createdAt, - $updatedAt, - $bitrix24AccountUuid, - $applicationStatus, - $portalLicenseFamily, - $portalUsersCount, - $clientContactPersonUuid, - $partnerContactPersonUuid, - $partnerUuid, - $externalId - ); - $this->assertEquals($createdAt, $installation->getCreatedAt()); - } - - #[Test] - #[DataProvider('applicationInstallationDataProvider')] - #[TestDox('test getCreatedAt method')] - final public function testGetUpdatedAt( - Uuid $uuid, - ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, - Uuid $bitrix24AccountUuid, - ApplicationStatus $applicationStatus, - PortalLicenseFamily $portalLicenseFamily, - ?int $portalUsersCount, - ?Uuid $clientContactPersonUuid, - ?Uuid $partnerContactPersonUuid, - ?Uuid $partnerUuid, - ?string $externalId - ): void { - $installation = $this->createApplicationInstallationImplementation( - $uuid, - $applicationInstallationStatus, - $createdAt, - $updatedAt, - $bitrix24AccountUuid, - $applicationStatus, - $portalLicenseFamily, - $portalUsersCount, - $clientContactPersonUuid, - $partnerContactPersonUuid, - $partnerUuid, - $externalId - ); - $this->assertEquals($updatedAt, $installation->getUpdatedAt()); - } - #[Test] #[DataProvider('applicationInstallationDataProvider')] #[TestDox('test testGetBitrix24AccountId method')] final public function testGetBitrix24AccountId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -170,8 +94,6 @@ final public function testGetBitrix24AccountId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -190,8 +112,6 @@ final public function testGetBitrix24AccountId( final public function testGetContactPersonId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -204,8 +124,6 @@ final public function testGetContactPersonId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -224,8 +142,6 @@ final public function testGetContactPersonId( final public function testBindContactPerson( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -238,8 +154,6 @@ final public function testBindContactPerson( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -262,8 +176,6 @@ final public function testBindContactPerson( final public function testUnbindContactPerson( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -276,8 +188,6 @@ final public function testUnbindContactPerson( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -302,8 +212,6 @@ final public function testUnbindContactPerson( final public function testGetBitrix24PartnerContactPersonId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -316,8 +224,6 @@ final public function testGetBitrix24PartnerContactPersonId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -336,8 +242,6 @@ final public function testGetBitrix24PartnerContactPersonId( final public function testLinkBitrix24PartnerContactPerson( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -350,8 +254,6 @@ final public function testLinkBitrix24PartnerContactPerson( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -374,8 +276,6 @@ final public function testLinkBitrix24PartnerContactPerson( final public function testUnlinkBitrix24PartnerContactPerson( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -388,8 +288,6 @@ final public function testUnlinkBitrix24PartnerContactPerson( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -414,8 +312,6 @@ final public function testUnlinkBitrix24PartnerContactPerson( final public function linkBitrix24Partner( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -428,8 +324,6 @@ final public function linkBitrix24Partner( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -452,8 +346,6 @@ final public function linkBitrix24Partner( final public function unlinkBitrix24Partner( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -466,8 +358,6 @@ final public function unlinkBitrix24Partner( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -492,8 +382,6 @@ final public function unlinkBitrix24Partner( final public function testGetExternalId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -506,8 +394,6 @@ final public function testGetExternalId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -529,8 +415,6 @@ final public function testGetExternalId( final public function testSetExternalId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -543,8 +427,6 @@ final public function testSetExternalId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -572,8 +454,6 @@ final public function testSetExternalId( final public function testGetStatus( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -586,8 +466,6 @@ final public function testGetStatus( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -606,8 +484,6 @@ final public function testGetStatus( final public function testApplicationInstalled( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -620,8 +496,6 @@ final public function testApplicationInstalled( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -646,8 +520,6 @@ final public function testApplicationInstalled( final public function testApplicationUninstalled( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -660,8 +532,6 @@ final public function testApplicationUninstalled( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -688,8 +558,6 @@ final public function testApplicationUninstalled( final public function testMarkAsActive( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -702,8 +570,6 @@ final public function testMarkAsActive( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -735,8 +601,6 @@ final public function testMarkAsActive( final public function testMarkAsBlocked( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -749,8 +613,6 @@ final public function testMarkAsBlocked( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -777,8 +639,6 @@ final public function testMarkAsBlocked( final public function testGetApplicationStatus( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -791,8 +651,6 @@ final public function testGetApplicationStatus( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -811,8 +669,6 @@ final public function testGetApplicationStatus( final public function testChangeApplicationStatus( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -825,8 +681,6 @@ final public function testChangeApplicationStatus( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -849,8 +703,6 @@ final public function testChangeApplicationStatus( final public function testGetPortalLicenseFamily( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -863,8 +715,6 @@ final public function testGetPortalLicenseFamily( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -883,8 +733,6 @@ final public function testGetPortalLicenseFamily( final public function testChangePortalLicenseFamily( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -897,8 +745,6 @@ final public function testChangePortalLicenseFamily( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -921,8 +767,6 @@ final public function testChangePortalLicenseFamily( final public function testGetPortalUsersCount( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -935,8 +779,6 @@ final public function testGetPortalUsersCount( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -955,8 +797,6 @@ final public function testGetPortalUsersCount( final public function testChangePortalUsersCount( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -969,8 +809,6 @@ final public function testChangePortalUsersCount( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -993,8 +831,6 @@ final public function testChangePortalUsersCount( final public function testGetComment( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -1007,8 +843,6 @@ final public function testGetComment( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -1030,8 +864,6 @@ final public function testGetComment( final public function testGetBitrix24PartnerId( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -1044,8 +876,6 @@ final public function testGetBitrix24PartnerId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -1064,8 +894,6 @@ final public function testGetBitrix24PartnerId( final public function testIsApplicationTokenValid( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -1078,8 +906,6 @@ final public function testIsApplicationTokenValid( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -1107,8 +933,6 @@ final public function testIsApplicationTokenValid( final public function testSetApplicationToken( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -1121,8 +945,6 @@ final public function testSetApplicationToken( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -1149,8 +971,6 @@ public static function applicationInstallationDataProvider(): Generator yield 'status-new-all-fields' => [ Uuid::v7(), // uuid ApplicationInstallationStatus::new, // application installation status - CarbonImmutable::now(), // created at - CarbonImmutable::createFromMutable((new DateTime())->add(new DateInterval('PT1H'))), // updated at Uuid::v7(), // bitrix24 account id ApplicationStatus::subscription(), // application status from bitrix24 api call response PortalLicenseFamily::nfr, // portal license family value @@ -1163,8 +983,6 @@ public static function applicationInstallationDataProvider(): Generator yield 'status-new-without-all-optional-fields' => [ Uuid::v7(), // uuid ApplicationInstallationStatus::new, // application installation status - CarbonImmutable::now(), // created at - CarbonImmutable::createFromMutable((new DateTime())->add(new DateInterval('PT1H'))), // updated at Uuid::v7(), // bitrix24 account id ApplicationStatus::subscription(), // application status from bitrix24 api call response PortalLicenseFamily::nfr, // portal license family value diff --git a/tests/Application/Contracts/ApplicationInstallations/Repository/ApplicationInstallationRepositoryInterfaceTest.php b/tests/Application/Contracts/ApplicationInstallations/Repository/ApplicationInstallationRepositoryInterfaceTest.php index 25605584..9336a827 100644 --- a/tests/Application/Contracts/ApplicationInstallations/Repository/ApplicationInstallationRepositoryInterfaceTest.php +++ b/tests/Application/Contracts/ApplicationInstallations/Repository/ApplicationInstallationRepositoryInterfaceTest.php @@ -38,8 +38,6 @@ abstract class ApplicationInstallationRepositoryInterfaceTest extends TestCase abstract protected function createApplicationInstallationImplementation( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -80,8 +78,6 @@ final public function testSave( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -120,8 +116,6 @@ final public function testGetByIdHappyPath( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -187,8 +181,6 @@ final public function testDeleteWithHappyPath( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -265,8 +257,6 @@ final public function testDeleteWithWrongState( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -306,8 +296,6 @@ final public function testFindByBitrix24AccountId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, @@ -370,8 +358,6 @@ final public function testFindByExternalId( $installation = $this->createApplicationInstallationImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, diff --git a/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceReferenceImplementationTest.php b/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceReferenceImplementationTest.php index 044ae6ee..fad5e109 100644 --- a/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceReferenceImplementationTest.php +++ b/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationInterfaceReferenceImplementationTest.php @@ -34,8 +34,6 @@ class ApplicationInstallationInterfaceReferenceImplementationTest extends Applic protected function createApplicationInstallationImplementation( Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, - CarbonImmutable $createdAt, - CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, @@ -49,8 +47,6 @@ protected function createApplicationInstallationImplementation( return new ApplicationInstallationReferenceEntityImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily, diff --git a/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationReferenceEntityImplementation.php b/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationReferenceEntityImplementation.php index eaf8a86f..dab68207 100644 --- a/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationReferenceEntityImplementation.php +++ b/tests/Unit/Application/Contracts/ApplicationInstallations/Entity/ApplicationInstallationReferenceEntityImplementation.php @@ -34,11 +34,13 @@ final class ApplicationInstallationReferenceEntityImplementation implements Appl private ?string $applicationToken = null; + private readonly CarbonImmutable $createdAt; + + private CarbonImmutable $updatedAt; + public function __construct( private readonly Uuid $id, private ApplicationInstallationStatus $applicationInstallationStatus, - private readonly CarbonImmutable $createdAt, - private CarbonImmutable $updatedAt, private readonly Uuid $bitrix24AccountUuid, private ApplicationStatus $applicationStatus, private PortalLicenseFamily $portalLicenseFamily, @@ -48,6 +50,8 @@ public function __construct( private ?Uuid $bitrix24PartnerUuid, private ?string $externalId, ) { + $this->createdAt = new CarbonImmutable(); + $this->updatedAt = new CarbonImmutable(); } public function getId(): Uuid diff --git a/tests/Unit/Application/Contracts/ApplicationInstallations/Repository/InMemoryApplicationInstallationRepositoryImplementationTest.php b/tests/Unit/Application/Contracts/ApplicationInstallations/Repository/InMemoryApplicationInstallationRepositoryImplementationTest.php index a8f839bd..a67479c1 100644 --- a/tests/Unit/Application/Contracts/ApplicationInstallations/Repository/InMemoryApplicationInstallationRepositoryImplementationTest.php +++ b/tests/Unit/Application/Contracts/ApplicationInstallations/Repository/InMemoryApplicationInstallationRepositoryImplementationTest.php @@ -31,13 +31,21 @@ #[CoversClass(ApplicationInstallationRepositoryInterface::class)] class InMemoryApplicationInstallationRepositoryImplementationTest extends ApplicationInstallationRepositoryInterfaceTest { - protected function createApplicationInstallationImplementation(Uuid $uuid, ApplicationInstallationStatus $applicationInstallationStatus, CarbonImmutable $createdAt, CarbonImmutable $updatedAt, Uuid $bitrix24AccountUuid, ApplicationStatus $applicationStatus, PortalLicenseFamily $portalLicenseFamily, ?int $portalUsersCount, ?Uuid $clientContactPersonUuid, ?Uuid $partnerContactPersonUuid, ?Uuid $partnerUuid, ?string $externalId,): ApplicationInstallationInterface - { + protected function createApplicationInstallationImplementation( + Uuid $uuid, + ApplicationInstallationStatus $applicationInstallationStatus, + Uuid $bitrix24AccountUuid, + ApplicationStatus $applicationStatus, + PortalLicenseFamily $portalLicenseFamily, + ?int $portalUsersCount, + ?Uuid $clientContactPersonUuid, + ?Uuid $partnerContactPersonUuid, + ?Uuid $partnerUuid, + ?string $externalId, + ): ApplicationInstallationInterface { return new ApplicationInstallationReferenceEntityImplementation( $uuid, $applicationInstallationStatus, - $createdAt, - $updatedAt, $bitrix24AccountUuid, $applicationStatus, $portalLicenseFamily,