Merge branch '8.4'

sebastianbergmann · Nov 23, 2019 · d4ac4ed · d4ac4ed
2 parents 5ac49d1 + 3b36667
commit d4ac4ed
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 95 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,20 +1,30 @@
-/.ant_targets
+# PhpStorm
 /.idea
+
+# Composer
+/vendor
+/composer.lock
+
+# Apache Ant
+/.ant_targets
+
+# Build artifacts and temporary files
+/build/artifacts
+/build/tmp
+
+# PHP-CS-Fixer
 /.php_cs
 /.php_cs.cache
+
+# Psalm
 /.psalm/cache
-/build/artifacts
-/build/phar
-/build/phar-scoped
-/build/*.phar
-/build/*.phar.asc
-/build/binary-phar-autoload.php
-/cache.properties
-/composer.lock
+
+# PHPUnit
+.phpunit.result.cache
+
+# Temporary files generated by PHPT test runner
 /tests/end-to-end/*.diff
 /tests/end-to-end/*.exp
 /tests/end-to-end/*.log
 /tests/end-to-end/*.out
 /tests/end-to-end/*.php
-/vendor
-.phpunit.result.cache