Merge branch 'release/1.0.1'

.travis.yml

@@ -1,10 +1,14 @@
 language: php
 
-php: ["5.3", "5.4", "5.5"]
+php: ["5.3", "5.4", "5.5", "5.6", "hhvm", "hhvm-nightly"]
+
+matrix:
+    allow_failures: [{"php": "hhvm"}, {"php": "hhvm-nightly"}]
+    fast_finish: true
 
 env:
   global:
-    - ARCHER_PUBLISH_VERSION=5.5
+    - ARCHER_PUBLISH_VERSION=5.6
     - secure: "HZsPafLD/Tw8QB3wxiqUGpmawKoIoZuFanW8Tzve29IAnvjj4ulIxWnYMULQbe4wvukcUg9dkjZ5ltXMJVKeFh3jlrC5ejKWrTD0cCnpfxgkmACInh93+Jt0XhpT+5dbReblOKMFslkEJwJxPily4rocyXUVLiUIz4tQgWnxQtQ="
 
 install:

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Chrono Changelog
 
+### 1.0.1 (2014-10-20)
+
+* **[IMPROVED]** Allow either version 2.* or 3.* of [icecave/isolator](https://github.com/isolator)
+
 ### 1.0.0 (2014-09-09)
 
 * **[NEW]** Added convenience factory methods on `Duration`

README.md

@@ -12,7 +12,7 @@
 ## Rationale
 
 Many date & time operations in the core PHP libraries require access to system state such as the current wall time, or
-resources such as timezone databases. These hard-wire dependencies can make it very difficult to write well-abstracted
+resources such as timezone databases. These hard-wired dependencies can make it very difficult to write well-abstracted
 and testable code when dealing with time-sensitive operations.
 
 **Chrono** provides a set of date & time classes that are completely decoupled from the system and hence behave
@@ -95,7 +95,7 @@ string representation.
 ### Unix timestamps
 
 [Date](src/Date.php) and [DateTime](src/DateTime.php) instances can be produced from unix
-timestamps using the `fromUnixTime()` static method. The unix timestamp can be retreived using `unixTime()`.
+timestamps using the `fromUnixTime()` static method. The unix timestamp can be retrieved using `unixTime()`.
 
 ```php
 $dateTime = DateTime::fromUnixTime(1367823963);
@@ -116,7 +116,13 @@ $dateTime = DateTime::fromNativeDateTime(new NativeDateTime);
 $nativeDateTime = $dateTime->nativeDateTime();
 ```
 
+## Contact us
+
+* Follow [@IcecaveStudios](https://twitter.com/IcecaveStudios) on Twitter
+* Visit the [Icecave Studios website](http://icecave.com.au)
+* Join `#icecave` on [irc.freenode.net](http://webchat.freenode.net?channels=icecave)
+
 <!-- references -->
-[Build Status]: http://img.shields.io/travis/IcecaveStudios/chrono/develop.svg
-[Test Coverage]: http://img.shields.io/coveralls/IcecaveStudios/chrono/develop.svg
-[SemVer]: http://img.shields.io/:semver-0.4.0-yellow.svg
+[Build Status]: http://img.shields.io/travis/IcecaveStudios/chrono/develop.svg?style=flat-square
+[Test Coverage]: http://img.shields.io/coveralls/IcecaveStudios/chrono/develop.svg?style=flat-square
+[SemVer]: http://img.shields.io/:semver-1.0.1-brightgreen.svg?style=flat-square

composer.json

@@ -1,7 +1,14 @@
 {
     "name": "icecave/chrono",
     "description": "A date & time library that is decoupled from the system clock.",
-    "keywords": ["time", "date", "clock", "timer", "chrono", "iso"],
+    "keywords": [
+        "time",
+        "date",
+        "clock",
+        "timer",
+        "chrono",
+        "iso"
+    ],
     "homepage": "https://github.com/IcecaveStudios/chrono",
     "license": "MIT",
     "authors": [
@@ -18,19 +25,21 @@
     ],
     "require": {
         "php": ">=5.3",
-        "icecave/isolator": "~2",
+        "icecave/isolator": "~2|~3",
         "icecave/parity": "~1"
     },
     "require-dev": {
         "eloquent/liberator": "~1",
         "icecave/archer": "~1"
     },
-    "suggest": {
-        "eloquent/asplode": "Drop-in exception-based error handling."
-    },
     "autoload": {
         "psr-4": {
             "Icecave\\Chrono\\": "src"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-develop": "1.0.x-dev"
+        }
     }
 }