Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bitrix24-php-sdk beta 1 build #367

Merged
merged 5 commits into from
Feb 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# bitrix24-php-sdk change log

## 2.0-beta.1 — 25.03.2023
## 2.0-beta.1 — 18.02.2024

### Added

* ❗️add php 8.3 support, drop 8.1 and 8.0 support
* ❗️add php 8.3, 8.2 support, drop 8.1 and 8.0 support
* add `Symfony\Component\Uid\Uuid` requirements
* add contracts for bitrix24 applications based on bitrix24-php-sdk - `Bitrix24\SDK\Application\Contracts`, now
added `Bitrix24Account`
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ default:
@egrep -e '^\S+' ./Makefile | grep -v default | sed -r 's/://' | sed -r 's/^/ - /'

phpstan:
vendor/bin/phpstan analyse
vendor/bin/phpstan analyse

test-unit:
vendor/bin/phpunit --testsuite unit_tests
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

class DefaultRequestIdGenerator implements RequestIdGeneratorInterface
{
private const string DEFAULT_REQUEST_ID_HEADER_FIELD_NAME = 'X-Request-ID';
private const string DEFAULT_QUERY_STRING_PARAMETER_NAME = 'bx24_request_id';
private const array KEY_NAME_VARIANTS = [
private const DEFAULT_REQUEST_ID_HEADER_FIELD_NAME = 'X-Request-ID';
private const DEFAULT_QUERY_STRING_PARAMETER_NAME = 'bx24_request_id';
private const KEY_NAME_VARIANTS = [
'REQUEST_ID',
'HTTP_X_REQUEST_ID',
'UNIQUE_ID'
Expand Down
2 changes: 1 addition & 1 deletion src/Services/CRM/Common/Result/AbstractCrmItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

class AbstractCrmItem extends AbstractItem
{
private const string CRM_USERFIELD_PREFIX = 'UF_CRM_';
private const CRM_USERFIELD_PREFIX = 'UF_CRM_';

/**
* @var Currency
Expand Down
2 changes: 1 addition & 1 deletion src/Services/Catalog/Common/Result/AbstractCatalogItem.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

abstract class AbstractCatalogItem extends AbstractItem
{
private const string CRM_USERFIELD_PREFIX = 'UF_CRM_';
private const CRM_USERFIELD_PREFIX = 'UF_CRM_';

/**
* @var Currency
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Application/ApplicationStatusTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function testInitFromString(): void
/**
* @return \Generator
*/
public function statusDataProvider(): Generator
public static function statusDataProvider(): Generator
{
yield 'free' => [
'F',
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Core/Credentials/ApplicationProfileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function testFromArray(array $arr, ?string $expectedException): void
$this->assertEquals($prof->getClientSecret(), $arr['BITRIX24_PHP_SDK_APPLICATION_CLIENT_SECRET']);
}

public function arrayDataProvider(): Generator
public static function arrayDataProvider(): Generator
{
yield 'valid' => [
[
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Core/Credentials/CredentialsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function testDomainUrlWithProtocol(): void
* @throws \Bitrix24\SDK\Core\Exceptions\InvalidArgumentException
* @throws \Bitrix24\SDK\Core\Exceptions\UnknownScopeCodeException
*/
public function credentialsDataProviderWithDomainUrlVariants(): Generator
public static function credentialsDataProviderWithDomainUrlVariants(): Generator
{
yield 'with webhook walid domain url' => [
Credentials::createFromWebhook(new WebhookUrl('https://bitrix24-php-sdk-playground.bitrix24.ru/rest/1/valid-webhook/')),
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Core/Response/DTO/TimeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function testInitFromResponseData(array $result): void
/**
* @return \Generator
*/
public function timingsDataProvider(): Generator
public static function timingsDataProvider(): Generator
{
yield 'without operating reset at' => [
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function testExistsRequestId($requestIdKey, $requestId): void
unset($_SERVER[$requestIdKey]);
}

public function requestIdKeyDataProvider(): Generator
public static function requestIdKeyDataProvider(): Generator
{
yield 'REQUEST_ID' => [
'REQUEST_ID',
Expand Down
Loading