Skip to content

Commit 2dbb1e8

Browse files
authored
Add lint commands + fix lint errors (#554)
- Add build + clean commands to makefile - Refine ci gha check - Bump squizlabs/php_codesniffer to 3.11.2
1 parent b76cbbb commit 2dbb1e8

File tree

86 files changed

+237
-222
lines changed

Some content is hidden

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

86 files changed

+237
-222
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ jobs:
1818
run: docker build . --file Dockerfile --tag zendesk_api_client_php-app
1919

2020
- name: Run Composer install
21-
run: docker run --rm --volume "$(pwd):/app" zendesk_api_client_php-app composer install
21+
run: docker run --rm --volume "$(pwd):/app" zendesk_api_client_php-app make build
22+
23+
- name: Run lint
24+
run: docker run --rm --volume "$(pwd):/app" zendesk_api_client_php-app make lint
2225

2326
- name: Run tests
24-
run: docker run --rm --volume "$(pwd):/app" zendesk_api_client_php-app vendor/bin/phpunit --testsuite "Zendesk API Unit Test Suites"
27+
run: docker run --rm --volume "$(pwd):/app" zendesk_api_client_php-app make test

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ FROM php:8.2-cli
33
# OS requirements for PHP
44
RUN apt-get update && apt-get install -y git unzip
55

6+
# Safe requirements to allow Makefile tasks to run
7+
RUN git config --global --add safe.directory /app
8+
69
# PHP requirements
710
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
811
WORKDIR /app

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
.PHONY: test all
1+
.PHONY: build test lint
2+
3+
build:
4+
composer install
25

36
test:
47
composer test:unit
58

6-
all: test
9+
lint:
10+
composer lint

composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,22 @@
1111
},
1212
"require-dev": {
1313
"phpunit/phpunit": "11.5.0",
14-
"squizlabs/php_codesniffer": "2.*",
14+
"squizlabs/php_codesniffer": "3.*",
1515
"phpmd/phpmd": "@stable",
1616
"fakerphp/faker": "^1.24.1",
1717
"psy/psysh": "@stable"
1818
},
1919
"autoload": {
2020
"psr-0": {
2121
"Zendesk\\API\\": "src/",
22-
"Zendesk\\Console\\": "src/"
22+
"Zendesk\\Console\\": "src/",
23+
"Zendesk\\Fixtures\\": "src/"
2324
}
24-
},
25+
},
2526
"scripts": {
2627
"test:unit": "vendor/bin/phpunit --testsuite 'Zendesk API Unit Test Suites'",
27-
"test:live": "vendor/bin/phpunit --testsuite 'Zendesk API Live Test Suites'"
28+
"test:live": "vendor/bin/phpunit --testsuite 'Zendesk API Live Test Suites'",
29+
"lint": "vendor/bin/phpcs --runtime-set ignore_warnings_on_exit 1 --standard=PSR12 --extensions=php --ignore=vendor/ .",
30+
"lint:fix": "vendor/bin/phpcbf --runtime-set ignore_warnings_on_exit 1 --standard=PSR12 --extensions=php --ignore=vendor/ ."
2831
}
2932
}

composer.lock

Lines changed: 27 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/attachments/uploadFileAttachment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
print_r($attachment);
2929
echo "</pre>";
3030
} catch (\Zendesk\API\Exceptions\ApiResponseException $e) {
31-
echo $e->getMessage().'</br>';
31+
echo $e->getMessage() . '</br>';
3232
}

samples/attachments/uploadStreamAttachment.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
print_r($attachment);
3030
echo "</pre>";
3131
} catch (\Zendesk\API\Exceptions\ApiResponseException $e) {
32-
echo $e->getMessage().'</br>';
32+
echo $e->getMessage() . '</br>';
3333
}

samples/groups/createGroup.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
include("../../vendor/autoload.php");
34

45
use Zendesk\API\HttpClient as ZendeskAPI;

samples/groups/getGroups.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
include("../../vendor/autoload.php");
34

45
use Zendesk\API\HttpClient as ZendeskAPI;

samples/helpcenter/createArticles.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@
2626
print_r($article);
2727
echo "</pre>";
2828
} catch (\Zendesk\API\Exceptions\ApiResponseException $e) {
29-
echo $e->getMessage().'</br>';
29+
echo $e->getMessage() . '</br>';
3030
}
31-

0 commit comments

Comments
 (0)