Skip to content

Bump to travis php version #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Bump to travis php version #665

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e404c52
Bump to travis php version
michaelachrisco Nov 20, 2015
0de674b
PHP 7.0 protected word String
michaelachrisco Nov 22, 2015
72928e3
Fix php styling
michaelachrisco Nov 20, 2015
dc06b4a
Add back in tecnickcom/tcpdf in composer
michaelachrisco Nov 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add back in tecnickcom/tcpdf in composer
  • Loading branch information
@michaelachrisco
michaelachrisco committed Nov 23, 2015
commit dc06b4a0242461d216c35ef5639f6c7ad6f1704e
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"phpmd/phpmd": "2.*",
"phploc/phploc": "2.*",
"dompdf/dompdf":"0.6.*",
"tecnick.com/tcpdf": "6.*",
"tecnickcom/tcpdf": "6.*",
"mpdf/mpdf": "5.*",
"zendframework/zend-validator": "2.5.*"
},
Expand Down
2 changes: 1 addition & 1 deletion src/PhpWord/Writer/PDF/TCPDF.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class TCPDF extends AbstractRenderer implements WriterInterface
*
* @var string
*/
protected $includeFile = 'tcpdf.php';
protected $includeFile = 'tcpdf_include.php';

/**
* Save PhpWord to file.
Expand Down