Merge pull request #5 from Ilyes512/updates

Realigned package with package skeleton

Author: Ilyes512

.devcontainer/Dockerfile

@@ -8,7 +8,7 @@ ARG USER_GID=$USER_UID
 ARG WORKSPACE_PATH=/workspace
 
 RUN groupadd --gid "$USER_GID" "$USERNAME" \
-    && useradd --uid "$USER_UID" --gid "$USER_GID" --create-home "$USERNAME" \
+    && useradd --uid "$USER_UID" --gid "$USER_GID" --create-home "$USERNAME" --shell /bin/bash \
     && mkdir -p \
         "$WORKSPACE_PATH" \
         "/home/$USERNAME/.vscode-server/extensions" \

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 {
     "name": "code-style",
     "remoteUser": "code",
-    "dockerComposeFile": ["../docker-compose.yml"],
+    "dockerComposeFile": ["../compose.yml"],
     "service": "php",
     "workspaceFolder": "/workspace",
     "postStartCommand": "git config --global --add safe.directory ${containerWorkspaceFolder}",
@@ -18,5 +18,9 @@
                 "mhutchie.git-graph"
             ]
         }
+    },
+    "features": {
+        "ghcr.io/devcontainers-contrib/features/go-task:1": {},
+        "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
     }
 }

.env

@@ -3,5 +3,5 @@ COMPOSE_PROJECT_NAME=code-style
 REGISTRY_HOST=ghcr.io
 REGISTRY_PATH=ilyes512
 
-IMAGE_REGISTRY_PHP=${REGISTRY_HOST}/${REGISTRY_PATH}/php82-fpm
-IMAGE_TAG_PHP_VSCODE=vscode-1.0.3
+IMAGE_REGISTRY_PHP=${REGISTRY_HOST}/${REGISTRY_PATH}/php83-fpm
+IMAGE_TAG_PHP_VSCODE=vscode-1.0.0

.gitattributes

@@ -15,8 +15,6 @@
 /ecs-local.php              export-ignore
 /phpstan.neon               export-igore
 /phpstan.dist.neon          export-ignore
-/phpunit.xml                export-ignore
-/phpunit.xml.dist           export-ignore
 /Taskfile.dist.yml          export-ignore
 /Taskfile.yml               export-ignore
-/docker-compose.yml         export-ignore
+/compose.yml                export-ignore

.gitignore

@@ -4,8 +4,6 @@
 /composer.lock
 /vendor
 /phpstan.neon
-/phpunit.xml
-/.phpunit-cache
 /.phplint.cache
 /auth.json
 Taskfile.yml

LICENSE

@@ -1,21 +1,7 @@
-MIT License
+Copyright 2023 Ilyes Ahidar
 
-Copyright (c) 2023 Ilyes512
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Taskfile.dev.yml

@@ -0,0 +1,73 @@
+version: "3"
+
+dotenv: ['.env']
+
+silent: true
+
+tasks:
+
+  c:update:
+    desc: Run composer update
+    cmds:
+      - task: c:exec
+        vars: { SUBCMD: update }
+
+  c:install:
+    desc: Run composer install
+    cmds:
+      - task: c:exec
+        vars: { SUBCMD: install }
+
+  c:exec:
+    desc: Run composer update or install
+    internal: true
+    preconditions:
+      - sh: test '{{.SUBCMD}}' = 'install' -o '{{.SUBCMD}}' = 'update'
+        msg: SUBCMD value needs to be either 'install' or 'update'
+    cmds:
+      - docker volume create php_composer_cache
+      - docker run
+        --interactive
+        --tty
+        --rm
+        --volume "$(pwd)":/var/www
+        --volume php_composer_cache:/home/composer/.composer
+        --entrypoint ''
+        -e COMPOSER_HOME=/home/composer/.composer
+        $IMAGE_REPO_PHP:$IMAGE_TAG_PHP_BUILDER
+        composer {{.SUBCMD}}
+        --no-progress
+        --prefer-dist
+        --ignore-platform-reqs
+
+  stop:
+    desc: Stop Devcontainer
+    cmds:
+      - docker compose stop
+
+  down:
+    desc: Cleanup Devcontainer including volumes
+    cmds:
+      - docker compose down --volumes
+
+  cleanup:
+    desc: Cleanup of almost all gitignored files and untracked files
+    prompt: This could potentially delete untracked files!! Do you want to continue?
+    summary: |
+      Cleanup of almost all gitignored files, untracked files and development containers.
+
+      The following files/dirs are excluded:
+        - /.idea
+        - /.vscode
+    cmds:
+      - git clean
+        -xd
+        --force
+        --exclude .idea
+        --exclude .vscode
+
+  cleanup:all:
+    desc: Cleanup of almost all gitignored files, untracked files and removal of development containers
+    cmds:
+      - task: down
+      - task: cleanup

Taskfile.dist.yml

@@ -1,4 +1,6 @@
-version: "3.7"
+volumes:
+  vscode-extensions:
+
 services:
   php:
     image: ${COMPOSE_PROJECT_NAME}-php-vscode:latest
@@ -14,6 +16,3 @@ services:
       # - $HOME/auth.json:/root/auth.json:ro
       - .:/workspace:delegated
       - vscode-extensions:/home/code/.vscode-server/extensions
-
-volumes:
-  vscode-extensions: