Skip to content

Commit d4c4f2e

Browse files
committed
Merge pull request #5495 in SW/shopware from sw-19759/5.3/revert-mpdf to 5.3
* commit 'b42c18cf0f53bd1feb213c147ea309ea20d31d06': Revert "Merge pull request #5447 in SW/shopware from sw-19759/5.3/mdpf-via-composer to 5.3"
2 parents 1d7cb25 + b42c18c commit d4c4f2e

File tree

550 files changed

+162167
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

550 files changed

+162167
-140
lines changed

UPGRADE-5.3.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ This changelog references changes done in Shopware 5.3 patch versions.
1919

2020
### Changes
2121

22-
* Updated mPDF to version 6.1.4 and required it via composer
2322
* Updated CustomerStream interface to improve usability
24-
* Fixed typos im mail templates
2523

2624
## 5.3.2
2725

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@
6565
"setasign/fpdf": "1.8.1",
6666
"setasign/fpdi": "1.6.1",
6767
"roave/security-advisories": "dev-master",
68-
"ocramius/proxy-manager": "^1.0",
69-
"mpdf/mpdf": "v6.1.4"
68+
"ocramius/proxy-manager": "^1.0"
7069
},
7170
"suggest": {
7271
"ext-apcu": "*",

composer.lock

Lines changed: 1 addition & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

engine/Library/Mpdf/CHANGELOG.txt

Lines changed: 3110 additions & 0 deletions
Large diffs are not rendered by default.

engine/Library/Mpdf/CREDITS.txt

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
2+
3+
/*******************************************************************************
4+
* Software: FPDF *
5+
* Version: 1.53 *
6+
* Date: 2004-12-31 *
7+
* Author: Olivier PLATHEY *
8+
* License: Freeware *
9+
* *
10+
* You may use and modify this software as you wish. *
11+
*******************************************************************************/
12+
13+
/*******************************************************************************
14+
* HTML2FPDF is a php script to read a HTML text and generate a PDF file. *
15+
* Copyright (C) 2004-2005 Renato Coelho *
16+
* *
17+
* html2fpdf.php, htmltoolkit.php *
18+
*******************************************************************************/
19+
20+
CREDITS From HTML2FPDF:
21+
22+
-Olivier Plathey for the fpdf.php class [http://www.fpdf.org]
23+
-Damon Kohler for the Flowing Block script [mailto:[email protected]]
24+
-Cl�ment Lavoillotte for HTML-oriented FPDF idea
25+
-Yamasoft for the gif.php class [http://www.yamasoft.com/]
26+
-J�r�me Fenal for the _parsegif() function
27+
-"VIETCOM" for the PDFTable code [http://www.freepgs.com/vietcom/tool/pdftable/] [mailto:[email protected]]
28+
-Yukihiro O. for the SetDash() function [mailto:[email protected]]
29+
-Ron Korving for the WordWrap() function
30+
-Michel Poulain for the DisplayPreferences() function
31+
-Patrick Benny for the MultiCellBlt() function idea [no longer in use]
32+
-Seb for the _SetTextRendering() and SetTextOutline() functions [mailto:[email protected]]
33+
-MorphSoft for the colornames list idea
34+
-W3SCHOOLS for HTML-related reference info [http://www.w3schools.com/]
35+
36+
37+
38+
/****************************************************************************
39+
* Software: FPDF_Protection *
40+
* Version: 1.02 *
41+
* Date: 2005/05/08 *
42+
* Author: Klemen VODOPIVEC *
43+
* License: Freeware *
44+
* *
45+
* You may use and modify this software as you wish as stated in original *
46+
* FPDF package. *
47+
****************************************************************************/
48+
49+
/****************************************************************************
50+
// FPDI - Version 1.2
51+
//
52+
// Copyright 2004-2007 Setasign - Jan Slabon
53+
//
54+
// Licensed under the Apache License, Version 2.0 (the "License");
55+
// you may not use this file except in compliance with the License.
56+
// You may obtain a copy of the License at
57+
//
58+
// http://www.apache.org/licenses/LICENSE-2.0
59+
//
60+
// Unless required by applicable law or agreed to in writing, software
61+
// distributed under the License is distributed on an "AS IS" BASIS,
62+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
63+
// See the License for the specific language governing permissions and
64+
// limitations under the License.
65+
****************************************************************************/
66+
67+
/****************************************************************************
68+
* @copyright Khaled Al-Shamaa 2008
69+
* @link http://www.ar-php.org
70+
* @author Khaled Al-Shamaa <[email protected]>
71+
* @desc Set of PHP5 / UTF-8 Classes developed to enhance Arabic web
72+
* applications by providing set of tools includes stem-based searching,
73+
* translitiration, soundex, Hijri calendar, charset detection and
74+
* converter, spell numbers, keyboard language, Muslim prayer time,
75+
* auto-summarization, and more...
76+
* @package Arabic
77+
*
78+
* @version 1.8 released in Feb 15, 2009
79+
*
80+
* @license LGPL
81+
****************************************************************************/
82+
83+
84+
This library is free software; you can redistribute it and/or
85+
modify it under the terms of the GNU Lesser General Public
86+
License as published by the Free Software Foundation;
87+
This library is distributed in the hope that it will be useful,
88+
but WITHOUT ANY WARRANTY; without even the implied warranty of
89+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
90+
Lesser General Public License for more details.
91+
[http://www.opensource.org/licenses/lgpl-license.php]
92+

0 commit comments

Comments
 (0)