diff --git a/.gitattributes b/.gitattributes
index 18e14aad..48387724 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,11 @@
-/tests export-ignore
+*.php text eol=lf
+
+.github export-ignore
+tests export-ignore
+tmp export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+Makefile export-ignore
+phpcs.xml export-ignore
+phpstan.neon export-ignore
+phpunit.xml export-ignore
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aba91f05..3cf185e4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
- name: "Lint"
- run: "vendor/bin/phing lint"
+ run: "make lint"
coding-standards:
name: "Coding Standard"
@@ -68,10 +68,10 @@ jobs:
run: "composer install --no-interaction --no-progress --no-suggest"
- name: "Lint"
- run: "vendor/bin/phing lint"
+ run: "make lint"
- name: "Coding Standard"
- run: "vendor/bin/phing cs"
+ run: "make cs"
tests:
name: "Tests"
@@ -113,7 +113,7 @@ jobs:
run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
- name: "Tests"
- run: "vendor/bin/phing tests"
+ run: "make tests"
static-analysis:
name: "PHPStan"
@@ -157,4 +157,4 @@ jobs:
run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
- name: "PHPStan"
- run: "vendor/bin/phing phpstan"
+ run: "make phpstan"
diff --git a/.gitignore b/.gitignore
index ff72e2d0..d6a83e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-/composer.lock
+/tests/tmp
/vendor
+composer.lock
+.phpunit.result.cache
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..fe917d3b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+.PHONY: check
+check: lint cs tests phpstan
+
+.PHONY: tests
+tests:
+ php vendor/bin/phpunit
+
+.PHONY: lint
+lint:
+ php vendor/bin/parallel-lint --colors \
+ src tests
+
+.PHONY: cs
+cs:
+ composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
+
+.PHONY: cs-fix
+cs-fix:
+ php build-cs/vendor/bin/phpcbf
+
+.PHONY: phpstan
+phpstan:
+ php vendor/bin/phpstan analyse -l 8 -c phpstan.neon src tests
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 99fa177f..00000000
--- a/build.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/composer.json b/composer.json
index 8b445974..55dcd59f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,64 +1,63 @@
{
- "name": "phpstan/phpstan-doctrine",
- "type": "phpstan-extension",
- "description": "Doctrine extensions for PHPStan",
- "license": [
- "MIT"
- ],
- "require": {
- "php": "^7.1 || ^8.0",
- "phpstan/phpstan": "^0.12.82"
- },
- "conflict": {
- "doctrine/collections": "<1.0",
- "doctrine/common": "<2.7",
- "doctrine/mongodb-odm": "<1.2",
- "doctrine/orm": "<2.5",
- "doctrine/persistence": "<1.3"
- },
- "require-dev": {
- "doctrine/annotations": "^1.11.0",
- "doctrine/collections": "^1.6",
- "doctrine/common": "^2.7 || ^3.0",
- "doctrine/dbal": "^2.13.1",
- "doctrine/mongodb-odm": "^1.3 || ^2.1",
- "doctrine/orm": "^2.5",
- "doctrine/persistence": "^1.1 || ^2.0",
- "phing/phing": "^2.16.3",
- "php-parallel-lint/php-parallel-lint": "^1.2",
- "phpstan/phpstan-phpunit": "^0.12.16",
- "phpstan/phpstan-strict-rules": "^0.12.5",
- "phpunit/phpunit": "^7.5.20",
- "ramsey/uuid-doctrine": "^1.5.0"
- },
- "config": {
- "platform": {
- "php": "7.3.24",
- "ext-mongo": "1.6.16"
- },
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "0.12-dev"
- },
- "phpstan": {
- "includes": [
- "extension.neon",
- "rules.neon"
- ]
- }
- },
- "autoload": {
- "psr-4": {
- "PHPStan\\": "src/"
- }
- },
- "autoload-dev": {
- "classmap": [
- "tests/"
- ]
- },
- "minimum-stability": "dev",
- "prefer-stable": true
+ "name": "phpstan/phpstan-doctrine",
+ "type": "phpstan-extension",
+ "description": "Doctrine extensions for PHPStan",
+ "license": [
+ "MIT"
+ ],
+ "require": {
+ "php": "^7.1 || ^8.0",
+ "phpstan/phpstan": "^0.12.82"
+ },
+ "conflict": {
+ "doctrine/collections": "<1.0",
+ "doctrine/common": "<2.7",
+ "doctrine/mongodb-odm": "<1.2",
+ "doctrine/orm": "<2.5",
+ "doctrine/persistence": "<1.3"
+ },
+ "require-dev": {
+ "doctrine/annotations": "^1.11.0",
+ "doctrine/collections": "^1.6",
+ "doctrine/common": "^2.7 || ^3.0",
+ "doctrine/dbal": "^2.13.1",
+ "doctrine/mongodb-odm": "^1.3 || ^2.1",
+ "doctrine/orm": "^2.5",
+ "doctrine/persistence": "^1.1 || ^2.0",
+ "php-parallel-lint/php-parallel-lint": "^1.2",
+ "phpstan/phpstan-phpunit": "^0.12.16",
+ "phpstan/phpstan-strict-rules": "^0.12.5",
+ "phpunit/phpunit": "^7.5.20",
+ "ramsey/uuid-doctrine": "^1.5.0"
+ },
+ "config": {
+ "platform": {
+ "php": "7.3.24",
+ "ext-mongo": "1.6.16"
+ },
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.12-dev"
+ },
+ "phpstan": {
+ "includes": [
+ "extension.neon",
+ "rules.neon"
+ ]
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "PHPStan\\": "src/"
+ }
+ },
+ "autoload-dev": {
+ "classmap": [
+ "tests/"
+ ]
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true
}
diff --git a/phpcs.xml b/phpcs.xml
index 8e0b3fd6..384ea9ab 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,5 +1,13 @@
+
+
+
+
+
+
+ src
+ tests
@@ -55,5 +63,6 @@
+ tests/tmp
tests/*/data
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 00000000..f9f3afe2
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,36 @@
+
+
+
+
+ ./src
+
+
+
+
+
+
+
+
+
+ tests
+
+
+
+
+
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
deleted file mode 100644
index fc7e5723..00000000
--- a/tests/phpunit.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- ../src
-
-
-
-
-
-
diff --git a/tmp/.gitignore b/tmp/.gitignore
new file mode 100644
index 00000000..37890cae
--- /dev/null
+++ b/tmp/.gitignore
@@ -0,0 +1,3 @@
+*
+!cache
+!.*
diff --git a/tmp/cache/.gitignore b/tmp/cache/.gitignore
new file mode 100644
index 00000000..125e3429
--- /dev/null
+++ b/tmp/cache/.gitignore
@@ -0,0 +1,2 @@
+*
+!.*