Merge pull request #7908 from piwik/tcpdf_composer

Require TCPDF using composer
matomo-org · May 19, 2015 · 06ebc8b · 06ebc8b
2 parents 95bec8a + a4ea6b8
commit 06ebc8b
Show file tree

Hide file tree

Showing 54 changed files with 87 additions and 77,948 deletions.
diff --git a/composer.json b/composer.json
@@ -54,7 +54,8 @@
         "symfony/event-dispatcher": "~2.6",
         "pear/pear_exception": "~1.0.0",
         "pear/pear-core-minimal": "~1.9.5",
-        "piwik/referrer-spam-blacklist": "~1.0"
+        "piwik/referrer-spam-blacklist": "~1.0",
+        "tecnick.com/tcpdf": "~6.0"
     },
     "require-dev": {
         "aws/aws-sdk-php": "2.7.1",

diff --git a/composer.lock b/composer.lock
diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php
@@ -19,8 +19,6 @@
  * @see libs/tcpdf
  */
 require_once PIWIK_INCLUDE_PATH . '/plugins/ScheduledReports/config/tcpdf_config.php';
-require_once PIWIK_INCLUDE_PATH . '/libs/tcpdf/config/lang/eng.php';
-require_once PIWIK_INCLUDE_PATH . '/core/TCPDF.php';
 
 /**
  *
@@ -93,6 +91,11 @@ public function __construct()
     public function setLocale($locale)
     {
         switch ($locale) {
+            case 'bn':
+            case 'hi':
+                $reportFont = 'freesans';
+                break;
+
             case 'zh-tw':
                 $reportFont = 'msungstdlight';
                 break;
@@ -110,9 +113,17 @@ public function setLocale($locale)
                 break;
 
             case 'ar':
-                $reportFont = 'almohanad';
+                $reportFont = 'aealarabiya';
+                break;
+
+            case 'am':
+            case 'ta':
+            case 'th':
+                $reportFont = 'freeserif';
                 break;
 
+            case 'te':
+                // not working with bundled fonts
             case 'en':
             default:
                 $reportFont = ReportRenderer::DEFAULT_REPORT_FONT_FAMILY;

diff --git a/core/TCPDF.php b/core/TCPDF.php
@@ -11,11 +11,6 @@
 
 use Exception;
 
-/**
- * @see libs/tcpdf/tcpdf.php
- */
-require_once PIWIK_INCLUDE_PATH . '/libs/tcpdf/tcpdf.php';
-
 /**
  * TCPDF class wrapper.
  *

diff --git a/libs/tcpdf/2dbarcodes.php b/libs/tcpdf/2dbarcodes.php