From 7531bd11aa05dd7a58068c5999c03aa91b473c0b Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 31 Jul 2023 17:40:55 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20add=20compat=20with=20grumphp=202?= =?UTF-8?q?=20(#64)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattribute | 1 + .gitignore | 3 +++ composer.json | 17 ++++++++++++++--- docker-compose.yml | 19 +++++++++++++++++++ packages/.gitkeep | 0 5 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 .gitattribute create mode 100644 docker-compose.yml create mode 100644 packages/.gitkeep diff --git a/.gitattribute b/.gitattribute new file mode 100644 index 0000000..30e9132 --- /dev/null +++ b/.gitattribute @@ -0,0 +1 @@ +docker-compose.yml export-ignore diff --git a/.gitignore b/.gitignore index 1d3e753..3662b04 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ .idea var public/ +packages/* +!packages/.gitkeep + diff --git a/composer.json b/composer.json index cc400cf..b02afb0 100644 --- a/composer.json +++ b/composer.json @@ -25,21 +25,32 @@ "ergebnis/composer-normalize": "^2.31", "kcs/psr-phpstan-rules": "^1.1", "php-parallel-lint/php-parallel-lint": "^1.3.2", - "phpro/grumphp": "^1.15", + "phpro/grumphp": "^2", "phpstan/extension-installer": "^1.2", "phpstan/phpstan": "^1.9.0", - "pluswerk/grumphp-bom-task": "^7.0.0", - "pluswerk/grumphp-xliff-task": "^5.0.0", + "pluswerk/grumphp-bom-task": "^8.0.0", + "pluswerk/grumphp-xliff-task": "^6.0.0", "rector/rector": "^0.15.10", "squizlabs/php_codesniffer": "^3.7.1", "symfony/yaml": "^5.4.0 || ^6.0" }, "require-dev": { "composer/composer": "^2.5.5", + "pluswerk/grumphp-bom-task": "dev-main as 8.99.99", + "pluswerk/grumphp-xliff-task": "dev-main as 6.99.99", "roave/security-advisories": "dev-latest", "saschaegerer/phpstan-typo3": "^1.8.5", "ssch/typo3-rector": "^1.2.2" }, + "repositories": [ + { + "type": "path", + "url": "packages/*", + "options": { + "reference": "none" + } + } + ], "autoload": { "psr-4": { "PLUS\\GrumPHPConfig\\": "src/" diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6a52567 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +version: '3.5' + +services: + web: + image: ghcr.io/pluswerk/php-dev:nginx-8.2-alpine + + volumes: + - .:/app + - /var/run/docker.sock:/var/run/docker.sock:ro + - ~/.ssh:/home/application/.ssh + - ~/.composer/cache:/home/application/.composer/cache + - ~/.gitconfig:/home/application/.gitconfig + + environment: + - XDEBUG_CLIENT_HOST=${XDEBUG_CLIENT_HOST:-} + - XDEBUG_CLIENT_PORT=${XDEBUG_CLIENT_PORT:-9000} + - php.xdebug.idekey=${XDEBUG_IDEKEY:-PHPSTORM} + - APPLICATION_UID=${APPLICATION_UID:-1000} + - APPLICATION_GID=${APPLICATION_GID:-1000} diff --git a/packages/.gitkeep b/packages/.gitkeep new file mode 100644 index 0000000..e69de29