Improve setup

.github/dependabot.yml

@@ -2,11 +2,20 @@ version: 2
 
 updates:
 - package-ecosystem: composer
-  directory: "/"
+  directory: "/code"
   schedule:
     interval: daily
     time: '04:00'
     timezone: Europe/Berlin
   assignees:
   - fefas
   versioning-strategy: increase
+- package-ecosystem: composer
+  directory: "/phars"
+  schedule:
+    interval: daily
+    time: '04:00'
+    timezone: Europe/Berlin
+  assignees:
+    - fefas
+  versioning-strategy: increase

.github/workflows/ci.yaml

@@ -1,54 +1,50 @@
 name: CI
 
 on: push
-concurrency: action-on-${{ github.ref_name }}
-
-env:
-  revision: ${{ github.sha }}
+concurrency: ci-on-${{ github.ref_name }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - run: docker login ghcr.io -u ${{ github.actor }} -p ${{ github.token }}
-    - run: make build php=${{ matrix.php }} revision=${{ env.revision }}
     strategy:
       matrix:
         php: [ 8.2.0 ]
+    steps:
+    - uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - uses: actions/checkout@v3
+    - run: make docker/build docker/push php=${{ matrix.php }}
 
   test:
     runs-on: ubuntu-latest
     needs: build
-    steps:
-    - uses: actions/checkout@v3
-    - run: make test php=${{ matrix.php }} revision=${{ env.revision }}
     strategy:
       matrix:
         php: [ 8.2.0 ]
         level: [ cs, unit, mutation ]
+    steps:
+    - uses: actions/checkout@v3
+    - run: make docker/pull php=${{ matrix.php }}
+    - run: make tests/${{ matrix.level }} php=${{ matrix.php }}
 
   publish:
     runs-on: ubuntu-latest
     needs: test
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up deploy key
-        uses: webfactory/ssh-agent@v0.5.4
-        with:
-          ssh-private-key: ${{ secrets.PACKAGE_DEPLOY_KEY }}
-      - name: Set up git author
-        run: |
-          git config --global user.name "${{ github.event.commits[0].author.name }}"
-          git config --global user.email ${{ github.event.commits[0].author.email }}
-      - run: make publish package=${{ matrix.package }} branch=${{ github.ref_name }} revision=${{ env.revision }}
     strategy:
       matrix:
-        package: [ service-resolver ]
+        package: [ service-resolver, type-uri ]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: webfactory/ssh-agent@v0.7.0
+      with:
+        ssh-private-key: ${{ secrets.PACKAGE_PUBLISH_KEY }}
+    - run: make publish package=${{ matrix.package }}
 
   pr-control:
     runs-on: ubuntu-latest
     needs: [ build, test, publish ]
     steps:
-      - name: You shall pass!
-        run: echo You shall pass!
+    - run: echo You shall pass!

.gitignore

@@ -1,5 +1,2 @@
-bin/*
-!bin/phive.xml
-packages/reports/
-temp/
-vendor/
+var/*
+!var/.gitkeep

Dockerfile

@@ -2,38 +2,51 @@ ARG PHP
 
 FROM php:${PHP}-cli-alpine3.16
 
-ARG DIR_BIN
-ARG DIR_PACKAGES
-ARG DIR_COMPOSER_VENDOR
+ENV HOME_DIR /usr/local/bauhaus
+ENV COMPOSER_CODE_DIR $HOME_DIR/composer/code
+ENV COMPOSER_PHARS_DIR $HOME_DIR/composer/phars
+ENV CACHE_DIR $HOME_DIR/var/cache
+ENV CODE_DIR $HOME_DIR/code
+ENV PHARS_DIR $HOME_DIR/phars
+ENV REPORTS_DIR $HOME_DIR/var/reports
 
-ENV COMPOSER_VENDOR_DIR $DIR_COMPOSER_VENDOR
-ENV PATH $PATH:$DIR_BIN
+ENV PATH $PATH:$COMPOSER_PHARS_DIR/bin
 
 RUN apk add --no-cache \
         $PHPIZE_DEPS \
         gnupg \
         graphviz \
+        make \
         terminus-font \
         vim && \
+    curl -sSLf \
+        -o /usr/local/bin/composer \
+        https://getcomposer.org/download/2.5.1/composer.phar && \
     curl -sSLf \
         -o /usr/local/bin/install-php-extensions \
         https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && \
-    curl -sSLf \
-        -o /usr/local/bin/phive \
-        https://phar.io/releases/phive.phar && \
     chmod +x \
-        /usr/local/bin/install-php-extensions \
-        /usr/local/bin/phive && \
+        /usr/local/bin/composer \
+        /usr/local/bin/install-php-extensions && \
     install-php-extensions \
         intl \
-        pcov
-
-WORKDIR $DIR_PACKAGES
-
-COPY ./bin/ $DIR_BIN
-RUN cd $DIR_BIN && yes | phive install
-
-COPY ./packages/ $DIR_PACKAGES
-RUN cd $DIR_PACKAGES && composer install
+        pcov && \
+    adduser bauhaus sudo -u 1000 -h $HOME_DIR -s /sbin/nologin -D && \
+    mkdir -p \
+        $COMPOSER_CODE_DIR \
+        $COMPOSER_PHARS_DIR \
+        $CACHE_DIR \
+        $CODE_DIR \
+        $PHARS_DIR \
+        $REPORTS_DIR && \
+    chown -R bauhaus:bauhaus $HOME_DIR
+
+WORKDIR $CODE_DIR
+USER bauhaus
+
+COPY --chown=bauhaus:bauhaus phars/ $PHARS_DIR/
+COPY --chown=bauhaus:bauhaus code/ $CODE_DIR/
+
+RUN make composer/install
 
 ENTRYPOINT []

Makefile

@@ -1,68 +1,46 @@
-version ?= local
-php ?= 8.2.0
-revision = dev-${version}-php${php}
+MAKEFLAGS += --silent
 
-include stack.config.env
-export
-export PHP := ${php}
-export REVISION := ${revision}
+tests/%:
+	@make docker/run cmd='make ${@}'
 
-build:
-	@make -s stack cmd=build
-
-test: level ?= all
-test:
-	@make -s stack-run cmd='composer test:${level}'
+composer/%:
+	@make docker/run cmd='make ${@}'
 
 sh:
-	@make -s stack-run cmd='sh'
-
-#
-# Local
-local-setup:
-	@make -s build
-	@make -s local-cp-files
-
-local-cp-files: localBin = ./bin
-local-cp-files: localVendor = ./vendor
-local-cp-files:
-	@rm -rf ${localBin} ${localVendor}
-	@make -s stack cmd='up -d'
-	@make -s cp from=${DIR_BIN} to=${localBin}
-	@make -s cp from=${DIR_COMPOSER_VENDOR} to=${localVendor}
-	@make -s stack cmd='down --remove-orphans'
-
-cp:
-	@make -s stack cmd='cp bauhaus:${from} ${to}'
-
-#
-# Docker
-stackFiles = stack.yaml $(if ${CI},,stack.local.yaml)
-
-stack-files:
-	@echo ${stackFiles}
-
-stack-dump:
-	@make -s stack cmd=config
-
-stack-run: options = $(if ${CI},-T)
-stack-run:
-	@make -s stack cmd='run ${options} bauhaus ${cmd}'
-
-stack: stack = $(addprefix -f,${stackFiles})
-stack:
-	@docker compose ${stack} ${cmd}
+	@make docker/run cmd=sh
 
-#
-# Release
 publish: remote = git@github.com:bauhausphp/${package}.git
-publish: commit = Ref bauhausphp/bauhaus@${revision}
-publish: source = packages/src/${package}
-publish: destination = temp/${package}
+publish: branch = $(shell git rev-parse --abbrev-ref HEAD)
+publish: commit = Ref bauhausphp/bauhaus@${version}
+publish: author-name = $(shell git --no-pager show -s --format='%an' HEAD)
+publish: author-email = $(shell git --no-pager show -s --format='%ae' HEAD)
+publish: workdir = ./var/tmp/${package}
 publish:
-	rm -rf ${destination}
-	git clone -b ${branch} ${remote} ${destination} || git clone ${remote} ${destination}
-	rsync --archive --verbose --exclude .git --delete-after ${source}/ ${destination}
-	git -C ${destination} add .
-	git -C ${destination} commit --message '${commit}' || echo 'No change'
-	git -C ${destination} push -u origin HEAD:${branch}
+	@rm -rf ${workdir}
+	@git clone -b ${branch} ${remote} ${workdir} || git clone ${remote} ${workdir}
+	@rsync --quiet --archive --verbose --exclude .git --delete-after ./code/packages/${package}/ ${workdir}
+	@git -C ${workdir} status --porcelain
+	@if [ "$$(git -C ${workdir} status --porcelain)" ]; then \
+	    git -C ${workdir} config user.name "${author-name}"; \
+	    git -C ${workdir} config user.email ${author-email}; \
+	    git -C ${workdir} add .; \
+	    git -C ${workdir} commit --message "${commit}"; \
+	    git -C ${workdir} push -u origin HEAD:${branch}; \
+	fi;
+
+docker: php ?= 8.2.0
+docker: version = $(shell git rev-parse --short HEAD)
+docker: revision = dev-${version}-php${php}
+docker: files = $(addprefix -f,$(shell make -s docker/files))
+docker:
+	@TAG=${revision} PHP=${php} docker compose ${files} ${cmd}
+
+docker/files:
+	@echo docker-compose.yaml $(if ${CI},,docker-compose.local.yaml)
+
+docker/run: options = --no-deps $(if ${CI},-T)
+docker/run:
+	@make docker cmd='run ${options} bauhaus ${cmd}'
+
+docker/%:
+	@make docker cmd='${*}'

code/Makefile

@@ -0,0 +1,31 @@
+MAKEFLAGS += --silent
+.PHONY: tests
+
+tests:
+	@make tests/unit
+	@make tests/mutation
+
+tests/cs:
+	@phpcs -ps \
+		--cache=${CACHE_DIR}/phpcs.cache
+
+tests/unit:
+	@phpunit \
+		--cache-result-file ${CACHE_DIR}/phpunit.cache \
+		--coverage-clover ${REPORTS_DIR}/clover.xml \
+		--coverage-html ${REPORTS_DIR}/coverage
+
+tests/mutation:
+	@infection run -s -j4
+
+composer/install: composer/phars/install composer/code/install
+
+composer/phars/%:
+	@make composer cmd=${*} workDir=${PHARS_DIR} vendorDir=${COMPOSER_PHARS_DIR}
+
+composer/code/%:
+	@make composer cmd=${*} workDir=${CODE_DIR} vendorDir=${COMPOSER_CODE_DIR}
+
+composer:
+	@composer -d ${workDir} config vendor-dir ${vendorDir}
+	@composer -d ${workDir} ${cmd}

code/autoload.php

@@ -0,0 +1,3 @@
+<?php
+
+require_once "{$_ENV['COMPOSER_CODE_DIR']}/autoload.php";

code/composer.json

@@ -0,0 +1,22 @@
+{
+    "type": "project",
+    "license": "MIT",
+
+    "autoload": {
+        "psr-4": { "Bauhaus\\Tests\\": "./tests/"}
+    },
+
+    "require": {
+        "bauhaus/service-resolver": "dev-main",
+        "bauhaus/type-uri": "dev-main"
+    },
+
+    "repositories": [
+        { "type":"path", "url": "./packages/*/" }
+    ],
+
+    "config": {
+        "sort-packages": false,
+        "vendor-dir": "/usr/local/bauhaus/composer/phars"
+    }
+}

packages/deptrac.yaml → code/deptrac.yaml

@@ -21,8 +21,8 @@ deptrac:
 
     - name: TypeUri
       collectors:
-      - { type: directory, value: ./src/type-uri/public/ }
-      - { type: directory, value: ./src/type-uri/private/, private: true }
+      - { type: directory, value: ./src/uri/public/ }
+      - { type: directory, value: ./src/uri/private/, private: true }
 
     - name: TestServiceResolver
       collectors: