Merge pull request #303

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

-.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

RELEASE-0.1.0

-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1326: Makefile for testing/releasing & stuffz
-
-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* Add a version constant
-
-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* Missed committing the helper functions
-
-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* Add test for insertOne(), findOne(), count(), ..
-
-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* Do not merge options, mongod doesn't like empty ones
-
-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* Importing json, finding one document
-
-2014-12-11  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1335: Add Collection::findOne() helper
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1327: Initial commit of PHongo CRUD docs
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* ignore apidoc
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* Add experimental apigen config file
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* Add example referenced from Collection::bulkWrite()
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1327: Add docblocks
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* Fetch the correct option set
-
-2014-12-10  Jeremy Mikola  <jmikola@gmail.com>
-	* Add default PHPUnit configuration
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1331: Implement Collection::getDatabaseName() and Collection::getCollectionName()
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* deleteMany is supposed to have no limit
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1332: Throw InvalidArgumentException on argument errors
-
-2014-12-10  Hannes Magnusson  <bjori@mongodb.com>
-	* Move constants from namespace constants to class constants
-
-2014-12-09  Hannes Magnusson  <bjori@mongodb.com>
-	* Lets see if this works for phongo...
-
-2014-12-09  Hannes Magnusson  <bjori@mongodb.com>
-	* ws
-
-2014-12-09  Hannes Magnusson  <bjori@mongodb.com>
-	* ignore the composer lock
-
-2014-12-09  Hannes Magnusson  <bjori@mongodb.com>
-	* Add "PSR-4" autoloading
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* Bump dependency
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* folding markers
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1312: Implement Collection::bulkWrite()
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* write.php contains all examples for now
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* Regenerate
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1300: Create WriteResult classes
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1315: Implement Collection::findOneAndUpdate()
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1313: Implement Collection::findOneAndDelete()
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1314: Implement Collection::findOneAndReplace()
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* Fix replacing a document after fixing PHP-1320
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* folding
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* improve throw/catch frequency
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* Missed deleting an empty file after refactoring
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* Ignore local ini
-
-2014-12-08  Hannes Magnusson  <bjori@mongodb.com>
-	* I have no idea why, but this is apparently not valid syntax in php
-
-2014-12-05  Hannes Magnusson  <bjori@mongodb.com>
-	* Improve Command Cursor suport
-
-2014-12-05  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1301: Collection::aggregate()
-
-2014-12-05  Hannes Magnusson  <bjori@mongodb.com>
-	* Fix option parsing and pass correct options to distinct
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1303: Collection::distinct()
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1302: Collection::count()
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* Make this more namespace and autoload friendly, class per file
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1309: Collection::replaceOne()
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* CRUD API examples
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1310 & PHP-1311: Collection::update[One|Many]()
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1307 & PHP-1308: Collection::delete[One|Many]()
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1305: Collection::insertOne()
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* Naming consistency with the spec
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* Implement write helper
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* Reorganize and add folding markers
-
-2014-12-04  Hannes Magnusson  <bjori@10gen.com>
-	* Initial commit
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* Initial commit
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* Basic ignore
-
-2014-12-04  Hannes Magnusson  <bjori@mongodb.com>
-	* PHP-1304: Implement Collection::find()