diff --git a/.gitattributes b/.gitattributes index 0a2aa02d..124db826 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,8 +9,8 @@ /box.json.dist export-ignore /codecov.yml export-ignore /Makefile export-ignore -/phpunit.xml.dist export-ignore /phpstan.neon.dist export-ignore +/phpunit.xml.dist export-ignore /scoper.inc.php export-ignore /test export-ignore /vendor-bin export-ignore diff --git a/.gitignore b/.gitignore index ee466242..ec9577b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,11 @@ __pycache__ *.pyc /.phpunit.result.cache -/phpstan.neon /build/ /composer.lock /dist/ +/phpstan.neon /vendor-bin/*/vendor/ -/vendor-bin/phpunit/composer.lock /vendor-bin/phpstan/composer.lock +/vendor-bin/phpunit/composer.lock /vendor/ diff --git a/composer.json b/composer.json index 77532315..62295dc1 100644 --- a/composer.json +++ b/composer.json @@ -16,9 +16,9 @@ "php": "^8.0 || ^7.4", "ext-json": "*", "ext-tokenizer": "*", + "nikic/php-parser": "^5.0 || ^4.0", "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4", - "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4", - "nikic/php-parser": "^5.0 || ^4.0" + "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.2"