Merge branch 'release/5.1.0'

Author: ezzatron

.travis.install

@@ -1,10 +1,14 @@
 #!/usr/bin/env php
 <?php
-/**
- * This script is executed before composer dependencies are installed,
- * and as such must be included in each project as part of the skeleton.
- */
 
+// Update git to the latest version ...
+passthru('sudo apt-get update');
+passthru('sudo apt-get install git');
+
+// Update composer to the latest version ...
+passthru('composer self-update --no-interaction');
+
+// Build a composer config that uses the GitHub OAuth token if it is available ...
 $config = array(
     'config' => array(
         'notify-on-install' => false
@@ -16,20 +20,23 @@ if ($token = getenv('ARCHER_TOKEN')) {
         'github.com' => $token
     );
     $composerFlags = '--prefer-dist';
-    passthru('curl -s -i -H "Authorization: token $ARCHER_TOKEN" https://api.github.com | grep "^X-RateLimit"');
 } else {
     $composerFlags = '--prefer-source';
 }
 
 $file = '~/.composer/config.json';
-$dir  = dirname($file);
+$dir = dirname($file);
 if (!is_dir($dir)) {
     mkdir($dir, 0755, true);
 }
 file_put_contents($file, json_encode($config));
 
-passthru('composer self-update --no-interaction');
+// Display some information about GitHub rate limiting ...
+if ($token) {
+    passthru('curl -s -i -H "Authorization: token $ARCHER_TOKEN" https://api.github.com | grep "^X-RateLimit"');
+}
 
+// Install composer dependencies ...
 $exitCode = 0;
 passthru('composer install --dev --no-progress --no-interaction --ansi ' . $composerFlags, $exitCode);
 exit($exitCode);

.travis.yml

@@ -1,11 +1,3 @@
-#
-# This is the default Travis CI configuration.
-#
-# It uses a GitHub OAuth token when fetching composer dependencies
-# to avoid IP-based API throttling.
-#
-# It also allows publication of artifacts via an additional build.
-#
 language: php
 
 php: ["5.3", "5.4", "5.5", "hhvm"]
@@ -16,10 +8,11 @@ matrix:
 
 env:
   global:
-    - ARCHER_PUBLISH_VERSION=5.4
+    - ARCHER_PUBLISH_VERSION=5.5
     - secure: "RshLtPfJvPQyIxEsUXlBc/DEfv2uEBvr2gf4Ml6qIbnCjeGUknyhGpjm/oLn4gL0lonTC3gLhT3PVkZG8yTCjFrThnLPucty9LFT4hLfqH2JTSrqYWc57sS3EuaAbjYUo/UtKV9QQTBm3TQYuWGKamzTnNtNM6lITrL19zfcAbM="
 
 install:
   - ./.travis.install
+
 script:
   - ./vendor/bin/archer travis:build

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Enumeration changelog
 
+## 5.1.0 (2014-03-13)
+
+- **[NEW]** Implemented `memberOrNullBy()` and variants
+
 ## 5.0.1 (2014-01-29)
 
 - **[MAINTENANCE]** General repository maintenance

CONTRIBUTING.md

@@ -6,24 +6,27 @@ changes.
 
 ### Code style
 
-All PHP code must adhere to the
-[PSR-2](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md)
-standards.
+All PHP code must adhere to the [PSR-2] standards.
 
 ### Branching and pull requests
 
 As a guideline, please follow this process:
 
- 1. [Fork the repository](https://help.github.com/articles/fork-a-repo).
+ 1. [Fork the repository].
  2. Create a topic branch for the change:
-    * New features should branch from **develop**.
-    * Bug fixes to existing versions should branch from **master**.
-    * Please ensure the branch is clearly labelled as a feature or fix.
+    - New features should branch from **develop**.
+    - Bug fixes to existing versions should branch from **master**.
+    - Please ensure the branch is clearly labelled as a feature or fix.
  3. Make the relevant changes.
- 4. [Squash](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
-    commits if necessary.
+ 4. [Squash] commits if necessary.
  4. Submit a pull request to the **develop** branch.
 
 Please note this is a general guideline only. For more information on the
-branching structure please see the
-[git-flow cheatsheet](http://danielkummer.github.com/git-flow-cheatsheet/).
+branching structure please see the [git-flow cheatsheet].
+
+<!-- References -->
+
+[Fork the repository]: https://help.github.com/articles/fork-a-repo
+[git-flow cheatsheet]: http://danielkummer.github.com/git-flow-cheatsheet/
+[PSR-2]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
+[Squash]: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages

README.md

@@ -2,7 +2,7 @@
 
 *An enumeration implementation for PHP.*
 
-[![The most recent stable version is 5.0.1][version-image]][Semantic versioning]
+[![The most recent stable version is 5.1.0][version-image]][Semantic versioning]
 [![Current build status image][build-image]][Current build status]
 [![Current coverage status image][coverage-image]][Current coverage status]
 
@@ -274,4 +274,4 @@ function handleCustomHttpRequest(
 [Current coverage status]: https://coveralls.io/r/eloquent/enumeration
 [eloquent/enumeration]: https://packagist.org/packages/eloquent/enumeration
 [Semantic versioning]: http://semver.org/
-[version-image]: http://img.shields.io/:semver-5.0.1-brightgreen.svg "This project uses semantic versioning"
+[version-image]: http://img.shields.io/:semver-5.1.0-brightgreen.svg "This project uses semantic versioning"