Skip to content

Commit 27e9def

Browse files
dkarlovidkarlovi
authored
bump: new generator (#4)
* New generator * New generator * New generator * New generator * New generator * New generator * New generator
1 parent 79bd84a commit 27e9def

34 files changed

+979
-694
lines changed

‎.editorconfig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
root = true
22

33
[*]
4-
charset = utf-8
4+
charset = UTF-8
55
end_of_line = lf
6-
indent_size = 4
76
indent_style = space
7+
indent_size = 4
88
insert_final_newline = true
99
trim_trailing_whitespace = true
1010

11+
[{Makefile, *.mk}]
12+
indent_style = tab
13+
1114
[*.md]
1215
trim_trailing_whitespace = false
13-
14-
[Makefile]
15-
indent_style = tab

‎.gitattributes‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/docs export-ignore
2-
/test export-ignore
2+
/tests export-ignore
33
/.* export-ignore
44
/*dist export-ignore
5+
/*baseline* export-ignore
6+
/composer.lock export-ignore
57
/Makefile export-ignore

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
/var/
22
/vendor/
3-
.phpunit.result.cache
4-
composer.lock
3+
/composer.lock

‎.openapi-generator.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
"invokerPackage": "Sigwin\\RedditClient",
44
"srcBasePath": "src",
55
"gitUserId": "sigwin",
6-
"gitRepoId": "reddit-client"
6+
"gitRepoId": "reddit-client",
7+
"artifactUrl": "https://github.com/sigwinhq/reddit-client",
8+
"licenseName": "MIT",
9+
"developerOrganization": "Sigwin d.o.o.",
10+
"developerOrganizationUrl": "https://sigwin.company/"
711
}

‎.php-cs-fixer.dist.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
$configurator = require __DIR__ .'/vendor/sigwin/infra/resources/PHP/php-cs-fixer.php';
6+
7+
$header = <<<'EOF'
8+
This file is part of the Sigwin project.
9+
10+
(c) sigwin.hr
11+
12+
This source file is subject to the MIT license that is bundled
13+
with this source code in the file LICENSE.
14+
EOF;
15+
16+
$config = $configurator(__DIR__, $header);
17+
18+
return $config;

‎.php_cs.dist‎

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

‎LICENSE‎

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

‎Makefile‎

Lines changed: 7 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,15 @@
1-
ifndef BUILD_ENV
2-
BUILD_ENV=7.4
3-
endif
1+
.SILENT:
2+
include vendor/sigwin/infra/resources/PHP/library.mk
43

54
ifndef OPENAPI_DOCKER_COMMAND
65
OPENAPI_DOCKER_IMAGE=dkarlovi/openapi-generator-php:latest
76
OPENAPI_DOCKER_COMMAND=docker run --init --interactive --rm --tty --env "COMPOSER_CACHE_DIR=/composer/cache" --user "$(shell id -u):$(shell id -g)" --volume "$(shell pwd):/project" --volume "$(shell pwd)/../openapi-specs:/specs" --volume "${HOME}/.composer:/composer" --workdir /project ${OPENAPI_DOCKER_IMAGE}
87
endif
98

10-
ifndef DOCQA_DOCKER_COMMAND
11-
DOCQA_DOCKER_IMAGE=dkarlovi/docqa:latest
12-
DOCQA_DOCKER_COMMAND=docker run --init --interactive --rm --user "$(shell id -u):$(shell id -g)" --volume "$(shell pwd)/var/tmp/docqa:/.cache" --volume "$(shell pwd):/project" --workdir /project ${DOCQA_DOCKER_IMAGE}
13-
endif
14-
15-
ifndef PHPQA_DOCKER_COMMAND
16-
PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.52-php${BUILD_ENV}-alpine
17-
PHPQA_DOCKER_COMMAND=docker run --init --interactive --rm --env "COMPOSER_CACHE_DIR=/composer/cache" --user "$(shell id -u):$(shell id -g)" --tmpfs /tmp --volume "$(shell pwd):/project" --volume "${HOME}/.composer:/composer" --workdir /project ${PHPQA_DOCKER_IMAGE}
18-
endif
19-
20-
default: help
21-
docs: markdownlint textlint vale
22-
run/check: composer-validate cs-check run/analyze ## Run a suite of checks (code style, static analysis)
23-
run/analyze: phpstan psalm ## Run static analysis
24-
run/test: phpunit ## Run a suite of tests
25-
26-
help: ## Prints commands help
27-
@grep --no-filename --extended-regexp '^ *[-a-zA-Z0-9_/]+ *:.*## ' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[45m%-15s\033[0m %s\n", $$1, $$2}'
28-
29-
build: ensure ## Rebuild the repo
9+
build: ## Rebuild the repo
3010
sh -c "${OPENAPI_DOCKER_COMMAND} /specs/reddit/v1/index.yaml"
3111

32-
composer-validate: ensure composer-normalize-check
33-
sh -c "${PHPQA_DOCKER_COMMAND} composer validate"
34-
composer-install: ensure
35-
sh -c "${PHPQA_DOCKER_COMMAND} composer upgrade"
36-
composer-normalize-check: ensure
37-
sh -c "${PHPQA_DOCKER_COMMAND} composer normalize --dry-run --no-check-lock --no-update-lock"
38-
39-
cs-check: ensure
40-
sh -c "${PHPQA_DOCKER_COMMAND} php-cs-fixer fix --using-cache=false --dry-run --diff -vvv"
41-
42-
phpstan: ensure
43-
sh -c "${PHPQA_DOCKER_COMMAND} phpstan analyse"
44-
45-
psalm: ensure
46-
sh -c "${PHPQA_DOCKER_COMMAND} psalm --show-info=false --threads max"
47-
48-
phpunit:
49-
sh -c "${PHPQA_DOCKER_COMMAND} vendor/bin/phpunit --verbose"
50-
phpunit-coverage: ensure
51-
sh -c "${PHPQA_DOCKER_COMMAND} php -d pcov.enabled=1 vendor/bin/phpunit --verbose --coverage-text --log-junit=var/junit.xml --coverage-xml var/coverage-xml/"
52-
53-
markdownlint: ensure
54-
sh -c "${DOCQA_DOCKER_COMMAND} markdownlint *.md docs/"
55-
textlint: ensure
56-
sh -c "${DOCQA_DOCKER_COMMAND} textlint -c docs/.textlintrc.dist *.md docs/"
57-
vale: ensure
58-
sh -c "${DOCQA_DOCKER_COMMAND} vale --config docs/.vale.ini.dist README.md docs/Api/ docs/Model/"
59-
60-
ensure:
61-
mkdir -p ${HOME}/.composer var/tmp/docqa var/tmp/phpqa
12+
vendor/sigwin/infra/resources/PHP/library.mk:
13+
mv composer.json composer.json~ && rm -f composer.lock
14+
docker run --rm --user '$(shell id -u):$(shell id -g)' --volume '$(shell pwd):/app' --workdir /app composer:2 require sigwin/infra
15+
mv composer.json~ composer.json && rm -f composer.lock

‎composer.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "sigwin/reddit-client",
33
"description": "Reddit.com API",
4+
"license": "MIT",
45
"keywords": [
56
"openapitools",
67
"openapi-generator",
@@ -10,22 +11,23 @@
1011
"rest",
1112
"api"
1213
],
13-
"homepage": "https://openapi-generator.tech",
14-
"license": "MIT",
1514
"authors": [
1615
{
17-
"name": "OpenAPI-Generator contributors",
18-
"homepage": "https://openapi-generator.tech"
16+
"name": "Sigwin d.o.o.",
17+
"homepage": "https://sigwin.company/"
1918
}
2019
],
20+
"homepage": "https://github.com/sigwinhq/reddit-client",
2121
"require": {
22-
"php": "^7.4 || ^8.0",
22+
"php": "^8.2",
2323
"ext-json": "*",
2424
"ext-mbstring": "*",
25-
"guzzlehttp/guzzle": "^6.2"
25+
"guzzlehttp/guzzle": "^7.3",
26+
"guzzlehttp/psr7": "^2.0"
2627
},
2728
"require-dev": {
28-
"phpunit/phpunit": "^8.0 || ^9.0"
29+
"phpunit/phpunit": "^9.0",
30+
"sigwin/infra": "~1.5.0"
2931
},
3032
"autoload": {
3133
"psr-4": {
@@ -34,7 +36,7 @@
3436
},
3537
"autoload-dev": {
3638
"psr-4": {
37-
"Sigwin\\RedditClient\\Test\\": "test/"
39+
"Sigwin\\RedditClient\\Test\\": "tests/"
3840
}
3941
}
4042
}

‎docs/.textlintrc.dist‎

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

0 commit comments

Comments
 (0)