From cefe1ae6e87b38e659ebb5089da493cb23deeb0b Mon Sep 17 00:00:00 2001
From: Jan Slabon <jan.slabon@setasign.com>
Date: Mon, 12 Oct 2015 17:37:35 +0200
Subject: [PATCH] Update to FPDI 1.6.0

License change to MIT and update to FPDI 1.6.0
---
 README.md       |  4 ++--
 composer.json   |  6 +++---
 fpdi_bridge.php | 25 ++++++++-----------------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index fe130c3..adf5b5d 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ A kind of metadata package for Composer with fixed dependencies for the latest v
 ## Installation with [Composer](https://packagist.org/packages/setasign/fpdi-fpdf)
 
 ```bash
-$ composer require "setasign/fpdi-fpdf": "1.5.4"
+$ composer require "setasign/fpdi-fpdf": "1.6.0"
 ```
 
 or you can include the following in your composer.json file:
@@ -12,7 +12,7 @@ or you can include the following in your composer.json file:
 ```json
 {
     "require": {
-        "setasign/fpdi-fpdf": "1.5.4"
+        "setasign/fpdi-fpdf": "1.6.0"
     }
 }
 ```
diff --git a/composer.json b/composer.json
index 04cdfee..6e07102 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
     "name": "setasign/fpdi-fpdf",
-    "version": "1.5.4",
+    "version": "1.6.0",
     "homepage": "https://www.setasign.com/fpdi",
     "description": "Kind of metadata package for dependencies of the latest versions of FPDI and FPDF.",
     "type": "library",
     "keywords": ["pdf", "fpdi", "fpdf"],
-    "license": "Apache-2.0",
+    "license": "MIT",
     "authors": [
         {
             "name": "Jan Slabon",
@@ -20,6 +20,6 @@
     },
     "require": {
         "setasign/fpdf": "1.7.*",
-        "setasign/fpdi": ">=1.5.4"
+        "setasign/fpdi": "1.6.*"
     }
 }
diff --git a/fpdi_bridge.php b/fpdi_bridge.php
index b3f436c..14b2724 100644
--- a/fpdi_bridge.php
+++ b/fpdi_bridge.php
@@ -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 FPDF
 {
     // empty body