Skip to content

Commit 517299d

Browse files
Ilyes512Ilyes512
authored
Merge pull request #2 from Ilyes512/strict
Strict
2 parents 8b0d18e + 1d73d0d commit 517299d

File tree

13 files changed

+146
-47
lines changed

13 files changed

+146
-47
lines changed

‎.devcontainer/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG IMAGE_REPO=ghcr.io/ilyes512/php81-fpm
2-
ARG IMAGE_TAG_PHP_VSCODE=vscode-latest
3-
FROM $IMAGE_REPO:$IMAGE_TAG_PHP_VSCODE
1+
ARG IMAGE_REGISTRY_PHP
2+
ARG IMAGE_TAG_PHP_VSCODE
3+
FROM $IMAGE_REGISTRY_PHP:$IMAGE_TAG_PHP_VSCODE
44

55
ARG USERNAME=code
66
ARG USER_UID=1000
@@ -20,4 +20,6 @@ RUN groupadd --gid "$USER_GID" "$USERNAME" \
2020

2121
WORKDIR $WORKSPACE_PATH
2222

23+
ENV PATH=$PATH:${WORKSPACE_PATH}/vendor/bin
24+
2325
CMD ["docker-cmd.sh"]

‎.devcontainer/devcontainer.json‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@
44
"dockerComposeFile": ["../docker-compose.yml"],
55
"service": "php",
66
"workspaceFolder": "/workspace",
7-
"settings": {
8-
"terminal.integrated.defaultProfile.linux": "bash",
9-
},
10-
"extensions": [
11-
"bmewburn.vscode-intelephense-client",
12-
"redhat.vscode-yaml",
13-
"mehedidracula.php-namespace-resolver",
14-
"editorconfig.editorconfig",
15-
"mhutchie.git-graph"
16-
]
7+
"postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
8+
"customizations": {
9+
"vscode": {
10+
"settings": {
11+
"terminal.integrated.defaultProfile.linux": "bash"
12+
},
13+
"extensions": [
14+
"bmewburn.vscode-intelephense-client",
15+
"redhat.vscode-yaml",
16+
"mehedidracula.php-namespace-resolver",
17+
"EditorConfig.EditorConfig",
18+
"mhutchie.git-graph"
19+
]
20+
}
21+
}
1722
}

‎.dockerignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*

‎.editorconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@ trim_trailing_whitespace = true
1111
[*.md]
1212
trim_trailing_whitespace = false
1313

14-
[*.{yml,yaml}]
14+
[{*,*.dist}.{yml,yaml,neon}]
1515
indent_size = 2
16-
17-
[*.j2]
18-
insert_final_newline = false

‎.env‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
COMPOSE_PROJECT_NAME=code-style
2-
IMAGE_REPO_PHP=ghcr.io/ilyes512/php81-fpm
3-
IMAGE_TAG_PHP_BUILDER=builder-1.0.0
4-
IMAGE_TAG_PHP_VSCODE=vscode-1.0.0
2+
3+
REGISTRY_HOST=ghcr.io
4+
REGISTRY_PATH=ilyes512
5+
6+
IMAGE_REGISTRY_PHP=${REGISTRY_HOST}/${REGISTRY_PATH}/php82-fpm
7+
IMAGE_TAG_PHP_VSCODE=vscode-1.0.3

‎.gitattributes‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
# Path-based git attributes
22
# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
33

4-
/.devcontainer/ export-ignore
5-
/.editorconfig export-ignore
6-
/.env export-ignore
7-
/.gitattributes export-ignore
8-
/.gitignore export-ignore
9-
/docker-compose.yml export-ignore
10-
/ecs-local.php export-ignore
11-
/Taskfile.yml export-ignore
4+
/.devcontainer export-ignore
5+
/.vscode export-ignore
6+
/docs export-ignore
7+
/tests export-ignore
8+
/.dockerignore export-ignore
9+
/.editorconfig export-ignore
10+
/.env export-ignore
11+
/.gitattributes export-ignore
12+
/.gitignore export-ignore
13+
/.vsls.json export-ignore
14+
/auth.json export-ignore
15+
/ecs-local.php export-ignore
16+
/phpstan.neon export-igore
17+
/phpstan.dist.neon export-ignore
18+
/phpunit.xml export-ignore
19+
/phpunit.xml.dist export-ignore
20+
/Taskfile.dist.yml export-ignore
21+
/Taskfile.yml export-ignore
22+
/docker-compose.yml export-ignore

‎.gitignore‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1+
!.env
12
.DS_Store
2-
/vendor
3-
/.phplint-cache
3+
/dev
44
/composer.lock
5+
/vendor
6+
/phpstan.neon
7+
/phpunit.xml
8+
/.phpunit-cache
9+
/.phplint.cache
510
/auth.json
11+
Taskfile.yml

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 Ilyes512
3+
Copyright (c) 2023 Ilyes512
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Taskfile.yml renamed to Taskfile.dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,5 +73,5 @@ tasks:
7373
- rm -rf
7474
vendor
7575
composer.lock
76-
.phplint-cache
76+
.phplint.cache
7777
&& printf "%s\n" "Successfully removed vendor/generated files..."

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"license": "MIT",
1212
"require": {
1313
"php": "^7.4 || ^8.0",
14-
"slevomat/coding-standard": "^7.0",
15-
"symplify/easy-coding-standard": "^10.0"
14+
"slevomat/coding-standard": "^8.0",
15+
"symplify/easy-coding-standard": "^11.0"
1616
},
1717
"require-dev": {
18-
"overtrue/phplint": "^4.1"
18+
"overtrue/phplint": "^9.0.4"
1919
},
2020
"scripts": {
2121
"lint": "XDEBUG_MODE=off phplint --exclude=vendor .",

0 commit comments

Comments
 (0)