README.md

@@ -1,5 +1,21 @@
 # PHPSpec Nyan Formatters Extension
-This PHPSpec extension provides more Nyan formatters for PHPSpec.
+This PHPSpec extension provides Nyan formatters for PHPSpec.
+
+## Requirements
+
+This extension requires:
+
+ * PHP 5.3.3 or later.
+ * A terminal emulator with support for ANSI escape sequences, including color
+   and cursor control.
+
+**NOTE:** By default, the Windows console does not support ANSI escape
+sequences. If you'd like to use this extension on Windows, you may want
+to try one of the following solutions:
+
+ * [ANSICON](https://github.com/adoxa/ansicon)
+ * [ConEmu](https://github.com/Maximus5/ConEmu)
+
 
 ## Installation
 To install this, make sure you are using the latest release of PHPSpec, and then add the following to your
@@ -8,30 +24,30 @@ To install this, make sure you are using the latest release of PHPSpec, and then
 ```json
 "require-dev": {
     ...,
-    "phpspec/nyan-formatters": "1.*"
+    "phpspec/nyan-formatters": "2.*"
 }
 ```
 
 Install or update your dependencies, and then in a `phpspec.yml` file in the root of your project, add the following:
 
 ```yaml
 extensions:
-    - PhpSpec\NyanFormattersExtension\Extension
+    PhpSpec\NyanFormattersExtension\Extension: ~
 ```
 
 Then, you can add a `--format` switch to your `phpspec` command with one of the following values:
 
 - `nyan.cat` - Gives the standard Nyan Cat formatter
 
-![nyan cat formatter preview](https://raw.github.com/phpspec/nyan-formatters/screenshots/formatters/cat.png)
+![nyan cat formatter preview](screenshots/formatters/cat.gif)
 
 - `nyan.dino` - Gives a dinosaur formatter - Rawwr!
 
-![nyan dino formatter preview](https://raw.github.com/phpspec/nyan-formatters/screenshots/formatters/dino.png)
+![nyan dino formatter preview](screenshots/formatters/dino.gif)
 
 - `nyan.crab` - Gives a crab formatter
 
-![nyan crab formatter preview](https://raw.github.com/phpspec/nyan-formatters/screenshots/formatters/crab.png)
+![nyan crab formatter preview](screenshots/formatters/crab.gif)
 
 If you want to use one of the formatters all the time, you can enforce a default by adding a `formatter.name` option in
 the `phpspec.yml` file as follows:

composer.json

@@ -7,7 +7,7 @@
     "license": "MIT",
     "require": {
         "php": ">=5.3.3",
-        "phpspec/phpspec": "~2.0",
+        "phpspec/phpspec": "~3.0|~4.0|~5.0|~6.0",
         "whatthejeff/nyancat-scoreboard": "~1.1"
     },
     "autoload": {

phpspec.yml.dist

@@ -1,2 +1,2 @@
 extensions:
-    - PhpSpec\NyanFormattersExtension\Extension
+    PhpSpec\NyanFormattersExtension\Extension: ~

src/PhpSpec/NyanFormattersExtension/Extension.php

@@ -2,7 +2,7 @@
 
 namespace PhpSpec\NyanFormattersExtension;
 
-use PhpSpec\Extension\ExtensionInterface;
+use PhpSpec\Extension as PhpSpecExtension;
 use PhpSpec\ServiceContainer;
 
 /**
@@ -12,12 +12,12 @@
  *
  * @author Matthew Davis <matt@mattdavis.co.uk>
  */
-class Extension implements ExtensionInterface
+class Extension implements PhpSpecExtension
 {
     /**
      * {@inheritdoc}
      */
-    public function load(ServiceContainer $container)
+    public function load(ServiceContainer $container, array $params)
     {
         $this->addFormatter($container, 'cat', 'PhpSpec\NyanFormattersExtension\Formatter\NyanFormatter');
         $this->addFormatter($container, 'dino', 'PhpSpec\NyanFormattersExtension\Formatter\DinoFormatter');
@@ -33,7 +33,7 @@ public function load(ServiceContainer $container)
      */
     protected function addFormatter(ServiceContainer $container, $name, $class)
     {
-        $container->set('formatter.formatters.nyan.' . $name, function ($c) use ($class) {
+        $container->define('formatter.formatters.nyan.' . $name, function ($c) use ($class) {
             /** @var ServiceContainer $c */
             return new $class(
                 $c->get('formatter.presenter'),

src/PhpSpec/NyanFormattersExtension/Formatter/NyanFormatter.php

@@ -4,7 +4,7 @@
 
 use PhpSpec\Event\SuiteEvent;
 use PhpSpec\Event\ExampleEvent;
-use PhpSpec\Formatter\DotFormatter;
+use PhpSpec\Formatter\ConsoleFormatter;
 
 use NyanCat\Cat;
 use NyanCat\Rainbow;
@@ -21,7 +21,7 @@
  * @author Jeff Welch <whatthejeff@gmail.com>
  * @author Matthew Davis <matt@mattdavis.co.uk>
  */
-class NyanFormatter extends DotFormatter
+class NyanFormatter extends ConsoleFormatter
 {
     /**
      * The number of examples