Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

Commit

Permalink
Update to FPDI 1.6.0
Browse files Browse the repository at this point in the history
License change to MIT and update to FPDI 1.6.0
  • Loading branch information
JanSlabon committed Oct 12, 2015
1 parent c9dafce commit d6e2f7c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ A kind of metadata package for Composer with fixed dependencies for the latest v
## Installation with [Composer](https://packagist.org/packages/setasign/fpdi-tcpdf)

```bash
$ composer require "setasign/fpdi-tcpdf": "1.5.4"
$ composer require "setasign/fpdi-tcpdf": "1.6.0"
```

or you can include the following in your composer.json file:

```json
{
"require": {
"setasign/fpdi-tcpdf": "1.5.4"
"setasign/fpdi-tcpdf": "1.6.0"
}
}
```
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"description": "Kind of metadata package for dependencies of the latest versions of FPDI and TCPDF.",
"type": "library",
"keywords": ["pdf", "fpdi", "tcpdf"],
"license": "Apache-2.0",
"license": "MIT",
"authors": [
{
"name": "Jan Slabon",
Expand All @@ -20,7 +20,7 @@
},
"require": {
"tecnickcom/tcpdf": "6.2.*",
"setasign/fpdi": ">=1.5.4"
"setasign/fpdi": "1.6.*"
},
"conflict": {
"setasign/fpdf": "1.7.*"
Expand Down
25 changes: 8 additions & 17 deletions fpdi_bridge.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
<?php
//
// FPDI - Version 1.5.4
//
// Copyright 2004-2015 Setasign - Jan Slabon
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
/**
* This file is part of FPDI
*
* @package FPDI
* @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
* @license http://opensource.org/licenses/mit-license The MIT License
* @version 1.6.0
*/

class fpdi_bridge extends TCPDF
{
Expand Down

0 comments on commit d6e2f7c

Please sign in to comment.