Skip to content

Commit 11963a3

Browse files
authored
Harmonize CI & files (#46)
1 parent 094ee8a commit 11963a3

File tree

11 files changed

+115
-91
lines changed

11 files changed

+115
-91
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ on: # Build any PRs and main branch changes
1010
# In case of updates to those workflows, they must be pre-checked by `pre-check-CI-updates.yml` rather than this workflow !
1111
# Any updates on those workflows are expected to be restricted to those workflows only ! (no update on code for instance)
1212
- '.github/workflows/pre-check-CI-updates.yml'
13-
- '.github/workflows/CI.yml'
14-
- '.github/workflows/coverage-upload.yml'
1513
- '.github/workflows/reusable-CI-workflow.yml'
1614
- '.github/workflows/reusable-coverage-upload-workflow.yml'
17-
- '.github/workflows/auto-merge-dependabot.yml'
1815
push:
1916
branches: [ master ]
2017
schedule:
@@ -29,7 +26,6 @@ concurrency:
2926

3027
env:
3128
TEST_OUTPUT_STYLE: pretty
32-
COMPOSER_OPTIONS: --optimize-autoloader
3329

3430
jobs:
3531
tests:

.github/workflows/auto-merge-dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ jobs:
1818
uses: dependabot/fetch-metadata@v2.4.0
1919
with:
2020
github-token: "${{ secrets.GITHUB_TOKEN }}"
21+
22+
- name: Add custom labels
23+
run: gh pr edit "${{github.event.pull_request.html_url}}" --add-label "with-nightly-tests"
24+
env:
25+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
2127
- name: Enable auto-merge for Dependabot PRs
2228
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
2329
run: gh pr merge --auto --squash "$PR_URL"

.github/workflows/coverage-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
checks: write # For the check run creation !
1010

1111
jobs:
12-
upload:
12+
coverage:
1313
name: Coverage
1414
permissions:
1515
contents: read

.github/workflows/pre-check-CI-updates.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ on:
1212
branches: [master] # Only for PR targeting master branch
1313
paths: # /!\ Duplicate the same list as `on.pull_request.paths-ignore` property value for CI workflow !
1414
- '.github/workflows/pre-check-CI-updates.yml' # This workflow
15-
- '.github/workflows/CI.yml'
16-
- '.github/workflows/coverage-upload.yml'
1715
- '.github/workflows/reusable-CI-workflow.yml'
1816
- '.github/workflows/reusable-coverage-upload-workflow.yml'
19-
- '.github/workflows/auto-merge-dependabot.yml'
2017

2118
permissions:
2219
contents: read
@@ -33,7 +30,7 @@ jobs:
3330
contents: read
3431
uses: ./.github/workflows/reusable-CI-workflow.yml
3532

36-
upload:
33+
coverage:
3734
name: Coverage
3835
needs: [tests]
3936
permissions:

.remarkrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"plugins": [
33
"remark-preset-lint-consistent",
4-
"remark-preset-lint-recommended"
4+
"remark-preset-lint-recommended",
5+
[
6+
"remark-lint-list-item-indent",
7+
"space"
8+
]
59
]
610
}

.scrutinizer.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ build:
4141
variables:
4242
CI: 'true'
4343
TEST_OUTPUT_STYLE: 'pretty'
44-
COMPOSER_OPTIONS: '--optimize-autoloader'
4544
COVERAGE_OUTPUT_STYLE: 'clover'
4645
COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
4746
PHPCS_DISABLE_WARNING: 'true'

CODE_OF_CONDUCT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ include:
2323
Examples of unacceptable behavior by participants include:
2424

2525
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
26+
advances
2727
* Trolling, insulting/derogatory comments, and personal or political attacks
2828
* Public or private harassment
2929
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
30+
address, without explicit permission
3131
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
32+
professional setting
3333

3434
## Our Responsibilities
3535

CONTRIBUTING.md

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
11
# Contributing
22

33
## Getting Started
4-
* Fork, then clone the repo:
4+
5+
* Fork, then clone the repo:
6+
57
```bash
68
git clone git@github.com:your-username/php-jsonrpc-server-doc-sdk.git
7-
````
9+
```
10+
11+
* Make sure everything goes well:
812

9-
* Make sure everything goes well:
1013
```bash
1114
make build
1215
make test
1316
```
1417

15-
* Make your changes (Add/Update tests according to your changes).
16-
* Make sure tests are still green:
18+
* Make your changes (Add/Update tests according to your changes).
19+
* Make sure tests are still green:
20+
1721
```bash
1822
make test
1923
```
2024

21-
* To check code coverage, launch
25+
* To check code coverage, launch
26+
2227
```bash
2328
make coverage
2429
```
2530

26-
* Push to your fork and [submit a pull request](https://github.com/yoanm/php-jsonrpc-server-doc-sdk/compare/).
27-
* Wait for feedback or merge.
31+
* Push to your fork and [submit a pull request](https://github.com/yoanm/php-jsonrpc-server-doc-sdk/compare/).
32+
* Wait for feedback or merge.
33+
34+
Some stuff that will increase your pull request's acceptance:
2835

29-
Some stuff that will increase your pull request's acceptance:
30-
* Write tests.
31-
* Follow PSR-2 coding style.
32-
* Write good commit messages.
33-
* Do not rebase or squash your commits when a review has been made.
36+
* Write tests.
37+
* Follow PSR-2 coding style.
38+
* Write good commit messages.
39+
* Do not rebase or squash your commits when a review has been made.

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,13 @@ scrutinizer-behat:
109109
create-build-directories:
110110
mkdir -p ${PHPUNIT_COVERAGE_DIRECTORY} ${BEHAT_COVERAGE_DIRECTORY} ${REPORTS_DIRECTORY}
111111

112+
.PHONY: configure-dev-env
113+
configure-dev-env:
114+
npm install --global remark-cli remark-preset-lint-consistent remark-preset-lint-recommended remark-lint-list-item-indent
115+
116+
.PHONY: lint-markdown
117+
lint-markdown:
118+
npx remark . --output
119+
112120
.PHONY: build install configure test test-unit test-functional codestyle create-build-directories scrutinizer-behat scrutinizer-phpunit
113121
.DEFAULT: build

README.md

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22

33
[![License](https://img.shields.io/github/license/yoanm/php-jsonrpc-server-doc-sdk.svg)](https://github.com/yoanm/php-jsonrpc-server-doc-sdk)
44
[![Code size](https://img.shields.io/github/languages/code-size/yoanm/php-jsonrpc-server-doc-sdk.svg)](https://github.com/yoanm/php-jsonrpc-server-doc-sdk)
5-
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github\&repo=yoanm/php-jsonrpc-server-doc-sdk)](https://dependabot.com)
5+
![Dependabot Status](https://flat.badgen.net/github/dependabot/yoanm/php-jsonrpc-server-doc-sdk)
6+
![Last commit](https://badgen.net/github/last-commit/yoanm/php-jsonrpc-server-doc-sdk)
67

78
[![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/php-jsonrpc-server-doc-sdk.svg?label=Scrutinizer\&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-server-doc-sdk/build-status/master)
89
[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/php-jsonrpc-server-doc-sdk/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-server-doc-sdk/?branch=master)
9-
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/20dd4e48499342b2ad40d6ce4e17daf2)](https://app.codacy.com/gh/yoanm/php-jsonrpc-server-doc-sdk/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
10+
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/20dd4e48499342b2ad40d6ce4e17daf2)](https://app.codacy.com/gh/yoanm/php-jsonrpc-server-doc-sdk/dashboard?utm_source=gh\&utm_medium=referral\&utm_content=\&utm_campaign=Badge_grade)
1011

1112
[![CI](https://github.com/yoanm/php-jsonrpc-server-doc-sdk/actions/workflows/CI.yml/badge.svg?branch=master)](https://github.com/yoanm/php-jsonrpc-server-doc-sdk/actions/workflows/CI.yml)
1213
[![codecov](https://codecov.io/gh/yoanm/php-jsonrpc-server-doc-sdk/branch/master/graph/badge.svg?token=NHdwEBUFK5)](https://codecov.io/gh/yoanm/php-jsonrpc-server-doc-sdk)
@@ -22,76 +23,76 @@ See [yoanm/jsonrpc-params-symfony-constraint-doc-sdk](https://github.com/yoanm/p
2223

2324
## Availble formats
2425

25-
* Raw : Built-in `json` format
26-
* Swagger : [yoanm/jsonrpc-http-server-swagger-doc-sdk](https://github.com/yoanm/php-jsonrpc-http-server-swagger-doc-sdk)
27-
* OpenApi : [yoanm/jsonrpc-http-server-openapi-doc-sdk](https://github.com/yoanm/php-jsonrpc-http-server-openapi-doc-sdk)
26+
* Raw : Built-in `json` format
27+
* Swagger : [yoanm/jsonrpc-http-server-swagger-doc-sdk](https://github.com/yoanm/php-jsonrpc-http-server-swagger-doc-sdk)
28+
* OpenApi : [yoanm/jsonrpc-http-server-openapi-doc-sdk](https://github.com/yoanm/php-jsonrpc-http-server-openapi-doc-sdk)
2829

2930
## How to use
3031

3132
### Php objects
3233

3334
Available documentation objects:
3435

35-
* [`ServerDoc`](./src/Domain/Model/ServerDoc.php) and [`HttpServerDoc`](./src/Domain/Model/HttpServerDoc.php) for HTTP server
36-
* [`MethodDoc`](./src/Domain/Model/MethodDoc.php)
37-
* [`ErrorDoc`](./src/Domain/Model/ErrorDoc.php)
38-
* [`TagDoc`](./src/Domain/Model/TagDoc.php) : Allow to tag methods
39-
* Types :
40-
* [`TypeDoc`](./src/Domain/Model/Type/TypeDoc.php) : Basic type
41-
* [`BooleanDoc`](./src/Domain/Model/Type/BooleanDoc.php)
42-
* [`ScalarDoc`](./src/Domain/Model/Type/ScalarDoc.php)
43-
* [`StringDoc`](./src/Domain/Model/Type/StringDoc.php)
44-
* [`NumberDoc`](./src/Domain/Model/Type/NumberDoc.php)
45-
* [`IntegerDoc`](./src/Domain/Model/Type/IntegerDoc.php)
46-
* [`FloatDoc`](./src/Domain/Model/Type/FloatDoc.php)
47-
* [`CollectionDoc`](./src/Domain/Model/Type/CollectionDoc.php)
48-
* [`ArrayDoc`](./src/Domain/Model/Type/ArrayDoc.php)
49-
* [`ObjectDoc`](./src/Domain/Model/Type/ObjectDoc.php)
36+
* [`ServerDoc`](./src/Domain/Model/ServerDoc.php) and [`HttpServerDoc`](./src/Domain/Model/HttpServerDoc.php) for HTTP server
37+
* [`MethodDoc`](./src/Domain/Model/MethodDoc.php)
38+
* [`ErrorDoc`](./src/Domain/Model/ErrorDoc.php)
39+
* [`TagDoc`](./src/Domain/Model/TagDoc.php) : Allow to tag methods
40+
* Types :
41+
* [`TypeDoc`](./src/Domain/Model/Type/TypeDoc.php) : Basic type
42+
* [`BooleanDoc`](./src/Domain/Model/Type/BooleanDoc.php)
43+
* [`ScalarDoc`](./src/Domain/Model/Type/ScalarDoc.php)
44+
* [`StringDoc`](./src/Domain/Model/Type/StringDoc.php)
45+
* [`NumberDoc`](./src/Domain/Model/Type/NumberDoc.php)
46+
* [`IntegerDoc`](./src/Domain/Model/Type/IntegerDoc.php)
47+
* [`FloatDoc`](./src/Domain/Model/Type/FloatDoc.php)
48+
* [`CollectionDoc`](./src/Domain/Model/Type/CollectionDoc.php)
49+
* [`ArrayDoc`](./src/Domain/Model/Type/ArrayDoc.php)
50+
* [`ObjectDoc`](./src/Domain/Model/Type/ObjectDoc.php)
5051

5152
### Normalizers
5253

5354
Available normalizers :
5455

55-
* [`TypeDocNormalizer`](./src/Infra/Normalizer/TypeDocNormalizer.php)
56-
```php
57-
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\TypeDocNormalizer;
58-
59-
$typeDocNormalizer = new TypeDocNormalizer();
60-
```
61-
* [`TagDocNormalizer`](./src/Infra/Normalizer/TagDocNormalizer.php)
62-
```php
63-
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\TagDocNormalizer;
64-
65-
$tagDocNormalizer = new TagDocNormalizer();
66-
```
67-
* [`ErrorDocNormalizer`](./src/Infra/Normalizer/ErrorDocNormalizer.php)
68-
```php
69-
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\MethodDocNormalizer;
70-
71-
$errorDocNormalizer = new ErrorDocNormalizer($typeDocNormalizer);
72-
```
73-
* [`MethodDocNormalizer`](./src/Infra/Normalizer/MethodDocNormalizer.php)
74-
```php
75-
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\MethodDocNormalizer;
76-
77-
$tagDocNormalizer = new MethodDocNormalizer(
78-
$typeDocNormalizer,
79-
$errorDocNormalizer
80-
);
81-
```
82-
* [`ServerDocNormalizer`](./src/Infra/Normalizer/ServerDocNormalizer.php) and [`HttpServerDocNormalizer`](./src/Infra/Normalizer/HttpServerDocNormalizer.php) for HTTP server
83-
```php
84-
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\ServerDocNormalizer;
85-
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\HttpServerDocNormalizer;
86-
87-
$normalizer = new ServerDocNormalizer(
88-
$methodDocNormalizer,
89-
$tagDocNormalizer,
90-
$errorDocNormalizer
91-
);
92-
93-
$httpNormalizer = new HttpServerDocNormalizer($normalizer);
94-
```
56+
* [`TypeDocNormalizer`](./src/Infra/Normalizer/TypeDocNormalizer.php)
57+
```php
58+
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\TypeDocNormalizer;
59+
60+
$typeDocNormalizer = new TypeDocNormalizer();
61+
```
62+
* [`TagDocNormalizer`](./src/Infra/Normalizer/TagDocNormalizer.php)
63+
```php
64+
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\TagDocNormalizer;
65+
66+
$tagDocNormalizer = new TagDocNormalizer();
67+
```
68+
* [`ErrorDocNormalizer`](./src/Infra/Normalizer/ErrorDocNormalizer.php)
69+
```php
70+
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\MethodDocNormalizer;
71+
72+
$errorDocNormalizer = new ErrorDocNormalizer($typeDocNormalizer);
73+
```
74+
* [`MethodDocNormalizer`](./src/Infra/Normalizer/MethodDocNormalizer.php)
75+
```php
76+
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\MethodDocNormalizer;
77+
78+
$tagDocNormalizer = new MethodDocNormalizer(
79+
$typeDocNormalizer,
80+
$errorDocNormalizer
81+
);
82+
```
83+
* [`ServerDocNormalizer`](./src/Infra/Normalizer/ServerDocNormalizer.php) and [`HttpServerDocNormalizer`](./src/Infra/Normalizer/HttpServerDocNormalizer.php) for HTTP server
84+
```php
85+
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\ServerDocNormalizer;
86+
use Yoanm\JsonRpcServerDoc\Infra\Normalizer\HttpServerDocNormalizer;
87+
88+
$normalizer = new ServerDocNormalizer(
89+
$methodDocNormalizer,
90+
$tagDocNormalizer,
91+
$errorDocNormalizer
92+
);
93+
94+
$httpNormalizer = new HttpServerDocNormalizer($normalizer);
95+
```
9596

9697
## Contributing
9798

0 commit comments

Comments
 (0)