Merge pull request #303

Author: jmikola

CONTRIBUTING.md

@@ -78,16 +78,18 @@ HHVM.
 
 ### Transition JIRA issues and version
 
-Update the fix version field for all resolved issues with the corresponding ".x"
-fix version.
+All issues associated with the release version should be in the "Closed" state
+and have a resolution of "Fixed". Issues with other resolutions (e.g.
+"Duplicate", "Works as Designed") should be removed from the release version so
+that they do not appear in the release notes.
+
+Check the corresponding ".x" fix version to see if it contains any issues that
+are resolved as "Fixed" and should be included in this release version.
 
 Update the version's release date and status from the
 [Manage Versions](https://jira.mongodb.org/plugins/servlet/project-config/PHPLIB/versions)
 page.
 
-Transition all resolved issues for this version to the closed state. If changing
-the issues in bulk, be sure to allow email notifications.
-
 ### Update version info
 
 The PHP library uses [semantic versioning](http://semver.org/). Do not break

Makefile

@@ -1,7 +1,6 @@
-.PHONY: apigen composer test
+.PHONY: composer test
 
 COMPOSER_ARGS=update --no-interaction --prefer-source
-PHPUNIT_ARGS=--process-isolation
 
 composer:
 	@command -v composer >/dev/null 2>&1; \
@@ -15,23 +14,4 @@ composer:
 	fi
 
 test: composer
-	@command -v phpunit >/dev/null 2>&1; \
-	if test $$? -eq 0; then \
-		phpunit $(PHPUNIT_ARGS); \
-	elif test -r phpunit.phar; then \
-		php phpunit.phar $(PHPUNIT_ARGS); \
-	else \
-		echo >&2 "Cannot find phpunit; aborting."; \
-		false; \
-	fi
-
-release/%: release-log/%
-	@echo "Please run:"
-	@echo "    " git add RELEASE-$(*)
-	@echo "    " git commit -m \"Add $(*) release notes\"
-	@echo "    " git tag -a -m \"Release MongoDB library $(*)\" $(*)
-	@echo "    " git push REMOTE `git rev-parse --abbrev-ref HEAD`
-	@echo "    " git push REMOTE --tags
-
-release-log/%:
-	@git log --pretty=format:"%ad  %an  <%ae>%n%x09* %s%n" --date short --no-merges --since="$$(git show -s --format=%ad `git rev-list --tags --max-count=1`)" > RELEASE-$(*)
+	vendor/bin/phpunit