Skip to content

Commit 41d39f6

Browse files
committed
Merge branch 'master' of github.com:nilportugues/jsonapi-transformer
2 parents dcf3e4a + f9abc98 commit 41d39f6

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

LICENSE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Nil Portugués Calderó
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=========================================
33

44
[![Build Status](https://travis-ci.org/nilportugues/jsonapi-transformer.svg)](https://travis-ci.org/nilportugues/jsonapi-transformers)
5-
[![Coverage Status](https://coveralls.io/repos/nilportugues/jsonapi-transformer/badge.svg?branch=master&service=github)](https://coveralls.io/github/nilportugues/jsonapi-transformer?branch=master)
5+
[![Coverage Status](https://coveralls.io/repos/nilportugues/json-api/badge.svg?branch=master&service=github?)](https://coveralls.io/github/nilportugues/json-api?branch=master)
66
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nilportugues/json-api/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nilportugues/json-api/?branch=master) [![SensioLabsInsight](https://insight.sensiolabs.com/projects/e39e4c0e-a402-495b-a763-6e0482e2083d/mini.png)](https://insight.sensiolabs.com/projects/e39e4c0e-a402-495b-a763-6e0482e2083d) [![Latest Stable Version](https://poser.pugx.org/nilportugues/json-api/v/stable)](https://packagist.org/packages/nilportugues/json-api) [![Total Downloads](https://poser.pugx.org/nilportugues/json-api/downloads)](https://packagist.org/packages/nilportugues/json-api) [![License](https://poser.pugx.org/nilportugues/json-api/license)](https://packagist.org/packages/nilportugues/json-api)
77

88

composer.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
],
1515
"require": {
1616
"php": ">=5.5.0",
17-
"nilportugues/serializer": "1.0.0-alpha",
18-
"nilportugues/api-transformer": "1.0.1-alpha",
19-
"psr/http-message": "~1.0",
20-
"zendframework/zend-diactoros": "^1.1.0"
17+
"nilportugues/api-transformer": "~1.0"
2118
},
2219
"require-dev": {
2320
"phpunit/phpunit": "4.4.*",

0 commit comments

Comments
 (0)