Merge branch 'master' of github.com:thephpleague/fractal

Conflicts:
	.rvmrc
	Gemfile
	src/Resource/Item.php
	src/TransformerAbstract.php
	tests/TransformerAbstractTest.php

Author: Phil Sturgeon

.travis.yml

@@ -22,4 +22,4 @@ script:
   - ./vendor/bin/phpcs src --standard=psr2
 
 after_script:
-  - php vendor/bin/coveralls
+  - php vendor/bin/coveralls

Guardfile

@@ -4,4 +4,4 @@ guard 'phpunit2', :tests_path => 'tests', :cli => '--colors' do
 
   # Watch library files and run their tests
   watch(%r{^src/(.+)\.php}) { |m| "tests/#{m[1]}Test.php" }
-end
+end

README.md

@@ -5,14 +5,14 @@
 [![Total Downloads](https://poser.pugx.org/league/fractal/downloads.png)](https://packagist.org/packages/league/fractal)
 [![Latest Stable Version](https://poser.pugx.org/league/fractal/v/stable.png)](https://packagist.org/packages/league/fractal)
 
-Fractal provides a presentation and transformation layer for complex data output, the like found in 
+Fractal provides a presentation and transformation layer for complex data output, the like found in
 RESTful APIs, and works really well with JSON.
 
 When building an API it is common for people to just grab stuff from the database and pass it
 to `json_encode()`. This might be passable for "trivial" API's but if they are in use by the public,
 or used by an iPhone application then this will quickly lead to inconsistent output.
 
-## Goals 
+## Goals
 
 * Create a "barrier" between source data and output, so schema changes do not affect users
 * Systematic type-casting of data, to avoid foreach()ing through and (bool)ing everything
@@ -42,14 +42,14 @@ Via Composer
 
 ## Requirements
 
-The following versions of PHP are supported by this version. 
+The following versions of PHP are supported by this version.
 
 * PHP 5.3
 * PHP 5.4
 * PHP 5.5
 * PHP 5.6
 
-HHVM support is also experimentally supported. It basically works, but CodeSniffer installation is screwing it up on 
+HHVM support is also experimentally supported. It basically works, but CodeSniffer installation is screwing it up on
 Travis-CI.
 
 ## Documentation

src/Pagination/Cursor.php

@@ -28,7 +28,7 @@ class Cursor implements CursorInterface
 
     /**
      * Prev cursor value
-     * 
+     *
      * @var mixed
      */
     protected $prev;

src/Pagination/IlluminatePaginatorAdapter.php

@@ -40,7 +40,7 @@ public function __construct(Paginator $paginator)
          */
         $this->setupPaginationContext();
     }
-    
+
     /**
      * Get the number of items for the current page.
      *

src/Resource/Item.php

@@ -14,8 +14,8 @@
 /**
  * Item Resource
  *
- * The Item Resource can stored any mixed data, usually an ORM, ODM or 
- * other sort of intelligent result, DataMapper model, etc but could 
+ * The Item Resource can stored any mixed data, usually an ORM, ODM or
+ * other sort of intelligent result, DataMapper model, etc but could
  * be a basic array, object, or whatever you like.
  */
 class Item extends ResourceAbstract