Skip to content
This repository was archived by the owner on Feb 7, 2025. It is now read-only.

Commit 50d8d04

Browse files
committed
Merge branch '2.x'
# Conflicts: # src/bitrix24.php # src/classes/crm/contact/contact.php # src/classes/crm/product/property.php # src/classes/user/user.php
2 parents 1f8b3af + 6b6392b commit 50d8d04

File tree

247 files changed

+9253
-13055
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+9253
-13055
lines changed

.github/workflows/phpstan.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
on:
2+
push:
3+
pull_request:
4+
5+
name: PHPStan checks
6+
7+
jobs:
8+
phpstan:
9+
name: PHPStan
10+
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: "Checkout"
15+
uses: actions/checkout@v2
16+
17+
- name: PHPStan
18+
uses: docker://oskarstark/phpstan-ga
19+
with:
20+
args: analyse

.github/workflows/phpunit.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: "PHPUnit tests"
2+
3+
on:
4+
- push
5+
- pull_request
6+
7+
env:
8+
COMPOSER_FLAGS: "--ansi --no-interaction --no-progress --prefer-dist"
9+
10+
jobs:
11+
tests:
12+
name: "PHPUnit tests"
13+
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
php-version:
19+
- "7.4"
20+
dependencies: [ highest ]
21+
22+
steps:
23+
- name: "Checkout"
24+
uses: "actions/checkout@v2"
25+
26+
- name: "Install PHP"
27+
uses: "shivammathur/setup-php@v2"
28+
with:
29+
coverage: "none"
30+
php-version: "${{ matrix.php-version }}"
31+
32+
- name: "Install dependencies"
33+
run: |
34+
composer update ${{ env.COMPOSER_FLAGS }}
35+
36+
- name: "Run tests"
37+
run: "composer exec phpunit -- --verbose"
38+
39+
- name: Run test suite
40+
run: composer run-script unit-tests

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
/.idea*
22
vendor
33
composer.phar
4-
composer.lock
4+
composer.lock
5+
.phpunit.result.cache
6+
tools/.env.local
7+
tools/logs
8+
examples/logs

.travis.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 90 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,53 @@
11
# bitrix24-php-sdk change log
2+
3+
## 2.0-alpha.3(14.11.2021)
4+
5+
* add php8 version support
6+
* change in scope «CRM» Product service and integration tests
7+
* add `AddedItemIdResultInterface` for batch-queries result
8+
* add method `countByFilter` for CRM.Contact entity
9+
* fix method name in `ContactsResult`
10+
* add interface `ApiClientInterface`
11+
* bump phpunit version
12+
* bump phpstan version
13+
14+
## 2.0-alpha.2 (31.01.2021)
15+
16+
* remove Travis CI and migrate to Github Actions
17+
* add unit-tests in independent github action
18+
* add phpstan checks in independent github action
19+
* add in scope «CRM» Contacts service and integration test
20+
* add in scope «CRM» Contacts batch service and integration test
21+
* add in scope «CRM» Products service and integration test
22+
* add in scope «CRM» Settings service and integration test
23+
* add in scope «CRM» DealCategoryStage service and integration test
24+
* add in scope «CRM» DealProductRows service and integration test
25+
* add in scope «CRM» DealContact service and integration test
26+
* add in scope «IM» IM service and integration test
27+
* add in default scope «Main» default service
28+
29+
## 2.0-alpha.1 (11.07.2020)
30+
31+
* remove all v1 code
32+
* migrate to Symfony HttpClient
33+
* add documentation webhook auth type
34+
* add OAuth 2.0 support
35+
* add Events support
36+
37+
## 0.1.0 (14.11.2021)
38+
branch version 1.x – bugfix and security releases only
39+
240
## 0.7.0 (11.07.2020)
41+
342
* add arguments in method `Bitrix24\Bizproc\Robot::add` for return results support
443

544
## 0.6.2 (12.09.2019)
45+
646
* remove in method, `processBatchCalls` remove call `handleBitrix24APILevelErrors`
747
* remove php 5.x branch in travis config
848

949
## 0.6.1 (20.03.2019)
50+
1051
* add `offset` parameter to entity `CRM\Status\Status` in method `getList`
1152
* add `offset` parameter to entity `User\User` in method `getList`
1253
* add method `messageAdd` to entity `Bitrix24\Bitrix24`
@@ -19,8 +60,9 @@
1960
* fix log level in method `Bitrix24::handleBitrix24APILevelErrors`
2061

2162
## 0.6.0 (18.02.2018)
63+
2264
* add support for `FaceTracker` entity
23-
* add presets for request timing information
65+
* add presets for request timing information
2466
* add all methods for sonetgroup
2567
* add method `crm.contact.userfield.update`
2668
* add activities methods
@@ -37,39 +79,51 @@
3779
* add new placement presets for detail page
3880

3981
## 0.5.4 (8.07.2017)
82+
4083
* add Callback for expired token. Fix pullrequest#63 by valga
4184
* add method `update` in class `Bitrix24\CRM\Product`
4285
* increased curl time out
4386
* add new scope `placement` in class `Bitrix24\Presets\Scope`
4487
* add batch calls method to bitrix24 api client interface
4588

4689
## 0.5.3 (20.05.2017)
90+
4791
* add class `Bitrix24\Placement\Placement`
4892
* add preset `Bitrix24\Presets\Placement\Placement` with placement codes
4993
* add preset `Bitrix24\Presets\Placement\Fields` with placement fields
5094

5195
## 0.5.2 (11.05.2017)
96+
5297
* add preset `Bitrix24\Presets\CRM\Product\ProductRowFields`
5398
* updated preset `Bitrix24\Presets\CRM\Contact\Fields`
5499
* updated preset `Bitrix24\Presets\CRM\Deal\Fields`
55100
* updated preset `Bitrix24\Presets\CRM\Lead\Fields`
56101

57102
## 0.5.1 (30.04.2017)
103+
58104
* add preset `Bitrix24\Presets\CRM\Product\Fields`
59105
* add method `add` in class `Bitrix24\CRM\Product`
60106

61107
## 0.5.0 (4.09.2016)
108+
62109
* add class `Bitrix24\CRM\Quote` see pr [Added support for Quote API calls](https://github.com/mesilov/bitrix24-php-sdk/pull/53/)
63-
* add support http status 301 moved permanently in class `Bitrix24` see issue [301 Moved Permanently #49](https://github.com/mesilov/bitrix24-php-sdk/issues/49)
110+
* add support http status 301 moved permanently in class `Bitrix24` see
111+
issue [301 Moved Permanently #49](https://github.com/mesilov/bitrix24-php-sdk/issues/49)
64112
* fixed bug in class `Bitrix24` see pr [Issue in the isAccessTokenExpire method](https://github.com/mesilov/bitrix24-php-sdk/pull/54)
65113

66114
## 0.4.1 (4.08.2016)
67-
* add new events in class `Bitrix24\Presets\Event\Event` see issue [Add new bitrix24 events #44](https://github.com/mesilov/bitrix24-php-sdk/issues/44)
68-
* add new scope in class `Bitrix24\Presets\Scope` see issue [Update scope presets class #47](https://github.com/mesilov/bitrix24-php-sdk/issues/47)
69-
* remove file with old deprecated exceptions see issue [Move all exceptions in namespace «Exceptions» #46](https://github.com/mesilov/bitrix24-php-sdk/issues/46)
115+
116+
* add new events in class `Bitrix24\Presets\Event\Event` see
117+
issue [Add new bitrix24 events #44](https://github.com/mesilov/bitrix24-php-sdk/issues/44)
118+
* add new scope in class `Bitrix24\Presets\Scope` see
119+
issue [Update scope presets class #47](https://github.com/mesilov/bitrix24-php-sdk/issues/47)
120+
* remove file with old deprecated exceptions see
121+
issue [Move all exceptions in namespace «Exceptions» #46](https://github.com/mesilov/bitrix24-php-sdk/issues/46)
70122

71123
## 0.4.0 (16.07.2016)
72-
* remove all exceptions in namespace `\Exceptions` see issue [Move all exceptions in namespace «Exceptions» #46](https://github.com/mesilov/bitrix24-php-sdk/issues/46)
124+
125+
* remove all exceptions in namespace `\Exceptions` see
126+
issue [Move all exceptions in namespace «Exceptions» #46](https://github.com/mesilov/bitrix24-php-sdk/issues/46)
73127
* add class `Bitrix24\Exceptions\Bitrix24Exception`
74128
* add class `Bitrix24\Exceptions\Bitrix24IoException`
75129
* add class `Bitrix24\Exceptions\Bitrix24EmptyResponseException`
@@ -93,37 +147,48 @@
93147
* updated class `Bitrix24\Bitrix24SecurityException` mark as **deprecated**
94148

95149
## 0.3.4 (06.06.2016)
150+
96151
* add exception class `Bitrix24EmptyResponseException`
97152
* in class `Bitrix24` add debug information for some error types
98-
* temporary remove calls to oauth.bitrix.info for methods `app.info` and `app.stat` see issue [Fix errors after change REST API to support self hosted version #43](https://github.com/mesilov/bitrix24-php-sdk/issues/43)
153+
* temporary remove calls to oauth.bitrix.info for methods `app.info` and `app.stat` see
154+
issue [Fix errors after change REST API to support self hosted version #43](https://github.com/mesilov/bitrix24-php-sdk/issues/43)
99155

100156
## 0.3.3 (28.05.2016)
101-
* fixed bug in class `Bitrix24` see issue [Fix errors after change REST API to support self hosted version #43](https://github.com/mesilov/bitrix24-php-sdk/issues/43)
157+
158+
* fixed bug in class `Bitrix24` see
159+
issue [Fix errors after change REST API to support self hosted version #43](https://github.com/mesilov/bitrix24-php-sdk/issues/43)
102160

103161
## 0.3.2 (07.05.2016)
104-
* fixed bug in class `Bitrix24\Im\Notify` see issue [ATTACH_ERROR for calls method im.notify for empty attach #42](https://github.com/mesilov/bitrix24-php-sdk/issues/42)
105-
162+
163+
* fixed bug in class `Bitrix24\Im\Notify` see
164+
issue [ATTACH_ERROR for calls method im.notify for empty attach #42](https://github.com/mesilov/bitrix24-php-sdk/issues/42)
165+
106166
## 0.3.1 (04.05.2016)
167+
107168
* add `dev` branch in GitHub repo
108169
* fixed bug in class `Bitrix24\Im\Attach\Attach`, method `Attach::getAttachItems()` already return array
109170

110171
## 0.3.0 (04.05.2016)
172+
111173
* add class `Bitrix24\Im\Attach\Item\Message` class implements work with string messages in attach item
112-
* add interface `Bitrix24\Presets\Im\iChatColor` with chat color presets
174+
* add interface `Bitrix24\Presets\Im\iChatColor` with chat color presets
113175
* add phpUnit tests for items:
114-
* `Bitrix24\Im\Attach\Item\Delimiter`
115-
* `Bitrix24\Im\Attach\Item\File`
116-
* `Bitrix24\Im\Attach\Item\Grid`
117-
* `Bitrix24\Im\Attach\Item\Image`
118-
* `Bitrix24\Im\Attach\Item\Link`
119-
* `Bitrix24\Im\Attach\Item\Message`
120-
* `Bitrix24\Im\Attach\Item\User`
121-
* fixed bug in class `Bitrix24\Im\Attach\Attach`
176+
* `Bitrix24\Im\Attach\Item\Delimiter`
177+
* `Bitrix24\Im\Attach\Item\File`
178+
* `Bitrix24\Im\Attach\Item\Grid`
179+
* `Bitrix24\Im\Attach\Item\Image`
180+
* `Bitrix24\Im\Attach\Item\Link`
181+
* `Bitrix24\Im\Attach\Item\Message`
182+
* `Bitrix24\Im\Attach\Item\User`
183+
* fixed bug in class `Bitrix24\Im\Attach\Attach`
122184

123185
## 0.2.1 (27.04.2016)
124-
* add exception class `Bitrix24PortalDeleted` and handle Bitrix24 portal deleted event. See issue [Add support for deleted portals #40](https://github.com/mesilov/bitrix24-php-sdk/issues/40)
186+
187+
* add exception class `Bitrix24PortalDeleted` and handle Bitrix24 portal deleted event. See
188+
issue [Add support for deleted portals #40](https://github.com/mesilov/bitrix24-php-sdk/issues/40)
125189

126190
## 0.2.0 (24.06.2015)
191+
127192
* add class `Deal`
128193
* add class `LiveFeedMessage`
129194
* add task fields presets
@@ -142,6 +207,7 @@
142207
* remove class `Bitrix24\Task\TaskItem`
143208

144209
## 0.1.4 (18.04.2015)
210+
145211
* add presets for user fields data type structure
146212
* add method `Update` and predefined constants in class `Invoice`
147213
* add protected method `handleBitrix24APILevelErrors` in a base class
@@ -156,6 +222,7 @@
156222
* fixed bug in Fix method isAccessTokenExpire
157223

158224
## 0.1.3 (24.08.2014)
225+
159226
* add const `TOTAL` and `RESULT` for class `Bitrix24\Presets\Main`
160227
* add class `Bitrix24\Presets\Users\Fields` for Bitrix24 users fields
161228
* add class `Bitrix24\Departments\Department`
@@ -171,6 +238,7 @@
171238
* fixed bug in __construct in abstract class `Bitrix24Entity`
172239

173240
## 0.1.2 (22.01.2014)
241+
174242
* add security sign support in api-call
175243
* add class `User`
176244
* add method «admin» — Check is current user admin
@@ -179,9 +247,11 @@
179247
* add MIT-LICENSE
180248

181249
## 0.1.1 (9.10.2013)
250+
182251
* add namespace support
183252
* add classes of Bitrix24 parts: tasks, sonet
184253
* add base class `Bitrix24Entity`
185254

186255
## 0.1.0 (26.10.2013)
256+
187257
* Initial release

0 commit comments

Comments
 (0)