Skip to content

Commit dd03e82

Browse files
Merge branch 'i-doit-main'
2 parents 61a7435 + b002272 commit dd03e82

151 files changed

Lines changed: 1621 additions & 1144 deletions

File tree

Some content is hidden

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

.github/issue_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Please note:
2121

2222
| Question | Answer |
2323
| ------------------------- | ----------------- |
24-
| bheisig/idoitapi version | x.y.z |
24+
| idoit/apiclient version | x.y.z |
2525
| i-doit version | x.y.z open/pro |
2626
| i-doit API add-on version | x.y.z |
2727

.github/workflows/main.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
---
2+
name: Main workflow
3+
4+
on:
5+
- push
6+
- pull_request
7+
8+
jobs:
9+
10+
lint:
11+
name: Lint
12+
runs-on: ubuntu-latest
13+
continue-on-error: ${{ matrix.experimental }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
php-versions:
18+
- '8.0'
19+
- '8.1'
20+
experimental: [false]
21+
include:
22+
- php-versions: '7.4'
23+
experimental: true
24+
- php-versions: nightly
25+
experimental: true
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v2
29+
- name: Setup PHP
30+
uses: shivammathur/setup-php@v2
31+
with:
32+
php-version: ${{ matrix.php-versions }}
33+
extensions: curl, date, dom, json, openssl, spl, xml, zlib
34+
tools: composer:v2
35+
- name: Get Composer cache directory
36+
id: composer-cache
37+
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
38+
- name: Cache Composer dependencies
39+
uses: actions/cache@v2
40+
with:
41+
path: ${{ steps.composer-cache.outputs.dir }}
42+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
43+
restore-keys: ${{ runner.os }}-composer-
44+
- name: Install dependencies
45+
run: composer install
46+
- name: Lint
47+
run: composer ci

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
_*
12
.idea/
23
build/
34
vendor/

.travis.yml

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

CHANGELOG.md

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,47 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased][]
99

10-
**Note:** Support for PHP 7.1 is finally dropped. Please upgrade to at least version 7.2. Version 7.4 is recommended.
10+
Spring clean 2022!
1111

1212
### Added
1313

1414
- `Idoit::search()`, `Idoit::batchSearch`: Add search modes "normal" (default), "deep" and "auto-deep"
1515

1616
### Changed
1717

18-
- Require at least PHP version 7.2
18+
- **Breaking:** Change Composer package to `idoit/apiclient`
19+
- **Breaking:** Change PHP namespace to `Idoit\APIClient`
20+
- **Breaking:** Move repository to `github.com/i-doit/api-client-php`
21+
- **Breaking:** Require at least PHP version `8.0`
22+
- Recommend PHP version `8.1`
23+
- **Breaking:** Require at least i-doit `1.18.1` and its API add-on `1.12.3`
24+
25+
### Deprecated
26+
27+
- Deprecate support of PHP version `7.4`
1928

2029
### Removed
2130

22-
- Drop support of PHP version 7.1
31+
- **Breaking:** Drop support of PHP version `7.1`, `7.2`, and `7.3`
2332

2433
## [0.10][] – 2020-04-07
2534

26-
**Note:** Support for PHP 7.0 is finally dropped. Version 7.1 is deprecated. Support will be dropped in a further release. Please upgrade to at least version 7.2. Version 7.4 is recommended.
35+
**Note:** Support for PHP `7.0` is finally dropped. Version `7.1` is deprecated. Support will be dropped in a further release. Please upgrade to at least version `7.2`. Version `7.4` is recommended.
2736

2837
### Changed
2938

30-
- Require at least PHP version 7.1 on production environments
31-
- Require at least PHP version 7.2 on dev/CI environments
32-
- Mark PHP version 7.1 as deprecated
33-
- Recommend PHP version 7.4
39+
- Require at least PHP version `7.1` on production environments
40+
- Require at least PHP version `7.2` on dev/CI environments
41+
- Mark PHP version `7.1` as deprecated
42+
- Recommend PHP version `7.4`
3443

3544
### Removed
3645

37-
- Drop support of PHP version 7.0
46+
- Drop support of PHP version `7.0`
3847

3948
## [0.9][] – 2019-10-11
4049

41-
**Note:** Support for PHP 5.6 is finally dropped. Version 7.0 is deprecated. Support will be dropped in a further release. Please upgrade to at least version 7.1. Version 7.3 is recommended.
50+
**Note:** Support of PHP `5.6` is finally dropped. Version `7.0` is deprecated. Support will be dropped in a further release. Please upgrade to at least version `7.1`. Version `7.3` is recommended.
4251

4352
### Added
4453

@@ -50,8 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
5059

5160
### Changed
5261

53-
- Mark PHP version 7.0 as deprecated
54-
- Recommend PHP 7.3
62+
- Mark PHP version `7.0` as deprecated
63+
- Recommend PHP `7.3`
5564
- Declare strict types
5665

5766
### Fixed
@@ -60,13 +69,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6069

6170
### Removed
6271

63-
- Drop support of PHP version 5.6
72+
- Drop support of PHP version `5.6`
6473

6574
## [0.8][] – 2019-04-16
6675

6776
It's spring time! 🌱
6877

69-
To get the full experience, please update your i-doit to version >= 1.12.2 and API add-on to version >= 1.10.2.
78+
To get the full experience, please update your i-doit to version `>= 1.12.2` and API add-on to version `>= 1.10.2`.
7079

7180
### Added
7281

@@ -88,7 +97,7 @@ To get the full experience, please update your i-doit to version >= 1.12.2 and A
8897

8998
## [0.7][] – 2018-12-17
9099

91-
This release comes with new features and tons of unit tests. To get the full experience, please update your i-doit to version >= 1.11.2 and API add-on to version >= 1.10.
100+
This release comes with new features and tons of unit tests. To get the full experience, please update your i-doit to version `>= 1.11.2` and API add-on to version `>= 1.10`.
92101

93102
### Added
94103

@@ -154,7 +163,7 @@ Happy summer time ⛱️
154163

155164
- `CMDBCategoryInfo::readAll()`: Try to fetch information about all available categories
156165
- `API::request()`: Allow to overwrite `language` parameter
157-
- Enhance unit tests, mostly for testing fixed bugs in i-doit 1.10.2 and API add-on 1.9.1
166+
- Enhance unit tests, mostly for testing fixed bugs in i-doit `1.10.2` and API add-on `1.9.1`
158167

159168
### Changed
160169

@@ -179,7 +188,7 @@ Happy summer time ⛱️
179188

180189
### Changed
181190

182-
- Bump required versions of i-doit (>= 1.10) and its API add-on (>= 1.9)
191+
- Bump required versions of i-doit (`>= 1.10`) and its API add-on (`>= 1.9`)
183192
- Require entry identifier in methods `CMDBCategory::archive()`, `delete()` and `purge()`
184193
- Methods `cmdb.category.create`, `cmdb.category_info.read` (and others, too) do not need parameters `catg` or `cats`. Parameter `category` seems to be sufficient.
185194
- Make `CMDBCategory::purge()` a lot faster due to method `cmdb.category.quickpurge`
@@ -225,13 +234,13 @@ Happy summer time ⛱️
225234

226235
Initial release
227236

228-
[Unreleased]: https://github.com/bheisig/i-doit-api-client-php/compare/0.10...HEAD
229-
[0.10]: https://github.com/bheisig/i-doit-api-client-php/compare/0.9...0.10
230-
[0.9]: https://github.com/bheisig/i-doit-api-client-php/compare/0.8...0.9
231-
[0.8]: https://github.com/bheisig/i-doit-api-client-php/compare/0.7...0.8
232-
[0.7]: https://github.com/bheisig/i-doit-api-client-php/compare/0.6...0.7
233-
[0.6]: https://github.com/bheisig/i-doit-api-client-php/compare/0.5...0.6
234-
[0.5]: https://github.com/bheisig/i-doit-api-client-php/compare/0.4...0.5
235-
[0.4]: https://github.com/bheisig/i-doit-api-client-php/compare/0.3...0.4
236-
[0.3]: https://github.com/bheisig/i-doit-api-client-php/compare/0.2...0.3
237-
[0.2]: https://github.com/bheisig/i-doit-api-client-php/compare/0.1...0.2
237+
[Unreleased]: https://github.com/i-doit/api-client-php/compare/0.10...HEAD
238+
[0.10]: https://github.com/i-doit/api-client-php/compare/0.9...0.10
239+
[0.9]: https://github.com/i-doit/api-client-php/compare/0.8...0.9
240+
[0.8]: https://github.com/i-doit/api-client-php/compare/0.7...0.8
241+
[0.7]: https://github.com/i-doit/api-client-php/compare/0.6...0.7
242+
[0.6]: https://github.com/i-doit/api-client-php/compare/0.5...0.6
243+
[0.5]: https://github.com/i-doit/api-client-php/compare/0.4...0.5
244+
[0.4]: https://github.com/i-doit/api-client-php/compare/0.3...0.4
245+
[0.3]: https://github.com/i-doit/api-client-php/compare/0.2...0.3
246+
[0.2]: https://github.com/i-doit/api-client-php/compare/0.1...0.2

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
4343
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct/>
4444

4545
[homepage]: https://www.contributor-covenant.org
46-
[mail]: mailto:benjamin@heisig.name
46+
[mail]: mailto:bheisig@i-doit.com

CONTRIBUTING.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Of course, there are some features in the pipeline. However, if you have good id
2929
If you like to contribute source code, documentation snippets, self-explaining examples or other useful bits, fork this repository, setup the environment and make a pull request.
3030

3131
~~~ {.bash}
32-
git clone https://github.com/bheisig/i-doit-api-client-php.git
32+
git clone https://github.com/i-doit/api-client-php.git
3333
~~~
3434

3535
If you have a GitHub account create a fork first and then clone the repository.
@@ -75,7 +75,7 @@ There is a huge amount of tests located under `tests/`. These tests can be execu
7575

7676
### Prerequisites
7777

78-
1. Copy fiel `.env.dist` to `.env`
78+
1. Copy file `.env.dist` to `.env`
7979
2. Put your configuration settings to `.env`
8080

8181
### Usage
@@ -105,7 +105,7 @@ If you configure your system properly, you will be able to set breakpoints in yo
105105
You may add arguments and options, for example:
106106

107107
~~~ {.bash}
108-
bin/phpunit-dbg --group unreleased tests/APITest.php
108+
bin/phpunit-dbg --group unreleased tests/Idoit/APIClient/APITest.php
109109
~~~
110110

111111
### Available test groups
@@ -162,7 +162,6 @@ This project comes with some useful composer scripts:
162162
| `composer phpunit-addon` | Perform unit tests for add-on related API requests |
163163
| `composer phpunit-parallel` | Perform unit tests in parallel |
164164
| `composer phpunit-unreleased` | Perform unit tests for unreleased features |
165-
| `composer security-checker` | Look for dependencies with known security vulnerabilities |
166165
| `composer system-check` | Run some system checks |
167166

168167
For example, execute `composer ci`.
@@ -175,5 +174,5 @@ If you think this project is useful for your daily work, consider a donation. Wh
175174

176175
- [How to Contribute to Open Source](https://opensource.guide/how-to-contribute/)
177176

178-
[issues]: https://github.com/bheisig/i-doit-api-client-php/issues
179-
[packagist]: https://packagist.org/packages/bheisig/idoitapi
177+
[issues]: https://github.com/i-doit/api-client-php/issues
178+
[packagist]: https://packagist.org/packages/idoit/apiclient

Dockerfile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.4-cli-buster
1+
FROM php:8.0-cli
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -16,9 +16,10 @@ RUN apt-get update; \
1616
docker-php-ext-install \
1717
zip; \
1818
pecl install \
19-
xdebug-2.9.1; \
19+
xdebug; \
2020
docker-php-ext-enable \
2121
xdebug; \
22+
echo "memory_limit = -1" > /usr/local/etc/php/conf.d/zzz-idoitapi.ini; \
2223
curl -fsSL \
2324
"https://composer.github.io/installer.sha384sum" \
2425
-o composer-setup.php.checksum; \
@@ -28,11 +29,12 @@ RUN apt-get update; \
2829
sha384sum --check --strict \
2930
composer-setup.php.checksum; \
3031
php composer-setup.php \
31-
--version=1.10.17 \
32-
--install-dir=/usr/bin \
32+
--2 \
33+
--install-dir=/usr/local/bin \
3334
--filename=composer; \
34-
rm composer-setup.php*; \
35-
echo "memory_limit = -1" > /usr/local/etc/php/conf.d/zzz-idoitapi.ini;
35+
rm \
36+
composer-setup.php \
37+
composer-setup.php.checksum
3638

3739
WORKDIR /usr/src
3840

0 commit comments

Comments
 (0)