Skip to content

Commit 67fc1d6

Browse files
committed
Security and Code Style fixes
- removed `composer.lock` - updated `README.md` - fixed code styling in `src/CoMagic/RestApiClient.php` - added ability to run `src/tests/test.php` in Docker
1 parent e86ad24 commit 67fc1d6

File tree

8 files changed

+42
-682
lines changed

8 files changed

+42
-682
lines changed

.docker/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
ARG PHP_VERSION=7.4
2+
ARG COMPOSER_VERSION=2.7.9
3+
4+
FROM composer:${COMPOSER_VERSION} AS composer
5+
FROM php:${PHP_VERSION}-fpm-alpine
6+
7+
COPY --from=composer /usr/bin/composer /usr/bin/composer
8+
9+
WORKDIR /app

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/vendor/
22
/nbproject/
33
.idea
4-
.DS_Store
4+
.DS_Store
5+
composer.lock

Makefile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.SILENT:
2+
3+
all: test
4+
5+
.PHONY: test
6+
test:
7+
docker compose run --rm test
8+
9+
.PHONY: build
10+
build:
11+
docker compose build

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# CoMagic & Uiscom API php client
1+
# [Uiscom](https://www.uiscom.ru/) & [CoMagic](https://main.comagic.ru/) API PHP client
22
CoMagic php client for:
33
- Rest API https://www.comagic.ru/support/api/
44
- Call API
@@ -38,7 +38,8 @@ $config = [
3838

3939
```
4040

41-
Do not foreget to add `Call API` permissions to user if you want to use login and password authorization for Call API
41+
Do not forget to add `Call API` permissions to user if you want to use login and
42+
password authorization for Call API.
4243

4344

4445
### Rest API

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"description": "php binding for CoMagic API",
44
"type": "library",
55
"require": {
6+
"ext-json": "*",
67
"guzzlehttp/guzzle": "^6.2"
78
},
89
"autoload": {

0 commit comments

Comments
 (0)