diff --git a/Makefile b/Makefile index 14c813da..7559873f 100644 --- a/Makefile +++ b/Makefile @@ -16,16 +16,16 @@ endif ## Run a command inside an alpine PHP 8 CLI image. ## 1. Command to execute, eg: "./vendor/bin/phpcs" 2. Working dir (optional) define execPhpAlpine - @docker image inspect qit-cli-php-xdebug > /dev/null 2>&1 || docker build --build-arg CI=${CI} -t qit-cli-php-xdebug ./_build/docker/php83 + @docker image inspect qit-cli-php-xdebug-pcntl > /dev/null 2>&1 || docker build --build-arg CI=${CI} -t qit-cli-php-xdebug-pcntl ./_build/docker/php83 docker run --rm \ --user $(DOCKER_USER) \ -v "${PWD}:/app" \ - -v "${PWD}/_build/docker/php83/ini:/usr/local/etc/php/conf.d/" \ + -v "${PWD}/_build/docker/php83/ini/xdebug.ini:/usr/local/etc/php/conf.d/xdebug.ini" \ --env QIT_HOME=/tmp \ --env PHP_IDE_CONFIG=serverName=qit_cli \ --workdir "$(2:=/)" \ --add-host host.docker.internal:host-gateway \ - qit-cli-php-xdebug \ + qit-cli-php-xdebug-pcntl \ bash -c "php -d xdebug.start_with_request=$(if $(filter 1,$(DEBUG)),yes,no) -d memory_limit=1G $(1)" endef @@ -56,6 +56,7 @@ phpcbf: $(call execPhpAlpine,/app/src/vendor/bin/phpcbf /app/src/qit-cli.php /app/src/src -s --standard=/app/src/.phpcs.xml.dist) phpcs: + $(MAKE) phpcbf $(call execPhpAlpine,/app/src/vendor/bin/phpcs /app/src/qit-cli.php /app/src/src -s --standard=/app/src/.phpcs.xml.dist) phpstan: diff --git a/_build/docker/php83/Dockerfile b/_build/docker/php83/Dockerfile index c433f4be..0676b6bb 100644 --- a/_build/docker/php83/Dockerfile +++ b/_build/docker/php83/Dockerfile @@ -4,7 +4,10 @@ ARG CI RUN apt-get update \ && apt-get install -y libzip-dev \ - && docker-php-ext-install zip + && docker-php-ext-install zip \ + && docker-php-ext-enable zip \ + && docker-php-ext-install pcntl \ + && docker-php-ext-enable pcntl # Install Xdebug only if not in CI environment RUN if [ "$CI" != "true" ]; then \ diff --git a/_build/docker/php83/ini/xdebug.ini b/_build/docker/php83/ini/xdebug.ini index d71956be..fea14732 100644 --- a/_build/docker/php83/ini/xdebug.ini +++ b/_build/docker/php83/ini/xdebug.ini @@ -1,4 +1,3 @@ -zend_extension=xdebug.so xdebug.client_host = host.docker.internal xdebug.client_port = 9003 xdebug.output_dir = /app/_build/docker/php83/xdebug/output diff --git a/_build/docker/php83/ini/zip.ini b/_build/docker/php83/ini/zip.ini deleted file mode 100644 index b3df5138..00000000 --- a/_build/docker/php83/ini/zip.ini +++ /dev/null @@ -1,2 +0,0 @@ -# Enable zip extension -extension=zip.so \ No newline at end of file diff --git a/src/.phpcs.xml.dist b/src/.phpcs.xml.dist index c3d819c4..000f2ebf 100644 --- a/src/.phpcs.xml.dist +++ b/src/.phpcs.xml.dist @@ -5,7 +5,7 @@ - +