';
- echo '
['.get_class($this).']
';
+ echo '
['.static::class.']
';
echo $this->getExtendedMessage();
$this->displayFileDebug($this->getFile(), $this->getLine());
@@ -162,7 +162,7 @@ protected function hideCriticalArgs(array $trace)
$hiddenArgs[] = $args[$argIndex];
}
}
- } catch (ReflectionException $e) {
+ } catch (ReflectionException) {
//In worst case scenario there are some critical args we could't detect so we return an empty array
}
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index cf34180bac..ec9c95fa7c 100644
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -307,12 +307,12 @@ public function renderCategoryTree($root = null,
protected function l($string, $class = 'AdminTab', $addslashes = false, $htmlentities = true)
{
// if the class is extended by a module, use modules/[module_name]/xx.php lang file
- $current_class = get_class($this);
+ $current_class = static::class;
if (Module::getModuleNameFromClass($current_class)) {
return Translate::getModuleTranslation(Module::$classInModule[$current_class], $string, $current_class);
}
- return Translate::getAdminTranslation($string, get_class($this), $addslashes, $htmlentities);
+ return Translate::getAdminTranslation($string, static::class, $addslashes, $htmlentities);
}
/**
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index 5e0a4e76fa..6b3b1144d9 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -473,7 +473,7 @@ public function displayDetailsLink($token, $id, $name = null)
$tpl->assign(array(
'id' => $id,
'href' => $this->currentIndex.'&'.$this->identifier.'='.$id.'&details'.$this->table.'&token='.($token != null ? $token : $this->token),
- 'controller' => str_replace('Controller', '', get_class($this->context->controller)),
+ 'controller' => str_replace('Controller', '', $this->context->controller::class),
'token' => $token != null ? $token : $this->token,
'action' => self::$cache_lang['Details'],
'params' => $ajax_params,
diff --git a/classes/helper/HelperOptions.php b/classes/helper/HelperOptions.php
index d1e846e6bb..c05349b48c 100644
--- a/classes/helper/HelperOptions.php
+++ b/classes/helper/HelperOptions.php
@@ -160,7 +160,7 @@ public function generateOptions($option_list)
}
// Fill values for all languages for all lang fields
- if (substr($field['type'], -4) == 'Lang') {
+ if (str_ends_with($field['type'], 'Lang')) {
$field['value'] = array();
$field['languages'] = array();
foreach ($languages as $language) {
diff --git a/classes/module/Module.php b/classes/module/Module.php
index 6b08a164ec..c79e44b642 100644
--- a/classes/module/Module.php
+++ b/classes/module/Module.php
@@ -1116,10 +1116,10 @@ public static function getModuleNameFromClass($current_class)
$reflection_class = new ReflectionClass($current_class);
$file_path = realpath($reflection_class->getFileName());
$realpath_module_dir = realpath(_PS_MODULE_DIR_);
- if (substr(realpath($file_path), 0, strlen($realpath_module_dir)) == $realpath_module_dir) {
+ if (str_starts_with(realpath($file_path), $realpath_module_dir)) {
// For controllers in module/controllers path
- if (basename(dirname(dirname($file_path))) == 'controllers') {
- self::$classInModule[$current_class] = basename(dirname(dirname(dirname($file_path))));
+ if (basename(dirname($file_path, 2)) == 'controllers') {
+ self::$classInModule[$current_class] = basename(dirname($file_path, 3));
} else {
// For old AdminTab controllers
self::$classInModule[$current_class] = substr(dirname($file_path), strlen($realpath_module_dir) + 1);
@@ -1426,11 +1426,11 @@ public static function getModulesOnDisk($use_config = false, $logged_on_addons =
$file_path = _PS_MODULE_DIR_.$module.'/'.$module.'.php';
$file = trim(file_get_contents(_PS_MODULE_DIR_.$module.'/'.$module.'.php'));
- if (substr($file, 0, 5) == '') {
+ if (str_ends_with($file, '?>')) {
$file = substr($file, 0, -2);
}
@@ -1869,7 +1869,7 @@ final public static function isModuleTrusted($module_name, $check_api = true)
if ($trusted_modules_list_content === null) {
$trusted_modules_list_content = Tools::file_get_contents(_PS_ROOT_DIR_.self::CACHE_FILE_TRUSTED_MODULES_LIST);
- if (strpos($trusted_modules_list_content, $context->theme->name) === false) {
+ if (!str_contains($trusted_modules_list_content, $context->theme->name)) {
self::generateTrustedXml();
}
}
@@ -1888,7 +1888,7 @@ final public static function isModuleTrusted($module_name, $check_api = true)
// If the module is trusted, which includes both partner modules and modules bought on Addons
- if (stripos($trusted_modules_list_content, $module_name) !== false) {
+ if (stripos($trusted_modules_list_content, (string) $module_name) !== false) {
// If the module is not a partner, then return 1 (which means the module is "trusted")
if (stripos($modules_list_content, '
') == false) {
return 1;
@@ -1898,7 +1898,7 @@ final public static function isModuleTrusted($module_name, $check_api = true)
}
// The module seems to be trusted, but it does not seem to be dedicated to this country
return 2;
- } elseif (stripos($untrusted_modules_list_content, $module_name) !== false) {
+ } elseif (stripos($untrusted_modules_list_content, (string) $module_name) !== false) {
// If the module is already in the untrusted list, then return 0 (untrusted)
return 0;
} else {
@@ -2024,7 +2024,7 @@ final public static function checkModuleFromAddonsApi($module_name)
// 'module_key' => $obj->module_key,
);
$xml = Tools::addonsRequest('check_module', $params);
- return (bool)(strpos($xml, 'success') !== false);
+ return (bool)(str_contains($xml, 'success'));
}
}
@@ -2977,7 +2977,7 @@ public function addOverride($classInfo)
// require module controller file
require_once _PS_ROOT_DIR_.'/'.$parentClassFilePath;
if ($classInfo['controller_type'] == 'admin') {
- $overrideClassName = $classname.((strpos($classname, 'Controller') === false) ? 'Controller' : '').'Override';
+ $overrideClassName = $classname.((!str_contains($classname, 'Controller')) ? 'Controller' : '').'Override';
} else {
$overrideClassName = Tools::ucfirst($classInfo['module']).Tools::ucfirst($classInfo['class']).'ModuleFrontControllerOverride';
}
@@ -3178,7 +3178,7 @@ public function removeOverride($classInfo)
require_once _PS_ROOT_DIR_.'/'.$parentClassFilePath;
if ($classInfo['controller_type'] == 'admin') {
- $overrideClassName = $classname.((strpos($classname, 'Controller') === false) ? 'Controller' : '').'Override';
+ $overrideClassName = $classname.((!str_contains($classname, 'Controller')) ? 'Controller' : '').'Override';
} else {
$overrideClassName = Tools::ucfirst($classInfo['module']).Tools::ucfirst($classInfo['class']).'ModuleFrontControllerOverride';
}
diff --git a/classes/order/Order.php b/classes/order/Order.php
index e5d501141e..9a7a316987 100644
--- a/classes/order/Order.php
+++ b/classes/order/Order.php
@@ -1362,7 +1362,7 @@ public function setInvoice($use_existing_payment = false)
Order::setInvoiceDetails($order_invoice);
if (Configuration::get('PS_INVOICE')) {
- $this->setLastInvoiceNumber($order_invoice->id, $this->id_shop);
+ static::setLastInvoiceNumber($order_invoice->id, $this->id_shop);
}
// Update order_carrier
@@ -1422,8 +1422,8 @@ public function setInvoice($use_existing_payment = false)
if (Configuration::get('PS_INVOICE')) {
$this->invoice_number = $this->getInvoiceNumber($order_invoice->id);
$invoice_number = Hook::exec('actionSetInvoice', array(
- get_class($this) => $this,
- get_class($order_invoice) => $order_invoice,
+ static::class => $this,
+ $order_invoice::class => $order_invoice,
'use_existing_payment' => (bool)$use_existing_payment
));
@@ -2411,10 +2411,7 @@ public function getIdOrderCarrier()
public static function sortDocuments($a, $b)
{
- if ($a->date_add == $b->date_add) {
- return 0;
- }
- return ($a->date_add < $b->date_add) ? -1 : 1;
+ return $a->date_add <=> $b->date_add;
}
public function getWsShippingNumber()
diff --git a/classes/order/OrderInvoice.php b/classes/order/OrderInvoice.php
index 9d097b5d4f..1bb32d9d7b 100644
--- a/classes/order/OrderInvoice.php
+++ b/classes/order/OrderInvoice.php
@@ -1174,7 +1174,7 @@ public function getOrderPaymentDetail()
public function getInvoiceNumberFormatted($id_lang, $id_shop = null)
{
$invoice_formatted_number = Hook::exec('actionInvoiceNumberFormatted', array(
- get_class($this) => $this,
+ static::class => $this,
'id_lang' => (int)$id_lang,
'id_shop' => (int)$id_shop,
'number' => (int)$this->number
diff --git a/classes/pdf/HTMLTemplate.php b/classes/pdf/HTMLTemplate.php
index a0a7bdb304..736686f053 100644
--- a/classes/pdf/HTMLTemplate.php
+++ b/classes/pdf/HTMLTemplate.php
@@ -155,7 +155,7 @@ public function assignCommonHeaderData()
*/
public function assignHookData($object)
{
- $template = ucfirst(str_replace('HTMLTemplate', '', get_class($this)));
+ $template = ucfirst(str_replace('HTMLTemplate', '', static::class));
$hook_name = 'displayPDF'.$template;
$this->smarty->assign(array(
diff --git a/classes/pdf/PDFGenerator.php b/classes/pdf/PDFGenerator.php
index 4cd27a6bb0..6df29783ad 100644
--- a/classes/pdf/PDFGenerator.php
+++ b/classes/pdf/PDFGenerator.php
@@ -236,7 +236,7 @@ protected function getRandomSeed($seed = '')
}
$seed .= uniqid('', true);
- $seed .= rand();
+ $seed .= random_int(0, mt_getrandmax());
$seed .= __FILE__;
$seed .= $this->bufferlen;
@@ -259,7 +259,7 @@ protected function getRandomSeed($seed = '')
$seed .= $_SERVER['HTTP_ACCEPT_CHARSET'];
}
- $seed .= rand();
+ $seed .= random_int(0, mt_getrandmax());
$seed .= uniqid('', true);
$seed .= microtime();
diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 1e2880583f..653a2cc422 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -414,7 +414,7 @@ public static function initialize()
$url .= $default_shop->getBaseURI().'index.php?'.http_build_query($params);
} else {
// Catch url with subdomain "www"
- if (strpos($url, 'www.') === 0 && 'www.'.$_SERVER['HTTP_HOST'] === $url || $_SERVER['HTTP_HOST'] === 'www.'.$url) {
+ if (str_starts_with($url, 'www.') && 'www.'.$_SERVER['HTTP_HOST'] === $url || $_SERVER['HTTP_HOST'] === 'www.'.$url) {
$url .= $_SERVER['REQUEST_URI'];
} else {
$url .= $default_shop->getBaseURI();
@@ -1008,7 +1008,7 @@ public static function addSqlRestriction($share = false, $alias = null)
public static function addSqlAssociation($table, $alias, $inner_join = true, $on = null, $force_not_default = false)
{
$table_alias = $table.'_shop';
- if (strpos($table, '.') !== false) {
+ if (str_contains($table, '.')) {
list($table_alias, $table) = explode('.', $table);
}
diff --git a/classes/stock/SupplyOrderDetail.php b/classes/stock/SupplyOrderDetail.php
index 299aeaadf9..4729cc1e83 100644
--- a/classes/stock/SupplyOrderDetail.php
+++ b/classes/stock/SupplyOrderDetail.php
@@ -271,17 +271,17 @@ public function validateController($htmlentities = true)
/* required fields */
$fields_required = $this->fieldsRequired;
- if (isset(self::$fieldsRequiredDatabase[get_class($this)])) {
+ if (isset(self::$fieldsRequiredDatabase[static::class])) {
$fields_required = array_merge(
$this->fieldsRequired,
- self::$fieldsRequiredDatabase[get_class($this)]
+ self::$fieldsRequiredDatabase[static::class]
);
}
foreach ($fields_required as $field) {
if (($value = $this->{$field}) == false && (string)$value != '0') {
if (!$this->id || $field != 'passwd') {
- $errors[] = '
'.SupplyOrderDetail::displayFieldName($field, get_class($this), $htmlentities)
+ $errors[] = ''.SupplyOrderDetail::displayFieldName($field, static::class, $htmlentities)
.' '.Tools::displayError('is required.');
}
}
@@ -292,7 +292,7 @@ public function validateController($htmlentities = true)
if ($value = $this->{$field} && Tools::strlen($value) > $max_length) {
$errors[] = sprintf(
Tools::displayError('%1$s is too long. Maximum length: %2$d'),
- SupplyOrderDetail::displayFieldName($field, get_class($this), $htmlentities),
+ SupplyOrderDetail::displayFieldName($field, static::class, $htmlentities),
$max_length
);
}
@@ -302,7 +302,7 @@ public function validateController($htmlentities = true)
foreach ($this->fieldsValidate as $field => $function) {
if ($value = $this->{$field}) {
if (!Validate::$function($value) && (!empty($value) || in_array($field, $this->fieldsRequired))) {
- $errors[] = ''.SupplyOrderDetail::displayFieldName($field, get_class($this), $htmlentities).' '.Tools::displayError('is invalid.');
+ $errors[] = ''.SupplyOrderDetail::displayFieldName($field, static::class, $htmlentities).' '.Tools::displayError('is invalid.');
} elseif ($field == 'passwd') {
if ($value = Tools::getValue($field)) {
$this->{$field} = Tools::encrypt($value);
@@ -314,15 +314,15 @@ public function validateController($htmlentities = true)
}
if ($this->quantity_expected <= 0) {
- $errors[] = ''.SupplyOrderDetail::displayFieldName('quantity_expected', get_class($this)).' '.Tools::displayError('is invalid.');
+ $errors[] = ''.SupplyOrderDetail::displayFieldName('quantity_expected', static::class).' '.Tools::displayError('is invalid.');
}
if ($this->tax_rate < 0 || $this->tax_rate > 100) {
- $errors[] = ''.SupplyOrderDetail::displayFieldName('tax_rate', get_class($this)).' '.Tools::displayError('is invalid.');
+ $errors[] = ''.SupplyOrderDetail::displayFieldName('tax_rate', static::class).' '.Tools::displayError('is invalid.');
}
if ($this->discount_rate < 0 || $this->discount_rate > 100) {
- $errors[] = ''.SupplyOrderDetail::displayFieldName('discount_rate', get_class($this)).' '.Tools::displayError('is invalid.');
+ $errors[] = ''.SupplyOrderDetail::displayFieldName('discount_rate', static::class).' '.Tools::displayError('is invalid.');
}
return $errors;
diff --git a/classes/tree/Tree.php b/classes/tree/Tree.php
index fd51343dad..87eb0f97d4 100644
--- a/classes/tree/Tree.php
+++ b/classes/tree/Tree.php
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-class TreeCore
+class TreeCore implements \Stringable
{
const DEFAULT_TEMPLATE_DIRECTORY = 'helpers/tree';
const DEFAULT_TEMPLATE = 'tree.tpl';
@@ -62,9 +62,9 @@ public function __construct($id, $data = null)
}
}
- public function __toString()
+ public function __toString(): string
{
- return $this->render();
+ return (string) $this->render();
}
public function setActions($value)
@@ -281,7 +281,7 @@ public function getTemplateDirectory()
public function getTemplateFile($template)
{
- if (preg_match_all('/[^Admin].*(?=Controller)/', get_class($this->getContext()->controller), $matches) !== false) {
+ if (preg_match_all('/[^Admin].*(?=Controller)/', $this->getContext()->controller::class, $matches) !== false) {
$controller_name = strtolower(Tools::toUnderscoreCase($matches[0][0]));
}
diff --git a/classes/tree/TreeToolbar.php b/classes/tree/TreeToolbar.php
index 904be15901..433187cbe6 100644
--- a/classes/tree/TreeToolbar.php
+++ b/classes/tree/TreeToolbar.php
@@ -35,9 +35,9 @@ class TreeToolbarCore implements ITreeToolbarCore
private $_template;
private $_template_directory;
- public function __toString()
+ public function __toString(): string
{
- return $this->render();
+ return (string) $this->render();
}
public function setActions($actions)
@@ -123,7 +123,7 @@ public function getTemplateDirectory()
public function getTemplateFile($template)
{
- if (preg_match_all('/((?:^|[A-Z])[a-z]+)/', get_class($this->getContext()->controller), $matches) !== false) {
+ if (preg_match_all('/((?:^|[A-Z])[a-z]+)/', $this->getContext()->controller::class, $matches) !== false) {
$controllerName = strtolower($matches[0][1]);
}
diff --git a/classes/tree/TreeToolbarButton.php b/classes/tree/TreeToolbarButton.php
index 097600ab49..770752f7b9 100644
--- a/classes/tree/TreeToolbarButton.php
+++ b/classes/tree/TreeToolbarButton.php
@@ -24,7 +24,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
-abstract class TreeToolbarButtonCore
+abstract class TreeToolbarButtonCore implements \Stringable
{
const DEFAULT_TEMPLATE_DIRECTORY = 'helpers/tree';
@@ -45,9 +45,9 @@ public function __construct($label, $id = null, $name = null, $class = null)
$this->setClass($class);
}
- public function __toString()
+ public function __toString(): string
{
- return $this->render();
+ return (string) $this->render();
}
public function setAttribute($name, $value)
@@ -167,7 +167,7 @@ public function getTemplateDirectory()
public function getTemplateFile($template)
{
- if (preg_match_all('/((?:^|[A-Z])[a-z]+)/', get_class($this->getContext()->controller), $matches) !== false) {
+ if (preg_match_all('/((?:^|[A-Z])[a-z]+)/', $this->getContext()->controller::class, $matches) !== false) {
$controllerName = strtolower($matches[0][1]);
}
diff --git a/classes/webservice/WebserviceOutputBuilder.php b/classes/webservice/WebserviceOutputBuilder.php
index 12b29b698f..8205955bea 100644
--- a/classes/webservice/WebserviceOutputBuilder.php
+++ b/classes/webservice/WebserviceOutputBuilder.php
@@ -360,7 +360,7 @@ public function getContent($objects, $schema_to_display = null, $fields_to_displ
$type_of_view = self::VIEW_DETAILS;
}
- $class = get_class($objects['empty']);
+ $class = $objects['empty']::class;
if (!isset(WebserviceOutputBuilder::$_cache_ws_parameters[$class])) {
WebserviceOutputBuilder::$_cache_ws_parameters[$class] = $objects['empty']->getWebserviceParameters();
}
@@ -411,7 +411,7 @@ public function getContent($objects, $schema_to_display = null, $fields_to_displ
*/
public function renderEntityMinimum($object, $depth)
{
- $class = get_class($object);
+ $class = $object::class;
if (!isset(WebserviceOutputBuilder::$_cache_ws_parameters[$class])) {
WebserviceOutputBuilder::$_cache_ws_parameters[$class] = $object->getWebserviceParameters();
}
@@ -455,7 +455,7 @@ public function renderEntity($object, $depth)
{
$output = '';
- $class = get_class($object);
+ $class = $object::class;
if (!isset(WebserviceOutputBuilder::$_cache_ws_parameters[$class])) {
WebserviceOutputBuilder::$_cache_ws_parameters[$class] = $object->getWebserviceParameters();
}
@@ -551,7 +551,7 @@ protected function renderField($object, $ws_params, $field_name, $field, $depth)
$field = $this->overrideSpecificField($ws_params['objectsNodeName'], $field_name, $field, $object, $ws_params);
// don't display informations for a not existant id
- if (substr($field['sqlId'], 0, 3) == 'id_' && !$field['value']) {
+ if (str_starts_with($field['sqlId'], 'id_') && !$field['value']) {
if ($field['value'] === null) {
$field['value'] = '';
}
diff --git a/classes/webservice/WebserviceRequest.php b/classes/webservice/WebserviceRequest.php
index ff62a66e53..08d1ad7b36 100644
--- a/classes/webservice/WebserviceRequest.php
+++ b/classes/webservice/WebserviceRequest.php
@@ -242,7 +242,7 @@ protected function getOutputObject($type)
$this->outputFormat = $type;
switch ($type) {
case 'JSON' :
- require_once dirname(__FILE__).'/WebserviceOutputJSON.php';
+ require_once __DIR__.'/WebserviceOutputJSON.php';
$obj_render = new WebserviceOutputJSON();
break;
case 'XML' :
@@ -942,14 +942,14 @@ protected function parseDisplayFields($str)
}
$fields = array();
foreach ($part as $str) {
- $field_name = trim(substr($str, 0, (strpos($str, '[') === false ? strlen($str) : strpos($str, '['))));
+ $field_name = trim(substr($str, 0, (!str_contains($str, '[') ? strlen($str) : strpos($str, '['))));
if (!isset($fields[$field_name])) {
$fields[$field_name] = null;
}
- if (strpos($str, '[') !== false) {
+ if (str_contains($str, '[')) {
$sub_fields = substr($str, strpos($str, '[') + 1, strlen($str) - strpos($str, '[') - 2);
$tmp_array = array();
- if (strpos($sub_fields, ',') !== false) {
+ if (str_contains($sub_fields, ',')) {
$tmp_array = explode(',', $sub_fields);
} else {
$tmp_array = array($sub_fields);
@@ -1614,18 +1614,18 @@ public function filterLanguage()
$arr_languages[] = (int)$this->urlFragments['language'];
}
// if a range or a list is asked
- elseif (strpos($this->urlFragments['language'], '[') === 0
+ elseif (str_starts_with($this->urlFragments['language'], '[')
&& strpos($this->urlFragments['language'], ']') === $length_values - 1) {
- if (strpos($this->urlFragments['language'], '|') !== false
- xor strpos($this->urlFragments['language'], ',') !== false) {
+ if (str_contains($this->urlFragments['language'], '|')
+ xor str_contains($this->urlFragments['language'], ',')) {
$params_values = str_replace(array(']', '['), '', $this->urlFragments['language']);
// it's a list
- if (strpos($params_values, '|') !== false) {
+ if (str_contains($params_values, '|')) {
$list_enabled_lang = explode('|', $params_values);
$arr_languages = $list_enabled_lang;
}
// it's a range
- elseif (strpos($params_values, ',') !== false) {
+ elseif (str_contains($params_values, ',')) {
$range_enabled_lang = explode(',', $params_values);
if (count($range_enabled_lang) != 2) {
$this->setError(400, 'A range value for a language must contains only 2 values', 78);
@@ -1773,7 +1773,7 @@ public static function getallheaders()
$headers = array_merge($_ENV, $_SERVER);
foreach ($headers as $key => $val) {
//we need this header
- if (strpos(strtolower($key), 'content-type') !== false) {
+ if (str_contains(strtolower($key), 'content-type')) {
continue;
}
if (strtoupper(substr($key, 0, 5)) != 'HTTP_') {
diff --git a/classes/webservice/WebserviceSpecificManagementBookings.php b/classes/webservice/WebserviceSpecificManagementBookings.php
index 19763851a0..1f8e1cc45b 100644
--- a/classes/webservice/WebserviceSpecificManagementBookings.php
+++ b/classes/webservice/WebserviceSpecificManagementBookings.php
@@ -296,7 +296,7 @@ public function getContent()
public function manage()
{
$this->context = Context::getContext();
- if (get_class($this->objOutput->getObjectRender()) == 'WebserviceOutputJSON') {
+ if ($this->objOutput->getObjectRender()::class == 'WebserviceOutputJSON') {
$this->outputType = 'json';
}
@@ -392,7 +392,7 @@ public function getRequestParams($head = false)
return;
}
} else if (simplexml_load_string($inputXML)) {
- if (isset($inputXML) && strncmp($inputXML, 'xml=', 4) == 0) {
+ if (isset($inputXML) && str_starts_with($inputXML, 'xml=')) {
$inputXML = Tools::substr($inputXML, 4);
}
} else {
@@ -585,7 +585,7 @@ public function formatServicesInRequestData($data)
$formattedServices = array();
foreach ($selectedServices as $service) {
- $key = isset($service['id_service']) ? $service['id_service'] : 'new_'.rand();
+ $key = isset($service['id_service']) ? $service['id_service'] : 'new_'.random_int(0, mt_getrandmax());
if (isset($service['id_service'])) {
$formattedServices[$key]['quantity'] = isset($service['quantity']) ? $service['quantity'] : 1;
$formattedServices[$key]['id_product'] = $service['id_service'];
@@ -3669,7 +3669,7 @@ private function validateBookingFilterValue($field, $raw)
private function validateBookingNumericFilter($field, $operator, $value)
{
- $values = strpos($value, '|') !== false ? explode('|', $value) : array($value);
+ $values = str_contains($value, '|') ? explode('|', $value) : array($value);
foreach ($values as $filterValue) {
if (!Validate::isUnsignedInt($filterValue)) {
$this->wsObject->setError(400, 'Invalid value for filter "'.$field.'".', 39);
@@ -4000,7 +4000,7 @@ public function getBookingsList()
->overrideContent($this->output);
- } catch (\Throwable $th) {
+ } catch (\Throwable) {
$this->wsObject->setError(400, 'Invalid request data provided.', 39);
}
}
diff --git a/classes/webservice/WebserviceSpecificManagementImages.php b/classes/webservice/WebserviceSpecificManagementImages.php
index 2a1cff79ca..ee187f65d1 100644
--- a/classes/webservice/WebserviceSpecificManagementImages.php
+++ b/classes/webservice/WebserviceSpecificManagementImages.php
@@ -1239,7 +1239,7 @@ protected function writePostedImageOnDisk($reception_path, $dest_width = null, $
@unlink(_PS_TMP_IMG_DIR_.$tmp_name);
$this->imgToDisplay = $reception_path;
} elseif ($this->imageType == 'customizations') {
- $filename = md5(uniqid(rand(), true));
+ $filename = md5(uniqid(random_int(0, mt_getrandmax()), true));
$this->imgToDisplay = _PS_UPLOAD_DIR_.$filename;
if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($file['tmp_name'], $tmp_name)) {
throw new WebserviceException('An error occurred during the image upload', array(76, 400));
diff --git a/composer.json b/composer.json
index db48f1054c..b868522506 100644
--- a/composer.json
+++ b/composer.json
@@ -32,7 +32,7 @@
"source": "https://github.com/Qloapps/QloApps"
},
"require": {
- "php": ">8.0 <8.5",
+ "php": ">=8.3 <8.6",
"ext-curl": "*",
"ext-dom": "*",
"ext-gd": "*",
diff --git a/controllers/admin/AdminAttributesGroupsController.php b/controllers/admin/AdminAttributesGroupsController.php
index 29f379e4e2..b4854db472 100644
--- a/controllers/admin/AdminAttributesGroupsController.php
+++ b/controllers/admin/AdminAttributesGroupsController.php
@@ -756,7 +756,7 @@ public function postProcess()
$_POST['position'] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
}
$_POST['id_parent'] = 0;
- $this->processSave($this->token);
+ $this->processSave();
}
if (Tools::getValue('id_attribute') && Tools::isSubmit('submitAddattribute') && Tools::getValue('color') && !Tools::getValue('filename')) {
diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php
index b72199d67d..bf24923583 100644
--- a/controllers/admin/AdminCartsController.php
+++ b/controllers/admin/AdminCartsController.php
@@ -544,7 +544,7 @@ public function ajaxProcessUpdateCustomizationFields()
if (!($tmp_name = tempnam(_PS_TMP_IMG_DIR_, 'PS')) || !move_uploaded_file($_FILES[$field_id]['tmp_name'], $tmp_name)) {
$errors[] = Tools::displayError('An error occurred during the image upload process.');
}
- $file_name = md5(uniqid(rand(), true));
+ $file_name = md5(uniqid(random_int(0, mt_getrandmax()), true));
if (!ImageManager::resize($tmp_name, _PS_UPLOAD_DIR_.$file_name)) {
continue;
} elseif (!ImageManager::resize($tmp_name, _PS_UPLOAD_DIR_.$file_name.'_small', (int)Configuration::get('PS_PRODUCT_PICTURE_WIDTH'), (int)Configuration::get('PS_PRODUCT_PICTURE_HEIGHT'))) {
diff --git a/controllers/admin/AdminCmsController.php b/controllers/admin/AdminCmsController.php
index 43bd164cdf..1c2678dbb4 100644
--- a/controllers/admin/AdminCmsController.php
+++ b/controllers/admin/AdminCmsController.php
@@ -416,7 +416,7 @@ public function getPreviewUrl(CMS $cms)
'id_employee' => (int)$this->context->employee->id
)
);
- $preview_url .= (strpos($preview_url, '?') === false ? '?' : '&').$params;
+ $preview_url .= (!str_contains($preview_url, '?') ? '?' : '&').$params;
}
return $preview_url;
diff --git a/controllers/admin/AdminCustomerThreadsController.php b/controllers/admin/AdminCustomerThreadsController.php
index 616b4154c7..ae50c1bc1b 100644
--- a/controllers/admin/AdminCustomerThreadsController.php
+++ b/controllers/admin/AdminCustomerThreadsController.php
@@ -1339,7 +1339,7 @@ public function syncImap()
$match_found = true;
}
- $new_ct = (Configuration::get('PS_SAV_IMAP_CREATE_THREADS') && !$match_found && (strpos($subject, '[no_sync]') == false));
+ $new_ct = (Configuration::get('PS_SAV_IMAP_CREATE_THREADS') && !$match_found && (!str_contains($subject, '[no_sync]')));
if ($match_found || $new_ct) {
if ($new_ct) {
@@ -1355,7 +1355,7 @@ public function syncImap()
}
foreach ($contacts as $contact) {
- if (strpos($overview->to, $contact['email']) !== false) {
+ if (str_contains($overview->to, $contact['email'])) {
$id_contact = $contact['id_contact'];
}
}
diff --git a/controllers/admin/AdminEmployeesController.php b/controllers/admin/AdminEmployeesController.php
index 39cba1f8b5..3cb7d894cf 100644
--- a/controllers/admin/AdminEmployeesController.php
+++ b/controllers/admin/AdminEmployeesController.php
@@ -128,7 +128,7 @@ public function __construct()
if (file_exists($path.$theme.DIRECTORY_SEPARATOR.'css'.DIRECTORY_SEPARATOR.'schemes'.$rtl)) {
foreach (scandir($path.$theme.DIRECTORY_SEPARATOR.'css'.DIRECTORY_SEPARATOR.'schemes'.$rtl) as $css) {
if ($css[0] != '.' && preg_match('/\.css$/', $css)) {
- $name = strpos($css, 'admin-theme-') !== false ? Tools::ucfirst(preg_replace('/^admin-theme-(.*)\.css$/', '$1', $css)) : $css;
+ $name = str_contains($css, 'admin-theme-') ? Tools::ucfirst(preg_replace('/^admin-theme-(.*)\.css$/', '$1', $css)) : $css;
$this->themes[] = array('id' => $theme.'|schemes'.$rtl.'/'.$css, 'name' => $name);
}
}
@@ -513,12 +513,12 @@ public function processSave()
// Unset set shops
foreach ($_POST as $postkey => $postvalue) {
- if (strstr($postkey, 'checkBoxShopAsso_'.$this->table) !== false) {
+ if (str_contains($postkey, 'checkBoxShopAsso_'.$this->table)) {
unset($_POST[$postkey]);
}
}
foreach ($_GET as $postkey => $postvalue) {
- if (strstr($postkey, 'checkBoxShopAsso_'.$this->table) !== false) {
+ if (str_contains($postkey, 'checkBoxShopAsso_'.$this->table)) {
unset($_GET[$postkey]);
}
}
diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index 6be582d490..d5a4ab3c91 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -448,7 +448,7 @@ public function renderForm()
case 'k': $bytes *= 1024;
}
- if (!isset($bytes) || $bytes == '') {
+ if (!isset($bytes) || $bytes == 0) {
$bytes = 20971520;
} // 20Mb
@@ -3257,10 +3257,7 @@ protected function getNbrColumn($handle, $glue)
protected static function usortFiles($a, $b)
{
- if ($a == $b) {
- return 0;
- }
- return ($b < $a) ? 1 : - 1;
+ return $a <=> $b;
}
protected function openCsvFile()
diff --git a/controllers/admin/AdminLoginController.php b/controllers/admin/AdminLoginController.php
index 6300da814e..f49794e1ad 100644
--- a/controllers/admin/AdminLoginController.php
+++ b/controllers/admin/AdminLoginController.php
@@ -101,7 +101,7 @@ public function initContent()
}
if (basename(_PS_ADMIN_DIR_) == 'admin' && file_exists(_PS_ADMIN_DIR_.'/../admin/')) {
- $rand = 'admin'.sprintf('%03d', rand(0, 999)).Tools::strtolower(Tools::passwdGen(6)).'/';
+ $rand = 'admin'.sprintf('%03d', random_int(0, 999)).Tools::strtolower(Tools::passwdGen(6)).'/';
if (@rename(_PS_ADMIN_DIR_.'/../admin/', _PS_ADMIN_DIR_.'/../'.$rand)) {
Tools::redirectAdmin('../'.$rand);
} else {
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 1ac3d18182..5485df0000 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -411,7 +411,7 @@ protected function extractArchive($file, $redirect = true)
$tmp_folder = _PS_MODULE_DIR_.md5(time());
$success = false;
- if (substr($file, -4) == '.zip') {
+ if (str_ends_with($file, '.zip')) {
if (Tools::ZipExtract($file, $tmp_folder)) {
$zip_folders = scandir($tmp_folder);
if (Tools::ZipExtract($file, _PS_MODULE_DIR_)) {
@@ -457,7 +457,7 @@ protected function extractArchive($file, $redirect = true)
protected function recursiveDeleteOnDisk($dir)
{
- if (strpos(realpath($dir), realpath(_PS_MODULE_DIR_)) === false) {
+ if (!str_contains(realpath($dir), realpath(_PS_MODULE_DIR_))) {
return;
}
if (is_dir($dir)) {
@@ -608,8 +608,8 @@ public function postProcessDownload($redirect = true)
}
} elseif (!isset($_FILES['file']['tmp_name']) || empty($_FILES['file']['tmp_name'])) {
$this->errors[] = $this->l('No file has been selected');
- } elseif (substr($_FILES['file']['name'], -4) != '.tar' && substr($_FILES['file']['name'], -4) != '.zip'
- && substr($_FILES['file']['name'], -4) != '.tgz' && substr($_FILES['file']['name'], -7) != '.tar.gz') {
+ } elseif (!str_ends_with($_FILES['file']['name'], '.tar') && !str_ends_with($_FILES['file']['name'], '.zip')
+ && !str_ends_with($_FILES['file']['name'], '.tgz') && !str_ends_with($_FILES['file']['name'], '.tar.gz')) {
$this->errors[] = Tools::displayError('Unknown archive type.');
} elseif (!move_uploaded_file($_FILES['file']['tmp_name'], _PS_MODULE_DIR_.$_FILES['file']['name'])) {
$this->errors[] = Tools::displayError('An error occurred while copying the archive to the module directory.');
@@ -931,7 +931,7 @@ public function postProcessCallback()
$echo = $module->{$method}();
// After a successful install of a single module that has a configuration method, to the configuration page
- if ($key == 'install' && $echo === true && strpos(Tools::getValue('install'), '|') === false && method_exists($module, 'getContent')) {
+ if ($key == 'install' && $echo === true && !str_contains(Tools::getValue('install'), '|') && method_exists($module, 'getContent')) {
Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&configure='.$module->name.'&conf=12');
}
}
@@ -1266,7 +1266,7 @@ public function isModuleFiltered($module)
// Filter on module name
$filter_name = Tools::getValue('filtername');
if (!empty($filter_name)) {
- if (stristr($module->name, $filter_name) === false && stristr($module->displayName, $filter_name) === false && stristr($module->description, $filter_name) === false) {
+ if (stristr($module->name, (string) $filter_name) === false && stristr($module->displayName, (string) $filter_name) === false && stristr($module->description, (string) $filter_name) === false) {
return true;
}
return false;
@@ -1322,7 +1322,7 @@ public function isModuleFiltered($module)
return true;
} elseif ($show_type_modules == 'otherModules' && (in_array($module->name, $this->list_partners_modules) || in_array($module->name, $this->list_natives_modules))) {
return true;
- } elseif (strpos($show_type_modules, 'authorModules[') !== false) {
+ } elseif (str_contains($show_type_modules, 'authorModules[')) {
// setting selected author in authors set
$author_selected = substr(str_replace(array('authorModules[', "\'"), array('', "'"), $show_type_modules), 0, -1);
$this->modules_authors[$author_selected] = 'selected';
diff --git a/controllers/admin/AdminNormalProductsController.php b/controllers/admin/AdminNormalProductsController.php
index 43838ccc89..0674488c9d 100644
--- a/controllers/admin/AdminNormalProductsController.php
+++ b/controllers/admin/AdminNormalProductsController.php
@@ -500,7 +500,7 @@ protected function _cleanMetaKeywords($keywords)
protected function copyFromPost(&$object, $table)
{
parent::copyFromPost($object, $table);
- if (get_class($object) != 'Product') {
+ if ($object::class != 'Product') {
return;
}
@@ -1309,7 +1309,7 @@ public function processProductCustomization()
{
if (Validate::isLoadedObject($product = new Product((int)Tools::getValue('id_product')))) {
foreach ($_POST as $field => $value) {
- if (strncmp($field, 'label_', 6) == 0 && !Validate::isLabel($value)) {
+ if (str_starts_with($field, 'label_') && !Validate::isLabel($value)) {
$this->errors[] = Tools::displayError('The label fields defined are invalid.');
}
}
@@ -2536,7 +2536,7 @@ public function initContent($token = null)
$this->fields_form = array();
// Check if Module
- if (substr($this->tab_display, 0, 6) == 'Module') {
+ if (str_starts_with($this->tab_display, 'Module')) {
$this->tab_display_module = strtolower(substr($this->tab_display, 6, Tools::strlen($this->tab_display) - 6));
$this->tab_display = 'Modules';
}
@@ -2970,7 +2970,7 @@ public function getPreviewUrl(Product $product)
if (!$product->active) {
$admin_dir = dirname($_SERVER['PHP_SELF']);
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
- $preview_url .= ((strpos($preview_url, '?') === false) ? '?' : '&').'adtoken='.$this->token.'&ad='.$admin_dir.'&id_employee='.(int)$this->context->employee->id;
+ $preview_url .= ((!str_contains($preview_url, '?')) ? '?' : '&').'adtoken='.$this->token.'&ad='.$admin_dir.'&id_employee='.(int)$this->context->employee->id;
}
return $preview_url;
diff --git a/controllers/admin/AdminPaymentController.php b/controllers/admin/AdminPaymentController.php
index 34fab2aabf..cc66457934 100644
--- a/controllers/admin/AdminPaymentController.php
+++ b/controllers/admin/AdminPaymentController.php
@@ -41,7 +41,7 @@ public function __construct()
foreach ($modules as $module) {
if ($module->tab == 'payments_gateways') {
if ($module->id) {
- if (!get_class($module) == 'SimpleXMLElement') {
+ if (!$module::class == 'SimpleXMLElement') {
$module->country = array();
}
$countries = DB::getInstance()->executeS('
@@ -53,7 +53,7 @@ public function __construct()
$module->country[] = $country['id_country'];
}
- if (!get_class($module) == 'SimpleXMLElement') {
+ if (!$module::class == 'SimpleXMLElement') {
$module->currency = array();
}
$currencies = DB::getInstance()->executeS('
@@ -65,7 +65,7 @@ public function __construct()
$module->currency[] = $currency['id_currency'];
}
- if (!get_class($module) == 'SimpleXMLElement') {
+ if (!$module::class == 'SimpleXMLElement') {
$module->group = array();
}
$groups = DB::getInstance()->executeS('
diff --git a/controllers/admin/AdminPerformanceController.php b/controllers/admin/AdminPerformanceController.php
index 8748ca7af9..4c96a1ffcb 100644
--- a/controllers/admin/AdminPerformanceController.php
+++ b/controllers/admin/AdminPerformanceController.php
@@ -645,7 +645,7 @@ public function postProcess()
}
if (!empty($this->action)) {
- Hook::exec('action'.get_class($this).ucfirst($this->action).'Before', array('controller' => $this));
+ Hook::exec('action'.static::class.ucfirst($this->action).'Before', array('controller' => $this));
}
if (Tools::isSubmit('submitAddServer')) {
if ($this->tabAccess['add'] === 1) {
@@ -914,7 +914,7 @@ public function postProcess()
}
if ($redirectAdmin && (!isset($this->errors) || !count($this->errors))) {
- Hook::exec('action'.get_class($this).ucfirst($this->action).'After', array('controller' => $this, 'return' => ''));
+ Hook::exec('action'.static::class.ucfirst($this->action).'After', array('controller' => $this, 'return' => ''));
Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
}
}
diff --git a/controllers/admin/AdminPreferencesController.php b/controllers/admin/AdminPreferencesController.php
index a97ec7b54c..6daff9dfb9 100644
--- a/controllers/admin/AdminPreferencesController.php
+++ b/controllers/admin/AdminPreferencesController.php
@@ -37,7 +37,7 @@ public function __construct()
$this->table = 'configuration';
// Prevent classes which extend AdminPreferences to load useless data
- if (get_class($this) == 'AdminPreferencesController') {
+ if (static::class == 'AdminPreferencesController') {
$round_mode = array(
array(
'value' => PS_ROUND_HALF_UP,
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 1664501e9b..352ffa43d6 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -589,7 +589,7 @@ public function processResetFilters($list_id = null)
protected function copyFromPost(&$object, $table)
{
parent::copyFromPost($object, $table);
- if (get_class($object) != 'Product') {
+ if ($object::class != 'Product') {
return;
}
@@ -2588,7 +2588,7 @@ public function initContent($token = null)
$this->fields_form = array();
// Check if Module
- if (substr($this->tab_display, 0, 6) == 'Module') {
+ if (str_starts_with($this->tab_display, 'Module')) {
$this->tab_display_module = strtolower(substr($this->tab_display, 6, Tools::strlen($this->tab_display) - 6));
$this->tab_display = 'Modules';
}
@@ -3098,7 +3098,7 @@ public function getPreviewUrl(Product $product)
if (!$product->active) {
$admin_dir = dirname($_SERVER['PHP_SELF']);
$admin_dir = substr($admin_dir, strrpos($admin_dir, '/') + 1);
- $preview_url .= ((strpos($preview_url, '?') === false) ? '?' : '&').'adtoken='.$this->token.'&ad='.$admin_dir.'&id_employee='.(int)$this->context->employee->id;
+ $preview_url .= ((!str_contains($preview_url, '?')) ? '?' : '&').'adtoken='.$this->token.'&ad='.$admin_dir.'&id_employee='.(int)$this->context->employee->id;
}
return $preview_url;
diff --git a/controllers/admin/AdminScenesController.php b/controllers/admin/AdminScenesController.php
index ccd3f27932..5979708b66 100644
--- a/controllers/admin/AdminScenesController.php
+++ b/controllers/admin/AdminScenesController.php
@@ -224,7 +224,7 @@ public function initFieldsForm()
$this->addJqueryPlugin('imgareaselect');
$this->addJs(_PS_JS_DIR_.'admin/scenes.js');
$image_to_map_desc .= 'rand().')
';
+ _THEME_SCENE_DIR_.$obj->id.'-scene_default.jpg?rand='.(int)random_int(0, mt_getrandmax()).'" />';
$image_to_map_desc .= '
@@ -245,7 +245,7 @@ public function initFieldsForm()
';
if ($obj->id && file_exists(_PS_SCENE_IMG_DIR_.'thumbs/'.$obj->id.'-m_scene_default.jpg')) {
- $image_to_map_desc .= '
rand().')
';
+ $image_to_map_desc .= '
random_int(0, mt_getrandmax()).')
';
}
$img_alt_desc = '';
diff --git a/controllers/admin/AdminSearchController.php b/controllers/admin/AdminSearchController.php
index ac47c445f4..483a552830 100644
--- a/controllers/admin/AdminSearchController.php
+++ b/controllers/admin/AdminSearchController.php
@@ -297,9 +297,9 @@ public function searchModule()
$this->_list['modules'] = array();
$all_modules = Module::getModulesOnDisk(true, true, Context::getContext()->employee->id);
foreach ($all_modules as $module) {
- if ((isset($module->name) && stripos($module->name, $this->query) !== false)
- || (isset($module->displayName) && stripos($module->displayName, $this->query) !== false)
- || (isset($module->description) && stripos($module->description, $this->query) !== false)
+ if ((isset($module->name) && stripos($module->name, (string) $this->query) !== false)
+ || (isset($module->displayName) && stripos($module->displayName, (string) $this->query) !== false)
+ || (isset($module->description) && stripos($module->description, (string) $this->query) !== false)
) {
$module->linkto = 'index.php?tab=AdminModules&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).'&token='.Tools::getAdminTokenLite('AdminModules');
$this->_list['modules'][] = $module;
@@ -361,7 +361,7 @@ public function searchFeatures()
$this->_list['features'] = array();
foreach ($_LANGADM as $key => $value) {
- if (stripos($value, $this->query) !== false) {
+ if (stripos($value, (string) $this->query) !== false) {
$value = stripslashes($value);
$key = strtolower(substr($key, 0, -32));
if (in_array($key, array('AdminTab', 'index'))) {
diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index c1a96de6d0..d74790888f 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -487,7 +487,7 @@ public function processUpdate()
{
$this->redirect_shop_url = false;
$current_url = parse_url($_SERVER['REQUEST_URI']);
- if (trim(dirname(dirname($current_url['path'])), '/') == trim($this->object->getBaseURI(), '/')) {
+ if (trim(dirname($current_url['path'], 2), '/') == trim($this->object->getBaseURI(), '/')) {
$this->redirect_shop_url = true;
}
diff --git a/controllers/admin/AdminTaxesController.php b/controllers/admin/AdminTaxesController.php
index ca2787e056..66c51e653a 100644
--- a/controllers/admin/AdminTaxesController.php
+++ b/controllers/admin/AdminTaxesController.php
@@ -145,7 +145,7 @@ public function displayDeleteLink($token, $id)
}
if (!array_key_exists('DeleteItem', self::$cache_lang)) {
- self::$cache_lang['DeleteItem'] = $this->l('Delete item #', __CLASS__, true, false);
+ self::$cache_lang['DeleteItem'] = $this->l('Delete item #', self::class, true, false);
}
if (TaxRule::isTaxInUse($id)) {
diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php
index 45ff88ae56..6243742da3 100644
--- a/controllers/admin/AdminThemesController.php
+++ b/controllers/admin/AdminThemesController.php
@@ -184,7 +184,7 @@ public function init()
'type' => 'file',
'name' => 'PS_FAVICON',
'tab' => 'icons',
- 'thumb' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_FAVICON').(Tools::getValue('conf') ? sprintf('?%04d', rand(0, 9999)) : ''))
+ 'thumb' => $this->context->link->getMediaLink(_PS_IMG_.Configuration::get('PS_FAVICON').(Tools::getValue('conf') ? sprintf('?%04d', random_int(0, 9999)) : ''))
),
'PS_STORES_ICON' => array(
'title' => $this->l('Map icon'),
@@ -1148,7 +1148,7 @@ public function processExportTheme()
}
foreach ($_POST as $key => $value) {
- if (strncmp($key, 'modulesToExport_module', strlen('modulesToExport_module')) == 0) {
+ if (str_starts_with($key, 'modulesToExport_module')) {
$this->to_export[] = $value;
}
}
@@ -1470,10 +1470,10 @@ private function recurseCopy($src, $dst)
mkdir($dst);
}
while (($file = readdir($dir)) !== false) {
- if (strncmp($file, '.', 1) != 0) {
+ if (!str_starts_with($file, '.')) {
if (is_dir($src.'/'.$file)) {
self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
- } elseif (is_readable($src.'/'.$file) && $file != 'Thumbs.db' && $file != '.DS_Store' && substr($file, -1) != '~') {
+ } elseif (is_readable($src.'/'.$file) && $file != 'Thumbs.db' && $file != '.DS_Store' && !str_ends_with($file, '~')) {
copy($src.'/'.$file, $dst.'/'.$file);
}
}
@@ -1532,7 +1532,7 @@ public function processImportTheme()
}
} elseif (Tools::getValue('theme_archive_server') != '') {
$filename = _PS_ALL_THEMES_DIR_.Tools::getValue('theme_archive_server');
- if (substr($filename, -4) != '.zip') {
+ if (!str_ends_with($filename, '.zip')) {
$this->errors[] = $this->l('Only zip files are allowed');
} elseif (!copy($filename, $sandbox.Theme::UPLOADED_THEME_DIR_NAME.'.zip')) {
$this->errors[] = $this->l('An error has occurred during the file copy.');
@@ -1831,7 +1831,7 @@ public function renderImportTheme()
$theme_archive_server[] = '-';
foreach ($files as $file) {
- if (is_file(_PS_ALL_THEMES_DIR_.$file) && substr(_PS_ALL_THEMES_DIR_.$file, -4) == '.zip') {
+ if (is_file(_PS_ALL_THEMES_DIR_.$file) && str_ends_with(_PS_ALL_THEMES_DIR_.$file, '.zip')) {
$theme_archive_server[] = array(
'id' => basename(_PS_ALL_THEMES_DIR_.$file),
'name' => basename(_PS_ALL_THEMES_DIR_.$file)
@@ -2538,7 +2538,7 @@ public function processThemeInstall()
$this->modules_errors = array();
foreach ($shops as $id_shop) {
foreach ($_POST as $key => $value) {
- if (strncmp($key, 'to_install', strlen('to_install')) == 0) {
+ if (str_starts_with($key, 'to_install')) {
$module = Module::getInstanceByName($value);
if ($module) {
$is_installed_success = true;
@@ -2559,7 +2559,7 @@ public function processThemeInstall()
unset($module_hook[$module->name]);
}
- } elseif (strncmp($key, 'to_enable', strlen('to_enable')) == 0) {
+ } elseif (str_starts_with($key, 'to_enable')) {
$module = Module::getInstanceByName($value);
if ($module) {
$is_installed_success = true;
@@ -2581,7 +2581,7 @@ public function processThemeInstall()
unset($module_hook[$module->name]);
}
- } elseif (strncmp($key, 'to_disable', strlen('to_disable')) == 0) {
+ } elseif (str_starts_with($key, 'to_disable')) {
$key_exploded = explode('_', $key);
$id_shop_module = (int)substr($key_exploded[2], 4);
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index e56831c505..6e62f8de95 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -1021,7 +1021,7 @@ protected function findAndWriteTranslationsIntoFile($file_name, $files, $theme_n
$content = file_get_contents($dir.$file);
// Get file type
- $type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php';
+ $type_file = str_ends_with($file, '.tpl') ? 'tpl' : 'php';
// Parse this content
$matches = Translate::userParseFile($content, $this->type_selected, $type_file, $module_name);
@@ -1121,12 +1121,12 @@ protected function findAndFillTranslations($files, $theme_name, $module_name, $d
$content = file_get_contents($file_path);
// Module files can now be ignored by adding this string in a file
- if (strpos($content, 'IGNORE_THIS_FILE_FOR_TRANSLATION') !== false) {
+ if (str_contains($content, 'IGNORE_THIS_FILE_FOR_TRANSLATION')) {
continue;
}
// Get file type
- $type_file = substr($file, -4) == '.tpl' ? 'tpl' : 'php';
+ $type_file = str_ends_with($file, '.tpl') ? 'tpl' : 'php';
// Parse this content
$matches = Translate::userParseFile($content, $this->type_selected, $type_file, $module_name);
@@ -1675,7 +1675,7 @@ public function fileExists()
$dir = $this->translations_informations[$this->type_selected]['dir'];
$file = $this->translations_informations[$this->type_selected]['file'];
- $$var = array();
+ ${$var} = array();
if (!Tools::file_exists_cache($dir)) {
if (!mkdir($dir, 0700)) {
throw new PrestaShopException('Directory '.$dir.' cannot be created.');
@@ -1690,7 +1690,7 @@ public function fileExists()
$this->displayWarning(Tools::displayError('This file must be writable:').' '.$dir.'/'.$file);
}
include($dir.DIRECTORY_SEPARATOR.$file);
- return $$var;
+ return ${$var};
}
public function displayToggleButton($closed = false)
@@ -1829,9 +1829,9 @@ public function initFormBack()
if (preg_match('/^(.*)\.php$/', $file) && Tools::file_exists_cache($file_path = $dir.$file) && !in_array($file, Translate::$ignore_folder)) {
$prefix_key = basename($file);
// -4 becomes -14 to remove the ending "Controller.php" from the filename
- if (strpos($file, 'Controller.php') !== false) {
+ if (str_contains($file, 'Controller.php')) {
$prefix_key = basename(substr($file, 0, -14));
- } elseif (strpos($file, 'Helper') !== false) {
+ } elseif (str_contains($file, 'Helper')) {
$prefix_key = 'Helper';
}
@@ -2649,7 +2649,7 @@ public function copyMailFilesForAllLanguages()
if (!in_array($file, Translate::$ignore_folder)) {
$files_to_copy_iso[] = array(
"from" => $dir.$file,
- "to" => str_replace((strpos($dir, _PS_CORE_DIR_) !== false) ? _PS_CORE_DIR_ : _PS_ROOT_DIR_, _PS_ROOT_DIR_.'/themes/'.$current_theme, $dir).$file
+ "to" => str_replace((str_contains($dir, _PS_CORE_DIR_)) ? _PS_CORE_DIR_ : _PS_ROOT_DIR_, _PS_ROOT_DIR_.'/themes/'.$current_theme, $dir).$file
);
}
}
@@ -3061,7 +3061,7 @@ protected function theme_exists($theme)
public static function getEmailHTML($email)
{
- if (defined('_PS_HOST_MODE_') && strpos($email, _PS_MAIL_DIR_) !== false) {
+ if (defined('_PS_HOST_MODE_') && str_contains($email, _PS_MAIL_DIR_)) {
$email_file = $email;
} elseif (__PS_BASE_URI__ != '/') {
$email_file = str_replace(__PS_BASE_URI__, '', _PS_ROOT_DIR_.'/').$email;
@@ -3072,7 +3072,7 @@ public static function getEmailHTML($email)
$sanitizedFilePath = realpath($email_file);
$permittedMailDir = realpath(_PS_MAIL_DIR_) . DIRECTORY_SEPARATOR;
- if ($sanitizedFilePath === false || $permittedMailDir === false || strpos($sanitizedFilePath, $permittedMailDir) !== 0) {
+ if ($sanitizedFilePath === false || $permittedMailDir === false || !str_starts_with($sanitizedFilePath, $permittedMailDir)) {
return false;
}
diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php
index 08f86468d3..dd33aabec0 100644
--- a/controllers/admin/AdminWebserviceController.php
+++ b/controllers/admin/AdminWebserviceController.php
@@ -275,7 +275,7 @@ protected function afterUpdate($object)
public function checkForWarning()
{
- if (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') === false) {
+ if (!str_contains($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
$this->warnings[] = $this->l('To avoid operating problems, please use an Apache server.');
if (function_exists('apache_get_modules')) {
$apache_modules = apache_get_modules();
diff --git a/controllers/front/AuthController.php b/controllers/front/AuthController.php
index 91b583007a..fc329625cb 100644
--- a/controllers/front/AuthController.php
+++ b/controllers/front/AuthController.php
@@ -113,7 +113,7 @@ public function initContent()
$key = Tools::safeOutput(Tools::getValue('key'));
if (!empty($key)) {
- $back .= (strpos($back, '?') !== false ? '&' : '?').'key='.$key;
+ $back .= (str_contains($back, '?') ? '&' : '?').'key='.$key;
}
// sanitize backurl for XSS protection
@@ -514,8 +514,8 @@ protected function processSubmitAccount()
$post_back = $_POST;
// Preparing addresses
foreach ($addresses_types as $addresses_type) {
- $$addresses_type = new Address();
- $$addresses_type->id_customer = 1;
+ ${$addresses_type} = new Address();
+ ${$addresses_type}->id_customer = 1;
if ($addresses_type == 'address_invoice') {
foreach ($_POST as $key => &$post) {
@@ -525,12 +525,12 @@ protected function processSubmitAccount()
}
}
- $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
+ $this->errors = array_unique(array_merge($this->errors, ${$addresses_type}->validateController()));
if ($addresses_type == 'address_invoice') {
$_POST = $post_back;
}
- if (!($country = new Country($$addresses_type->id_country)) || !Validate::isLoadedObject($country)) {
+ if (!($country = new Country(${$addresses_type}->id_country)) || !Validate::isLoadedObject($country)) {
$this->errors[] = Tools::displayError('Country cannot be loaded with address->id_country');
}
@@ -538,7 +538,7 @@ protected function processSubmitAccount()
$this->errors[] = Tools::displayError('This country is not active.');
}
- $postcode = $$addresses_type->postcode;
+ $postcode = ${$addresses_type}->postcode;
/* Check zip code format */
if ($country->zip_code_format && !$country->checkZipCode($postcode)) {
$this->errors[] = sprintf(Tools::displayError('The Zip/Postal code you\'ve entered is invalid. It must follow this format: %s'), str_replace('C', $country->iso_code, str_replace('N', '0', str_replace('L', 'A', $country->zip_code_format))));
@@ -550,21 +550,21 @@ protected function processSubmitAccount()
if ($country->need_identification_number) {
if (!Configuration::get('PS_REGISTRATION_PROCESS_TYPE')) {
- $$addresses_type->dni = null;
+ ${$addresses_type}->dni = null;
} elseif (!Tools::getValue('dni') || !Validate::isDniLite(Tools::getValue('dni'))) {
$this->errors[] = Tools::displayError('The identification number is incorrect or has already been used.');
}
} elseif (!$country->need_identification_number) {
- $$addresses_type->dni = null;
+ ${$addresses_type}->dni = null;
}
if (Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) {
- if (!($country = new Country($$addresses_type->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country)) {
+ if (!($country = new Country(${$addresses_type}->id_country, Configuration::get('PS_LANG_DEFAULT'))) || !Validate::isLoadedObject($country)) {
$this->errors[] = Tools::displayError('Country is invalid');
}
}
$contains_state = isset($country) && is_object($country) ? (int)$country->contains_states: 0;
- $id_state = isset($$addresses_type) && is_object($$addresses_type) ? (int)$$addresses_type->id_state: 0;
+ $id_state = isset(${$addresses_type}) && is_object(${$addresses_type}) ? (int)${$addresses_type}->id_state: 0;
if ((Tools::isSubmit('submitAccount') || Tools::isSubmit('submitGuestAccount')) && $contains_state && !$id_state) {
$this->errors[] = Tools::displayError('This country requires you to choose a State.');
}
@@ -613,7 +613,7 @@ protected function processSubmitAccount()
$_POST['phone'] = $phoneAddress;
foreach ($addresses_types as $addresses_type) {
- $$addresses_type->id_customer = (int)$customer->id;
+ ${$addresses_type}->id_customer = (int)$customer->id;
if ($addresses_type == 'address_invoice') {
foreach ($_POST as $key => &$post) {
if ($tmp = Tools::getValue($key.'_invoice')) {
@@ -622,11 +622,11 @@ protected function processSubmitAccount()
}
}
- $this->errors = array_unique(array_merge($this->errors, $$addresses_type->validateController()));
+ $this->errors = array_unique(array_merge($this->errors, ${$addresses_type}->validateController()));
if ($addresses_type == 'address_invoice') {
$_POST = $post_back;
}
- if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !$$addresses_type->save()) {
+ if (!count($this->errors) && (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') || $this->ajax || Tools::isSubmit('submitGuestAccount')) && !${$addresses_type}->save()) {
$this->errors[] = Tools::displayError('An error occurred while creating your address.');
}
}
diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index ef4f509f75..226ccf52b8 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -1330,7 +1330,7 @@ protected function pictureUpload()
$indexes = array_flip($authorized_file_fields);
foreach ($_FILES as $field_name => $file) {
if (in_array($field_name, $authorized_file_fields) && isset($file['tmp_name']) && !empty($file['tmp_name'])) {
- $file_name = md5(uniqid(rand(), true));
+ $file_name = md5(uniqid(random_int(0, mt_getrandmax()), true));
if ($error = ImageManager::validateUpload($file, (int)Configuration::get('PS_PRODUCT_PICTURE_MAX_SIZE'))) {
$this->errors[] = $error;
}
@@ -1390,7 +1390,7 @@ protected function formTargetFormat()
{
$customization_form_target = Tools::safeOutput(urldecode($_SERVER['REQUEST_URI']));
foreach ($_GET as $field => $value) {
- if (strncmp($field, 'group_', 6) == 0) {
+ if (str_starts_with($field, 'group_')) {
$customization_form_target = preg_replace('/&group_([[:digit:]]+)=([[:digit:]]+)/', '', $customization_form_target);
}
}
diff --git a/controllers/front/SearchController.php b/controllers/front/SearchController.php
index ebe5d78a58..5340959c1e 100644
--- a/controllers/front/SearchController.php
+++ b/controllers/front/SearchController.php
@@ -99,7 +99,7 @@ public function initContent()
$search = Search::find($this->context->language->id, $query, $this->p, $this->n, $this->orderBy, $this->orderWay);
if (is_array($search['result'])) {
foreach ($search['result'] as &$product) {
- $product['link'] .= (strpos($product['link'], '?') === false ? '?' : '&').'search_query='.urlencode($query).'&results='.(int)$search['total'];
+ $product['link'] .= (!str_contains($product['link'], '?') ? '?' : '&').'search_query='.urlencode($query).'&results='.(int)$search['total'];
}
}
diff --git a/modules/blockcart/blockcart.php b/modules/blockcart/blockcart.php
index 71a0be7ca4..52ad113665 100644
--- a/modules/blockcart/blockcart.php
+++ b/modules/blockcart/blockcart.php
@@ -534,7 +534,7 @@ public function hookTop($params)
'warning_num' => $warning_num,
'module_dir' => _MODULE_DIR_,
'current_page' => $current_page,
- 'order_page' => (strpos($_SERVER['PHP_SELF'], 'order') !== false),
+ 'order_page' => (str_contains($_SERVER['PHP_SELF'], 'order')),
'blockcart_top' => (isset($params['blockcart_top']) && $params['blockcart_top']) ? true : false,
));
$res = $this->getContentVars($params);
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index f9a36d348d..d9a375bc87 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -70,7 +70,7 @@ public function install()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController') {
+ if ($this->context->controller::class == 'AdminDashboardController') {
if (method_exists($this->context->controller, 'addJquery')) {
$this->context->controller->addJquery();
}
@@ -113,21 +113,21 @@ public function hookDashboardData($params)
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
$days = (strtotime($params['date_to']) - strtotime($params['date_from'])) / 3600 / 24;
- $online_visitor = rand(10, 50);
- $visits = rand(200, 2000) * $days;
+ $online_visitor = random_int(10, 50);
+ $visits = random_int(200, 2000) * $days;
return array(
'data_value' => array(
- 'pending_orders' => round(rand(0, 5)),
- 'return_exchanges' => round(rand(0, 5)),
- 'abandoned_cart' => round(rand(5, 50)),
- 'products_out_of_stock' => round(rand(1, 10)),
- 'new_messages' => round(rand(1, 10) * $days),
- 'new_customers' => round(rand(1, 5) * $days),
+ 'pending_orders' => round(random_int(0, 5)),
+ 'return_exchanges' => round(random_int(0, 5)),
+ 'abandoned_cart' => round(random_int(5, 50)),
+ 'products_out_of_stock' => round(random_int(1, 10)),
+ 'new_messages' => round(random_int(1, 10) * $days),
+ 'new_customers' => round(random_int(1, 5) * $days),
'online_visitor' => round($online_visitor),
'active_shopping_cart' => round($online_visitor / 10),
- 'new_registrations' => round(rand(1, 5) * $days),
- 'total_suscribers' => round(rand(200, 2000)),
+ 'new_registrations' => round(random_int(1, 5) * $days),
+ 'total_suscribers' => round(random_int(200, 2000)),
'visits' => round($visits),
'unique_visitors' => round($visits * 0.6),
),
diff --git a/modules/dashavailability/dashavailability.php b/modules/dashavailability/dashavailability.php
index 66965f2339..dce60962fa 100644
--- a/modules/dashavailability/dashavailability.php
+++ b/modules/dashavailability/dashavailability.php
@@ -54,7 +54,7 @@ public function install()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController') {
+ if ($this->context->controller::class == 'AdminDashboardController') {
Media::addJsDef(array(
'avail_rooms_txt' => $this->l('Available Rooms'),
));
@@ -95,7 +95,7 @@ public function hookDashboardData($params)
$to = strtotime($dateFrom.'+'.$days.' days 23:59:59');
$data = array();
for ($date = $from; $date <= $to; $date = strtotime('+1 days', $date)) {
- $availability_data['values'][] = array($date, round(rand(0, 20)));
+ $availability_data['values'][] = array($date, round(random_int(0, 20)));
}
} else {
$availability_data = AdminStatsController::getAvailabilityLineChartData($days, $dateFrom, $params['id_hotel']);
diff --git a/modules/dashgoals/dashgoals.php b/modules/dashgoals/dashgoals.php
index 16bc46c17f..3dbe366046 100644
--- a/modules/dashgoals/dashgoals.php
+++ b/modules/dashgoals/dashgoals.php
@@ -123,7 +123,7 @@ public function uninstall()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController') {
+ if ($this->context->controller::class == 'AdminDashboardController') {
Media::addJsDef(array(
'goal_set_txt' => $this->l('Goal Set'),
'goal_diff_txt' => $this->l('Goal Difference'),
@@ -234,9 +234,9 @@ public function getChartData($year)
$from = strtotime(date('Y-01-01 00:00:00'));
$to = strtotime(date('Y-12-31 00:00:00'));
for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) {
- $visits[$date] = round(rand(2000, 5000));
- $orders[$date] = round(rand(40, 100));
- $sales[$date] = round(rand(3000, 9000), 2);
+ $visits[$date] = round(random_int(2000, 5000));
+ $orders[$date] = round(random_int(40, 100));
+ $sales[$date] = round(random_int(3000, 9000), 2);
}
// Now we can calculate the value for every months
diff --git a/modules/dashguestcycle/dashguestcycle.php b/modules/dashguestcycle/dashguestcycle.php
index 6aae1cb46a..8906d1960b 100644
--- a/modules/dashguestcycle/dashguestcycle.php
+++ b/modules/dashguestcycle/dashguestcycle.php
@@ -133,16 +133,16 @@ private function getKpiValues($idHotel)
$dateToday = date('Y-m-d');
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
- $totalArrivals = rand(100, 1000);
- $arrived = rand(0, $totalArrivals);
- $totalDepartures = rand(100, 1000);
- $departed = rand(0, $totalDepartures);
- $newBookings = rand(10, 500);
- $occupied = rand(10, 500);
- $newMessages = rand(0, 20);
- $cancelledBookings = rand(0, 20);
- $totalAdults = rand(100, 1000);
- $children = rand(0, $totalAdults);
+ $totalArrivals = random_int(100, 1000);
+ $arrived = random_int(0, $totalArrivals);
+ $totalDepartures = random_int(100, 1000);
+ $departed = random_int(0, $totalDepartures);
+ $newBookings = random_int(10, 500);
+ $occupied = random_int(10, 500);
+ $newMessages = random_int(0, 20);
+ $cancelledBookings = random_int(0, 20);
+ $totalAdults = random_int(100, 1000);
+ $children = random_int(0, $totalAdults);
} else {
$arrivalsData = AdminStatsController::getArrivalsByDate($dateToday, $idHotel);
$departuresData = AdminStatsController::getDeparturesByDate($dateToday, $idHotel);
diff --git a/modules/dashinsights/dashinsights.php b/modules/dashinsights/dashinsights.php
index 0b0676a5cf..bd18ce7ee2 100644
--- a/modules/dashinsights/dashinsights.php
+++ b/modules/dashinsights/dashinsights.php
@@ -171,7 +171,7 @@ public function getRoomNightsData($dateFrom, $dateTo, $idHotel)
);
foreach ($this->discreteDates as $discreteDate) {
- $allHotelSeriesInfo['data'][$discreteDate['timestamp_from']] = rand(1, 100);
+ $allHotelSeriesInfo['data'][$discreteDate['timestamp_from']] = random_int(1, 100);
}
$seriesWiseRoomNights[] = $allHotelSeriesInfo;
} else { // if one of the hotels is selected
@@ -182,7 +182,7 @@ public function getRoomNightsData($dateFrom, $dateTo, $idHotel)
$objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id);
$currentHotelRoomNightsData = array();
foreach ($this->discreteDates as $discreteDate) {
- $currentHotelRoomNightsData[$discreteDate['timestamp_from']] = rand(1, 100);
+ $currentHotelRoomNightsData[$discreteDate['timestamp_from']] = random_int(1, 100);
}
$currentHotelSeriesInfo = array(
@@ -193,7 +193,7 @@ public function getRoomNightsData($dateFrom, $dateTo, $idHotel)
// average series info
$averageRoomNightsData = array();
foreach ($this->discreteDates as $discreteDate) {
- $averageRoomNightsData[$discreteDate['timestamp_from']] = sprintf('%0.2f', rand(1, 10000) / 100);
+ $averageRoomNightsData[$discreteDate['timestamp_from']] = sprintf('%0.2f', random_int(1, 10000) / 100);
}
$averageSeriesInfo = array(
@@ -279,7 +279,7 @@ public function getDaysOfTheWeekData($dateFrom, $dateTo, $idHotel)
// 1 = SUN
for ($i = 1; $i <= 7; $i++) {
- $allHotelSeriesInfo['data'][$i] = round(rand(0, 100));
+ $allHotelSeriesInfo['data'][$i] = round(random_int(0, 100));
}
$seriesWiseDaysOfTheWeek[] = $allHotelSeriesInfo;
@@ -291,7 +291,7 @@ public function getDaysOfTheWeekData($dateFrom, $dateTo, $idHotel)
$objHotelBranchInformation = new HotelBranchInformation($idHotel, $this->context->language->id);
$currentHotelDaysOfTheWeekData = array();
for ($i = 1; $i <= 7; $i++) {
- $currentHotelDaysOfTheWeekData[$i] = round(rand(0, 100));
+ $currentHotelDaysOfTheWeekData[$i] = round(random_int(0, 100));
}
$currentHotelSeriesInfo = array(
@@ -302,7 +302,7 @@ public function getDaysOfTheWeekData($dateFrom, $dateTo, $idHotel)
// average series info
$averageDaysOfTheWeekData = array();
for ($i = 1; $i <= 7; $i++) {
- $averageDaysOfTheWeekData[$i] = sprintf('%0.2f', rand(1, 10000) / 100);
+ $averageDaysOfTheWeekData[$i] = sprintf('%0.2f', random_int(1, 10000) / 100);
}
$averageSeriesInfo = array(
@@ -416,13 +416,13 @@ public function getLengthOfStayData($dateFrom, $dateTo, $idHotel)
);
$roomsOccupied = array(
- 7 => rand(1, 100),
- 6 => rand(1, 100),
- 5 => rand(1, 100),
- 4 => rand(1, 100),
- 3 => rand(1, 100),
- 2 => rand(1, 100),
- 1 => rand(1, 100),
+ 7 => random_int(1, 100),
+ 6 => random_int(1, 100),
+ 5 => random_int(1, 100),
+ 4 => random_int(1, 100),
+ 3 => random_int(1, 100),
+ 2 => random_int(1, 100),
+ 1 => random_int(1, 100),
);
$totalOccupiedRooms = array_sum($roomsOccupied);
foreach ($roomsOccupied as $key => $value) {
@@ -434,13 +434,13 @@ public function getLengthOfStayData($dateFrom, $dateTo, $idHotel)
} else { // if one of the hotels is selected
// calculation for currently selected hotel
$roomsOccupied = array(
- 7 => rand(1, 100),
- 6 => rand(1, 100),
- 5 => rand(1, 100),
- 4 => rand(1, 100),
- 3 => rand(1, 100),
- 2 => rand(1, 100),
- 1 => rand(1, 100),
+ 7 => random_int(1, 100),
+ 6 => random_int(1, 100),
+ 5 => random_int(1, 100),
+ 4 => random_int(1, 100),
+ 3 => random_int(1, 100),
+ 2 => random_int(1, 100),
+ 1 => random_int(1, 100),
);
$totalOccupiedRooms = array_sum($roomsOccupied);
@@ -458,13 +458,13 @@ public function getLengthOfStayData($dateFrom, $dateTo, $idHotel)
// calculation for other hotels average series info
$roomsOccupied = array(
- 7 => rand(1, 100),
- 6 => rand(1, 100),
- 5 => rand(1, 100),
- 4 => rand(1, 100),
- 3 => rand(1, 100),
- 2 => rand(1, 100),
- 1 => rand(1, 100),
+ 7 => random_int(1, 100),
+ 6 => random_int(1, 100),
+ 5 => random_int(1, 100),
+ 4 => random_int(1, 100),
+ 3 => random_int(1, 100),
+ 2 => random_int(1, 100),
+ 1 => random_int(1, 100),
);
$totalOccupiedRooms = array_sum($roomsOccupied);
diff --git a/modules/dashoccupancy/dashoccupancy.php b/modules/dashoccupancy/dashoccupancy.php
index b6e667ca20..62b537ef6e 100644
--- a/modules/dashoccupancy/dashoccupancy.php
+++ b/modules/dashoccupancy/dashoccupancy.php
@@ -54,7 +54,7 @@ public function install()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController') {
+ if ($this->context->controller::class == 'AdminDashboardController') {
$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
$this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
}
@@ -69,11 +69,11 @@ public function hookDashboardData($params)
{
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
$occupancyData = array();
- $occupancyData['count_total'] = sprintf('%02d', rand(0, 1000));
+ $occupancyData['count_total'] = sprintf('%02d', random_int(0, 1000));
$tmp = $occupancyData['count_total'];
- $occupancyData['count_occupied'] = sprintf('%02d', round(rand(0, $occupancyData['count_total'])));
+ $occupancyData['count_occupied'] = sprintf('%02d', round(random_int(0, $occupancyData['count_total'])));
$tmp = $tmp - $occupancyData['count_occupied'];
- $occupancyData['count_available'] = sprintf('%02d', round(rand(0, $tmp)));
+ $occupancyData['count_available'] = sprintf('%02d', round(random_int(0, $tmp)));
$tmp = $tmp - $occupancyData['count_available'];
$occupancyData['count_unavailable'] = sprintf('%02d', $tmp);
} else {
diff --git a/modules/dashperformance/dashperformance.php b/modules/dashperformance/dashperformance.php
index f01f6c277a..30252330de 100644
--- a/modules/dashperformance/dashperformance.php
+++ b/modules/dashperformance/dashperformance.php
@@ -54,7 +54,7 @@ public function install()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController') {
+ if ($this->context->controller::class == 'AdminDashboardController') {
$this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
}
}
@@ -68,14 +68,14 @@ public function hookDashboardData($params)
{
$data = array();
if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
- $data['dp_average_daily_rate'] = Tools::displayPrice(sprintf('%0.2f', rand(100000, 1000000) / 100));
- $data['dp_total_revenue_per_available_room'] = Tools::displayPrice(sprintf('%0.2f', rand(pow(10, 5), pow(10, 6)) / 100));
- $data['dp_average_occupancy_rate'] = sprintf('%0.2f', rand(5000, 10000) / 100).'%';
- $data['dp_revenue_per_available_room'] = Tools::displayPrice(sprintf('%0.2f', rand(pow(10, 5), pow(10, 6)) / 100));
- $data['dp_gross_operating_profit_par'] = Tools::displayPrice(sprintf('%0.2f', rand(pow(10, 6), pow(10, 7)) / 100));
- $data['dp_average_length_of_stay'] = sprintf('%0.2f', rand(1, 500) / 100);
- $data['dp_direct_revenue_ratio'] = sprintf('%0.2f', rand(4000, 8000) / 100).'%';
- $data['dp_cancellation_rate'] = sprintf('%0.2f', rand(1, 1000) / 100).'%';
+ $data['dp_average_daily_rate'] = Tools::displayPrice(sprintf('%0.2f', random_int(100000, 1000000) / 100));
+ $data['dp_total_revenue_per_available_room'] = Tools::displayPrice(sprintf('%0.2f', random_int(pow(10, 5), pow(10, 6)) / 100));
+ $data['dp_average_occupancy_rate'] = sprintf('%0.2f', random_int(5000, 10000) / 100).'%';
+ $data['dp_revenue_per_available_room'] = Tools::displayPrice(sprintf('%0.2f', random_int(pow(10, 5), pow(10, 6)) / 100));
+ $data['dp_gross_operating_profit_par'] = Tools::displayPrice(sprintf('%0.2f', random_int(pow(10, 6), pow(10, 7)) / 100));
+ $data['dp_average_length_of_stay'] = sprintf('%0.2f', random_int(1, 500) / 100);
+ $data['dp_direct_revenue_ratio'] = sprintf('%0.2f', random_int(4000, 8000) / 100).'%';
+ $data['dp_cancellation_rate'] = sprintf('%0.2f', random_int(1, 1000) / 100).'%';
} else {
$data['dp_average_daily_rate'] = Tools::displayPrice(AdminStatsController::getAverageDailyRate(
$params['date_from'],
diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php
index 084e3f1198..fe670cdb9d 100644
--- a/modules/dashtrends/dashtrends.php
+++ b/modules/dashtrends/dashtrends.php
@@ -65,7 +65,7 @@ public function install()
public function hookActionAdminControllerSetMedia()
{
- if (get_class($this->context->controller) == 'AdminDashboardController') {
+ if ($this->context->controller::class == 'AdminDashboardController') {
Media::addJsDef(array(
'date_txt' => $this->l('Date'),
));
@@ -101,14 +101,14 @@ protected function getData($date_from, $date_to, $id_hotel)
$from = strtotime($date_from.' 00:00:00');
$to = min(time(), strtotime($date_to.' 23:59:59'));
for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) {
- $tmp_data['visits'][$date] = round(rand(100, 600));
- $tmp_data['conversion_rate'][$date] = rand(80, 250) / 100;
- $tmp_data['average_cart_value'][$date] = round(rand(60, 10000), 2);
+ $tmp_data['visits'][$date] = round(random_int(100, 600));
+ $tmp_data['conversion_rate'][$date] = random_int(80, 250) / 100;
+ $tmp_data['average_cart_value'][$date] = round(random_int(60, 10000), 2);
$tmp_data['orders'][$date] = round($tmp_data['visits'][$date] * $tmp_data['conversion_rate'][$date] / 100);
$tmp_data['total_paid_tax_excl'][$date] = $tmp_data['orders'][$date] * $tmp_data['average_cart_value'][$date];
- $tmp_data['total_purchases'][$date] = $tmp_data['total_paid_tax_excl'][$date] * rand(50, 70) / 100;
- $tmp_data['total_expenses'][$date] = $tmp_data['total_paid_tax_excl'][$date] * rand(0, 10) / 100;
- $tmp_data['total_refunds'][$date] = $tmp_data['total_paid_tax_excl'][$date] * rand(0, 5) / 100;
+ $tmp_data['total_purchases'][$date] = $tmp_data['total_paid_tax_excl'][$date] * random_int(50, 70) / 100;
+ $tmp_data['total_expenses'][$date] = $tmp_data['total_paid_tax_excl'][$date] * random_int(0, 10) / 100;
+ $tmp_data['total_refunds'][$date] = $tmp_data['total_paid_tax_excl'][$date] * random_int(0, 5) / 100;
}
} else {
$tmp_data['visits'] = AdminStatsController::getVisits(false, $date_from, $date_to, 'day');
@@ -261,15 +261,13 @@ protected function translateCompareData($normal, $compare)
$translated_array = array();
foreach ($compare as $key => $date_array)
{
- $normal_min = key($normal[$key]);
- end($normal[$key]); // move the internal pointer to the end of the array
- $normal_max = key($normal[$key]);
+ $normal_min = key($normal[$key]); // move the internal pointer to the end of the array
+ $normal_max = array_key_last($normal[$key]);
reset($normal[$key]);
$normal_size = $normal_max - $normal_min;
- $compare_min = key($compare[$key]);
- end($compare[$key]); // move the internal pointer to the end of the array
- $compare_max = key($compare[$key]);
+ $compare_min = key($compare[$key]); // move the internal pointer to the end of the array
+ $compare_max = array_key_last($compare[$key]);
reset($compare[$key]);
$compare_size = $compare_max - $compare_min;
diff --git a/modules/graphnvd3/graphnvd3.php b/modules/graphnvd3/graphnvd3.php
index a98d107bd8..b4a0300b2a 100644
--- a/modules/graphnvd3/graphnvd3.php
+++ b/modules/graphnvd3/graphnvd3.php
@@ -76,7 +76,7 @@ public static function hookGraphEngine($params, $drawer)
{
static $divid = 1;
- if (strpos($params['width'], '%') !== false) {
+ if (str_contains($params['width'], '%')) {
$params['width'] = (int)preg_replace('/\s*%\s*/', '', $params['width']).'%';
} else {
$params['width'] = (int)$params['width'].'px';
diff --git a/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php b/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php
index da9693d928..6baab65a5f 100644
--- a/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php
+++ b/modules/hotelreservationsystem/classes/WebserviceSpecificManagementHotelAri.php
@@ -160,7 +160,7 @@ public function manage()
}
fclose($postResource);
- if (isset($inputXml) && strncmp($inputXml, 'xml=', 4) == 0) {
+ if (isset($inputXml) && str_starts_with($inputXml, 'xml=')) {
// Now $inputXml has the post request XML.
$inputXml = substr($inputXml, 4);
}
@@ -444,7 +444,7 @@ public function manage()
// We have to create the json and xml response for request by ourself. So we need to check if data to be sent in xml or json
// We have no way to check the output format from parent classed. So we used below code
- if (get_class($this->objOutput->getObjectRender()) == 'WebserviceOutputJSON') {
+ if ($this->objOutput->getObjectRender()::class == 'WebserviceOutputJSON') {
$this->getResponseJson($searchAriData, $dateWiseBreakdown);
} else {
$this->getResponseXml($searchAriData, $dateWiseBreakdown);
diff --git a/modules/pagesnotfound/pagesnotfound.php b/modules/pagesnotfound/pagesnotfound.php
index fe4ae762a2..8925427fe9 100644
--- a/modules/pagesnotfound/pagesnotfound.php
+++ b/modules/pagesnotfound/pagesnotfound.php
@@ -192,7 +192,7 @@ public function hookTop($params)
return;
}
- if (get_class(Context::getContext()->controller) == 'PageNotFoundController') {
+ if (Context::getContext()->controller::class == 'PageNotFoundController') {
$http_referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
if (empty($http_referer) || Validate::isAbsoluteUrl($http_referer)) {
Db::getInstance()->execute(
@@ -221,9 +221,5 @@ private function _normalizeDirectory($directory)
function pnfSort($a, $b)
{
- if ($a['nb'] == $b['nb']) {
- return 0;
- }
-
- return ($a['nb'] > $b['nb']) ? -1 : 1;
+ return $b['nb'] <=> $a['nb'];
}
diff --git a/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php b/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php
index 68e04abf4a..aac10d1700 100644
--- a/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php
+++ b/modules/qlocrontaskmanager/classes/QctmCronExpressionTranslator.php
@@ -97,7 +97,7 @@ public function getCronExpressionTranslation($expression)
);
}
- if (strpos($weekday, ',') !== false && $hasFixedTime && $dayMonthWildcard) {
+ if (str_contains($weekday, ',') && $hasFixedTime && $dayMonthWildcard) {
return vsprintf(
$this->module->l('Every %1$s at %2$s'),
array($this->joinNames($weekday, 'weekdayName'), $this->hourLabel($hour, $minute))
@@ -118,7 +118,7 @@ public function getCronExpressionTranslation($expression)
);
}
- if (strpos($day, ',') !== false && $hasFixedTime && $monthWeekdayWildcard) {
+ if (str_contains($day, ',') && $hasFixedTime && $monthWeekdayWildcard) {
return vsprintf(
$this->module->l('On the %1$s of each month at %2$s'),
array($this->joinOrdinals($day), $this->hourLabel($hour, $minute))
@@ -199,7 +199,7 @@ public function getCronExpressionTranslation($expression)
$this->module->l('from the %1$s to the %2$s of the month'),
array($this->ordinal($dm[1]), $this->ordinal($dm[2]))
);
- } elseif (strpos($day, ',') !== false) {
+ } elseif (str_contains($day, ',')) {
$conditions[] = vsprintf($this->module->l('on the %s of the month'), array($this->joinOrdinals($day)));
} elseif ($this->isNumeric($day)) {
$conditions[] = vsprintf($this->module->l('on the %s of the month'), array($this->ordinal($day)));
@@ -219,7 +219,7 @@ public function getCronExpressionTranslation($expression)
$this->module->l('%1$s through %2$s'),
array($this->monthName($mm[1]), $this->monthName($mm[2]))
);
- } elseif (strpos($month, ',') !== false) {
+ } elseif (str_contains($month, ',')) {
$monthDesc = $this->joinNames($month, 'monthName');
} else {
$monthDesc = $this->monthName($month);
@@ -238,7 +238,7 @@ public function getCronExpressionTranslation($expression)
$this->module->l('%1$s through %2$s'),
array($this->weekdayName($wm[1]), $this->weekdayName($wm[2]))
);
- } elseif (strpos($weekday, ',') !== false) {
+ } elseif (str_contains($weekday, ',')) {
$weekdayDesc = $this->joinNames($weekday, 'weekdayName');
} else {
$weekdayDesc = $this->weekdayName($weekday);
diff --git a/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php b/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php
index 30b4ee5b6a..0a7a3ecd9a 100644
--- a/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php
+++ b/modules/qlocrontaskmanager/controllers/admin/AdminCronTaskManagerController.php
@@ -419,7 +419,7 @@ public function getNextRun($cronExpression, $row)
try {
$next = \Cron\CronExpression::factory($cronExpression)->getNextRunDate();
return $next->format('Y-m-d H:i:s');
- } catch (\Exception $e) {
+ } catch (\Exception) {
return '-';
}
}
diff --git a/modules/qlocrontaskmanager/qlocrontaskmanager.php b/modules/qlocrontaskmanager/qlocrontaskmanager.php
index 3cc49da794..fd6de78ab4 100644
--- a/modules/qlocrontaskmanager/qlocrontaskmanager.php
+++ b/modules/qlocrontaskmanager/qlocrontaskmanager.php
@@ -25,7 +25,7 @@
exit;
}
-require_once dirname(__FILE__).'/classes/QctmRequiredClasses.php';
+require_once __DIR__.'/classes/QctmRequiredClasses.php';
class QloCronTaskManager extends Module
{
@@ -206,7 +206,7 @@ public function isCrontabConfigured()
$output = @shell_exec('crontab -l 2>/dev/null');
- return strpos((string) $output, 'qlocrontaskmanager/cron.php') !== false;
+ return str_contains((string) $output, 'qlocrontaskmanager/cron.php');
}
public function hookActionModuleUninstallBefore($params)
diff --git a/modules/qloduitkupayment/classes/QdpDuitkuServiceRequest.php b/modules/qloduitkupayment/classes/QdpDuitkuServiceRequest.php
index 4e9c94161a..19273074b1 100644
--- a/modules/qloduitkupayment/classes/QdpDuitkuServiceRequest.php
+++ b/modules/qloduitkupayment/classes/QdpDuitkuServiceRequest.php
@@ -58,7 +58,6 @@ public static function makeRequest($endpoint, $method, $data = [])
curl_setopt_array($curl, $options);
$request = curl_exec($curl);
$httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
- curl_close($curl);
self::logResponse($request);
$response = array();
diff --git a/modules/qloduitkupayment/controllers/front/return.php b/modules/qloduitkupayment/controllers/front/return.php
index 0f9fbbd2dc..f592c17d57 100644
--- a/modules/qloduitkupayment/controllers/front/return.php
+++ b/modules/qloduitkupayment/controllers/front/return.php
@@ -135,7 +135,7 @@ public function initContent()
}
$this->module->logger->log('After Cart Validation in return.', FileLogger::DEBUG);
- } catch (Exception $e) {
+ } catch (Exception) {
Tools::redirect($this->context->link->getModuleLink('qloduitkupayment', 'error') . '?validation_err=1&id=' . $response['merchantOrderId']);
}
} else {
diff --git a/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php b/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
index cc0ee01299..3e31838728 100644
--- a/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
+++ b/modules/qlopaypalcommerce/classes/WkPaypalCommerceHelper.php
@@ -60,8 +60,6 @@ public static function getAccessToken()
$response = curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
-
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
} else {
@@ -156,7 +154,6 @@ public static function createWebhookUrl($token)
$response = curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
@@ -215,8 +212,6 @@ public static function deleteWebhookUrl()
curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
-
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
}
@@ -255,8 +250,6 @@ public static function validateWebhookSig($postData)
$response = curl_exec($curl);
$err = curl_error($curl);
- curl_close($curl);
-
if ($err) {
throw new PrestaShopException(sprintf('cURL Error #: %s', $err));
} else {
diff --git a/modules/qlopaypalcommerce/controllers/front/payment.php b/modules/qlopaypalcommerce/controllers/front/payment.php
index 3795a5e751..af5e1d65ba 100644
--- a/modules/qlopaypalcommerce/controllers/front/payment.php
+++ b/modules/qlopaypalcommerce/controllers/front/payment.php
@@ -305,7 +305,7 @@ private function getOrderDetails()
);
}
- $timestamp = time().rand(100, 999);
+ $timestamp = time().random_int(100, 999);
$currency = Currency::getCurrency((int) $cart->id_currency);
$discountTI = $cart->getOrderTotal(true, Cart::ONLY_DISCOUNTS);
diff --git a/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php b/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php
index f3c42b7ce8..5164ea3ce1 100644
--- a/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php
+++ b/modules/qlopaypalcommerce/libs/Helpers/HttpHelper.php
@@ -30,10 +30,6 @@ public function __construct() {
$this->_initCurl();
}
- public function __destruct() {
- curl_close($this->_curl);
- }
-
private function _initCurl() {
if(!function_exists('curl_version')) {
trigger_error("Curl not available", E_USER_ERROR);
diff --git a/modules/sekeywords/sekeywords.php b/modules/sekeywords/sekeywords.php
index f003bc4900..d33f78cc8d 100644
--- a/modules/sekeywords/sekeywords.php
+++ b/modules/sekeywords/sekeywords.php
@@ -89,7 +89,7 @@ public function uninstall()
public function hookTop($params)
{
- if (!isset($_SERVER['HTTP_REFERER']) || strpos($_SERVER['HTTP_REFERER'], Tools::getHttpHost(false, false)) == 0) {
+ if (!isset($_SERVER['HTTP_REFERER']) || str_starts_with($_SERVER['HTTP_REFERER'], Tools::getHttpHost(false, false))) {
return;
}
@@ -201,7 +201,7 @@ public function getKeywords($url)
foreach ($result as $row) {
$host =& $row['server'];
$varname =& $row['getvar'];
- if (strstr($parsed_url['host'], $host)) {
+ if (strstr($parsed_url['host'], (string) $host)) {
$k_array = array();
preg_match('/[^a-zA-Z&]?'.$varname.'=.*\&'.'/U', $parsed_url['query'], $k_array);
diff --git a/tools/mobile_detect/autoload.php b/tools/mobile_detect/autoload.php
index fcc99b43e5..c32a3dd609 100644
--- a/tools/mobile_detect/autoload.php
+++ b/tools/mobile_detect/autoload.php
@@ -2,6 +2,21 @@
// autoload.php @generated by Composer
+if (PHP_VERSION_ID < 50600) {
+ if (!headers_sent()) {
+ header('HTTP/1.1 500 Internal Server Error');
+ }
+ $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+ if (!ini_get('display_errors')) {
+ if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+ fwrite(STDERR, $err);
+ } elseif (!headers_sent()) {
+ echo $err;
+ }
+ }
+ throw new RuntimeException($err);
+}
+
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInita08d71f03337ee7858b0d26c24ffd06c::getLoader();
+return ComposerAutoloaderInitda04a58985381691b6d3de9dc943eed7::getLoader();
diff --git a/tools/mobile_detect/composer/ClassLoader.php b/tools/mobile_detect/composer/ClassLoader.php
index afef3fa2ad..7824d8f7ea 100644
--- a/tools/mobile_detect/composer/ClassLoader.php
+++ b/tools/mobile_detect/composer/ClassLoader.php
@@ -42,35 +42,37 @@
*/
class ClassLoader
{
- /** @var ?string */
+ /** @var \Closure(string):void */
+ private static $includeFile;
+
+ /** @var string|null */
private $vendorDir;
// PSR-4
/**
- * @var array[]
- * @psalm-var array>
+ * @var array>
*/
private $prefixLengthsPsr4 = array();
/**
- * @var array[]
- * @psalm-var array>
+ * @var array>
*/
private $prefixDirsPsr4 = array();
/**
- * @var array[]
- * @psalm-var array
+ * @var list
*/
private $fallbackDirsPsr4 = array();
// PSR-0
/**
- * @var array[]
- * @psalm-var array>
+ * List of PSR-0 prefixes
+ *
+ * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2')))
+ *
+ * @var array>>
*/
private $prefixesPsr0 = array();
/**
- * @var array[]
- * @psalm-var array
+ * @var list
*/
private $fallbackDirsPsr0 = array();
@@ -78,8 +80,7 @@ class ClassLoader
private $useIncludePath = false;
/**
- * @var string[]
- * @psalm-var array
+ * @var array
*/
private $classMap = array();
@@ -87,29 +88,29 @@ class ClassLoader
private $classMapAuthoritative = false;
/**
- * @var bool[]
- * @psalm-var array
+ * @var array
*/
private $missingClasses = array();
- /** @var ?string */
+ /** @var string|null */
private $apcuPrefix;
/**
- * @var self[]
+ * @var array
*/
private static $registeredLoaders = array();
/**
- * @param ?string $vendorDir
+ * @param string|null $vendorDir
*/
public function __construct($vendorDir = null)
{
$this->vendorDir = $vendorDir;
+ self::initializeIncludeClosure();
}
/**
- * @return string[]
+ * @return array>
*/
public function getPrefixes()
{
@@ -121,8 +122,7 @@ public function getPrefixes()
}
/**
- * @return array[]
- * @psalm-return array>
+ * @return array>
*/
public function getPrefixesPsr4()
{
@@ -130,8 +130,7 @@ public function getPrefixesPsr4()
}
/**
- * @return array[]
- * @psalm-return array
+ * @return list
*/
public function getFallbackDirs()
{
@@ -139,8 +138,7 @@ public function getFallbackDirs()
}
/**
- * @return array[]
- * @psalm-return array
+ * @return list
*/
public function getFallbackDirsPsr4()
{
@@ -148,8 +146,7 @@ public function getFallbackDirsPsr4()
}
/**
- * @return string[] Array of classname => path
- * @psalm-return array
+ * @return array Array of classname => path
*/
public function getClassMap()
{
@@ -157,8 +154,7 @@ public function getClassMap()
}
/**
- * @param string[] $classMap Class to filename map
- * @psalm-param array $classMap
+ * @param array $classMap Class to filename map
*
* @return void
*/
@@ -175,24 +171,25 @@ public function addClassMap(array $classMap)
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
- * @param string $prefix The prefix
- * @param string[]|string $paths The PSR-0 root directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix
+ * @param list|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
*
* @return void
*/
public function add($prefix, $paths, $prepend = false)
{
+ $paths = (array) $paths;
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
- (array) $paths,
+ $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
- (array) $paths
+ $paths
);
}
@@ -201,19 +198,19 @@ public function add($prefix, $paths, $prepend = false)
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
- $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+ $this->prefixesPsr0[$first][$prefix] = $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
- (array) $paths,
+ $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
- (array) $paths
+ $paths
);
}
}
@@ -222,9 +219,9 @@ public function add($prefix, $paths, $prepend = false)
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param string[]|string $paths The PSR-4 base directories
- * @param bool $prepend Whether to prepend the directories
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param list|string $paths The PSR-4 base directories
+ * @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*
@@ -232,17 +229,18 @@ public function add($prefix, $paths, $prepend = false)
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
+ $paths = (array) $paths;
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
- (array) $paths,
+ $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
- (array) $paths
+ $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
@@ -252,18 +250,18 @@ public function addPsr4($prefix, $paths, $prepend = false)
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
- $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ $this->prefixDirsPsr4[$prefix] = $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
- (array) $paths,
+ $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
- (array) $paths
+ $paths
);
}
}
@@ -272,8 +270,8 @@ public function addPsr4($prefix, $paths, $prepend = false)
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
- * @param string $prefix The prefix
- * @param string[]|string $paths The PSR-0 base directories
+ * @param string $prefix The prefix
+ * @param list|string $paths The PSR-0 base directories
*
* @return void
*/
@@ -290,8 +288,8 @@ public function set($prefix, $paths)
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
- * @param string $prefix The prefix/namespace, with trailing '\\'
- * @param string[]|string $paths The PSR-4 base directories
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param list|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*
@@ -425,7 +423,8 @@ public function unregister()
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
- includeFile($file);
+ $includeFile = self::$includeFile;
+ $includeFile($file);
return true;
}
@@ -476,9 +475,9 @@ public function findFile($class)
}
/**
- * Returns the currently registered loaders indexed by their corresponding vendor directories.
+ * Returns the currently registered loaders keyed by their corresponding vendor directories.
*
- * @return self[]
+ * @return array
*/
public static function getRegisteredLoaders()
{
@@ -555,18 +554,26 @@ private function findFileWithExtension($class, $ext)
return false;
}
-}
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- *
- * @param string $file
- * @return void
- * @private
- */
-function includeFile($file)
-{
- include $file;
+ /**
+ * @return void
+ */
+ private static function initializeIncludeClosure()
+ {
+ if (self::$includeFile !== null) {
+ return;
+ }
+
+ /**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ *
+ * @param string $file
+ * @return void
+ */
+ self::$includeFile = \Closure::bind(static function($file) {
+ include $file;
+ }, null, null);
+ }
}
diff --git a/tools/mobile_detect/composer/InstalledVersions.php b/tools/mobile_detect/composer/InstalledVersions.php
index d50e0c9fcc..2052022fd8 100644
--- a/tools/mobile_detect/composer/InstalledVersions.php
+++ b/tools/mobile_detect/composer/InstalledVersions.php
@@ -21,15 +21,28 @@
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
*
* To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
*/
class InstalledVersions
{
+ /**
+ * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+ * @internal
+ */
+ private static $selfDir = null;
+
/**
* @var mixed[]|null
- * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}|array{}|null
+ * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null
*/
private static $installed;
+ /**
+ * @var bool
+ */
+ private static $installedIsLocalDir;
+
/**
* @var bool|null
*/
@@ -37,7 +50,7 @@ class InstalledVersions
/**
* @var array[]
- * @psalm-var array}>
+ * @psalm-var array}>
*/
private static $installedByVendor = array();
@@ -96,7 +109,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
{
foreach (self::getInstalled() as $installed) {
if (isset($installed['versions'][$packageName])) {
- return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+ return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
}
}
@@ -117,7 +130,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
*/
public static function satisfies(VersionParser $parser, $packageName, $constraint)
{
- $constraint = $parser->parseConstraints($constraint);
+ $constraint = $parser->parseConstraints((string) $constraint);
$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
return $provided->matches($constraint);
@@ -241,7 +254,7 @@ public static function getInstallPath($packageName)
/**
* @return array
- * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}
+ * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
*/
public static function getRootPackage()
{
@@ -255,7 +268,7 @@ public static function getRootPackage()
*
* @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
* @return array[]
- * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array}
+ * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}
*/
public static function getRawData()
{
@@ -278,7 +291,7 @@ public static function getRawData()
* Returns the raw data of all installed.php which are currently loaded for custom implementations
*
* @return array[]
- * @psalm-return list}>
+ * @psalm-return list}>
*/
public static function getAllRawData()
{
@@ -301,17 +314,35 @@ public static function getAllRawData()
* @param array[] $data A vendor/composer/installed.php data set
* @return void
*
- * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array} $data
+ * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data
*/
public static function reload($data)
{
self::$installed = $data;
self::$installedByVendor = array();
+
+ // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+ // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+ // so we have to assume it does not, and that may result in duplicate data being returned when listing
+ // all installed packages for example
+ self::$installedIsLocalDir = false;
+ }
+
+ /**
+ * @return string
+ */
+ private static function getSelfDir()
+ {
+ if (self::$selfDir === null) {
+ self::$selfDir = strtr(__DIR__, '\\', '/');
+ }
+
+ return self::$selfDir;
}
/**
* @return array[]
- * @psalm-return list}>
+ * @psalm-return list}>
*/
private static function getInstalled()
{
@@ -320,17 +351,27 @@ private static function getInstalled()
}
$installed = array();
+ $copiedLocalDir = false;
if (self::$canGetVendors) {
+ $selfDir = self::getSelfDir();
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+ $vendorDir = strtr($vendorDir, '\\', '/');
if (isset(self::$installedByVendor[$vendorDir])) {
$installed[] = self::$installedByVendor[$vendorDir];
} elseif (is_file($vendorDir.'/composer/installed.php')) {
- $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
- if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
- self::$installed = $installed[count($installed) - 1];
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */
+ $required = require $vendorDir.'/composer/installed.php';
+ self::$installedByVendor[$vendorDir] = $required;
+ $installed[] = $required;
+ if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+ self::$installed = $required;
+ self::$installedIsLocalDir = true;
}
}
+ if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+ $copiedLocalDir = true;
+ }
}
}
@@ -338,12 +379,17 @@ private static function getInstalled()
// only require the installed.php file if this file is loaded from its dumped location,
// and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
if (substr(__DIR__, -8, 1) !== 'C') {
- self::$installed = require __DIR__ . '/installed.php';
+ /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */
+ $required = require __DIR__ . '/installed.php';
+ self::$installed = $required;
} else {
self::$installed = array();
}
}
- $installed[] = self::$installed;
+
+ if (self::$installed !== array() && !$copiedLocalDir) {
+ $installed[] = self::$installed;
+ }
return $installed;
}
diff --git a/tools/mobile_detect/composer/autoload_classmap.php b/tools/mobile_detect/composer/autoload_classmap.php
index b26f1b13b1..5315f8d961 100644
--- a/tools/mobile_detect/composer/autoload_classmap.php
+++ b/tools/mobile_detect/composer/autoload_classmap.php
@@ -2,9 +2,19 @@
// autoload_classmap.php @generated by Composer
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+ 'Detection\\Cache\\Cache' => $vendorDir . '/mobiledetect/mobiledetectlib/src/Cache/Cache.php',
+ 'Detection\\Cache\\CacheException' => $vendorDir . '/mobiledetect/mobiledetectlib/src/Cache/CacheException.php',
+ 'Detection\\Cache\\CacheInvalidArgumentException' => $vendorDir . '/mobiledetect/mobiledetectlib/src/Cache/CacheInvalidArgumentException.php',
+ 'Detection\\Exception\\MobileDetectException' => $vendorDir . '/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php',
+ 'Detection\\Exception\\MobileDetectExceptionCode' => $vendorDir . '/mobiledetect/mobiledetectlib/src/Exception/MobileDetectExceptionCode.php',
+ 'Detection\\MobileDetect' => $vendorDir . '/mobiledetect/mobiledetectlib/src/MobileDetect.php',
+ 'Detection\\MobileDetectStandalone' => $vendorDir . '/mobiledetect/mobiledetectlib/src/MobileDetectStandalone.php',
+ 'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
+ 'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
+ 'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
);
diff --git a/tools/mobile_detect/composer/autoload_namespaces.php b/tools/mobile_detect/composer/autoload_namespaces.php
index b7fc0125db..15a2ff3ad6 100644
--- a/tools/mobile_detect/composer/autoload_namespaces.php
+++ b/tools/mobile_detect/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
// autoload_namespaces.php @generated by Composer
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
diff --git a/tools/mobile_detect/composer/autoload_psr4.php b/tools/mobile_detect/composer/autoload_psr4.php
index 61df9249d5..1cf71bf771 100644
--- a/tools/mobile_detect/composer/autoload_psr4.php
+++ b/tools/mobile_detect/composer/autoload_psr4.php
@@ -2,11 +2,10 @@
// autoload_psr4.php @generated by Composer
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
return array(
'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
- 'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
'Detection\\' => array($vendorDir . '/mobiledetect/mobiledetectlib/src'),
);
diff --git a/tools/mobile_detect/composer/autoload_real.php b/tools/mobile_detect/composer/autoload_real.php
index 6f65c4edc9..becfc45aba 100644
--- a/tools/mobile_detect/composer/autoload_real.php
+++ b/tools/mobile_detect/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInita08d71f03337ee7858b0d26c24ffd06c
+class ComposerAutoloaderInitda04a58985381691b6d3de9dc943eed7
{
private static $loader;
@@ -24,31 +24,12 @@ public static function getLoader()
require __DIR__ . '/platform_check.php';
- spl_autoload_register(array('ComposerAutoloaderInita08d71f03337ee7858b0d26c24ffd06c', 'loadClassLoader'), true, true);
- self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
- spl_autoload_unregister(array('ComposerAutoloaderInita08d71f03337ee7858b0d26c24ffd06c', 'loadClassLoader'));
-
- $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
- if ($useStaticLoader) {
- require __DIR__ . '/autoload_static.php';
-
- call_user_func(\Composer\Autoload\ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c::getInitializer($loader));
- } else {
- $map = require __DIR__ . '/autoload_namespaces.php';
- foreach ($map as $namespace => $path) {
- $loader->set($namespace, $path);
- }
-
- $map = require __DIR__ . '/autoload_psr4.php';
- foreach ($map as $namespace => $path) {
- $loader->setPsr4($namespace, $path);
- }
-
- $classMap = require __DIR__ . '/autoload_classmap.php';
- if ($classMap) {
- $loader->addClassMap($classMap);
- }
- }
+ spl_autoload_register(array('ComposerAutoloaderInitda04a58985381691b6d3de9dc943eed7', 'loadClassLoader'), true, true);
+ self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+ spl_autoload_unregister(array('ComposerAutoloaderInitda04a58985381691b6d3de9dc943eed7', 'loadClassLoader'));
+
+ require __DIR__ . '/autoload_static.php';
+ call_user_func(\Composer\Autoload\ComposerStaticInitda04a58985381691b6d3de9dc943eed7::getInitializer($loader));
$loader->register(true);
diff --git a/tools/mobile_detect/composer/autoload_static.php b/tools/mobile_detect/composer/autoload_static.php
index 2fbe672a96..b7d883efb9 100644
--- a/tools/mobile_detect/composer/autoload_static.php
+++ b/tools/mobile_detect/composer/autoload_static.php
@@ -4,13 +4,12 @@
namespace Composer\Autoload;
-class ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c
+class ComposerStaticInitda04a58985381691b6d3de9dc943eed7
{
public static $prefixLengthsPsr4 = array (
'P' =>
array (
'Psr\\SimpleCache\\' => 16,
- 'Psr\\Cache\\' => 10,
),
'D' =>
array (
@@ -23,10 +22,6 @@ class ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c
array (
0 => __DIR__ . '/..' . '/psr/simple-cache/src',
),
- 'Psr\\Cache\\' =>
- array (
- 0 => __DIR__ . '/..' . '/psr/cache/src',
- ),
'Detection\\' =>
array (
0 => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src',
@@ -35,14 +30,24 @@ class ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c
public static $classMap = array (
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+ 'Detection\\Cache\\Cache' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/Cache/Cache.php',
+ 'Detection\\Cache\\CacheException' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/Cache/CacheException.php',
+ 'Detection\\Cache\\CacheInvalidArgumentException' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/Cache/CacheInvalidArgumentException.php',
+ 'Detection\\Exception\\MobileDetectException' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php',
+ 'Detection\\Exception\\MobileDetectExceptionCode' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/Exception/MobileDetectExceptionCode.php',
+ 'Detection\\MobileDetect' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/MobileDetect.php',
+ 'Detection\\MobileDetectStandalone' => __DIR__ . '/..' . '/mobiledetect/mobiledetectlib/src/MobileDetectStandalone.php',
+ 'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
+ 'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
+ 'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
);
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c::$prefixDirsPsr4;
- $loader->classMap = ComposerStaticInita08d71f03337ee7858b0d26c24ffd06c::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitda04a58985381691b6d3de9dc943eed7::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitda04a58985381691b6d3de9dc943eed7::$prefixDirsPsr4;
+ $loader->classMap = ComposerStaticInitda04a58985381691b6d3de9dc943eed7::$classMap;
}, null, ClassLoader::class);
}
diff --git a/tools/mobile_detect/composer/installed.json b/tools/mobile_detect/composer/installed.json
index 0e07c18334..4fa04ddce7 100644
--- a/tools/mobile_detect/composer/installed.json
+++ b/tools/mobile_detect/composer/installed.json
@@ -2,32 +2,31 @@
"packages": [
{
"name": "mobiledetect/mobiledetectlib",
- "version": "4.8.09",
- "version_normalized": "4.8.09.0",
+ "version": "4.11.0",
+ "version_normalized": "4.11.0.0",
"source": {
"type": "git",
"url": "https://github.com/serbanghita/Mobile-Detect.git",
- "reference": "a06fe2e546a06bb8c2639d6823d5250b2efb3209"
+ "reference": "ab39168b7556f44c11c80be1222b44b239f5c2e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/a06fe2e546a06bb8c2639d6823d5250b2efb3209",
- "reference": "a06fe2e546a06bb8c2639d6823d5250b2efb3209",
+ "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/ab39168b7556f44c11c80be1222b44b239f5c2e4",
+ "reference": "ab39168b7556f44c11c80be1222b44b239f5c2e4",
"shasum": ""
},
"require": {
- "php": ">=8.0",
- "psr/cache": "^3.0",
- "psr/simple-cache": "^3"
+ "php": ">=8.2",
+ "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^v3.65.0",
- "phpbench/phpbench": "^1.2",
- "phpstan/phpstan": "^1.12.x-dev",
- "phpunit/phpunit": "^9.6.18",
- "squizlabs/php_codesniffer": "^3.11.1"
+ "friendsofphp/php-cs-fixer": "3.95.1",
+ "phpbench/phpbench": "1.6.1",
+ "phpstan/phpstan": "2.1.47",
+ "phpunit/phpunit": "9.6.34",
+ "squizlabs/php_codesniffer": "3.13.5"
},
- "time": "2024-12-10T15:32:06+00:00",
+ "time": "2026-05-24T12:32:40+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -58,7 +57,7 @@
],
"support": {
"issues": "https://github.com/serbanghita/Mobile-Detect/issues",
- "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.8.09"
+ "source": "https://github.com/serbanghita/Mobile-Detect/tree/4.11.0"
},
"funding": [
{
@@ -68,58 +67,6 @@
],
"install-path": "../mobiledetect/mobiledetectlib"
},
- {
- "name": "psr/cache",
- "version": "3.0.0",
- "version_normalized": "3.0.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/php-fig/cache.git",
- "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
- "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
- "shasum": ""
- },
- "require": {
- "php": ">=8.0.0"
- },
- "time": "2021-02-03T23:26:27+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Psr\\Cache\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "PHP-FIG",
- "homepage": "https://www.php-fig.org/"
- }
- ],
- "description": "Common interface for caching libraries",
- "keywords": [
- "cache",
- "psr",
- "psr-6"
- ],
- "support": {
- "source": "https://github.com/php-fig/cache/tree/3.0.0"
- },
- "install-path": "../psr/cache"
- },
{
"name": "psr/simple-cache",
"version": "3.0.0",
@@ -175,6 +122,6 @@
"install-path": "../psr/simple-cache"
}
],
- "dev": true,
+ "dev": false,
"dev-package-names": []
}
diff --git a/tools/mobile_detect/composer/installed.php b/tools/mobile_detect/composer/installed.php
index 2aabf4d82b..a5ba0775dc 100644
--- a/tools/mobile_detect/composer/installed.php
+++ b/tools/mobile_detect/composer/installed.php
@@ -1,49 +1,40 @@
array(
+ 'name' => 'qloapps/mobile-detect-vendor-scratch',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
+ 'reference' => null,
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => NULL,
- 'name' => '__root__',
- 'dev' => true,
+ 'dev' => false,
),
'versions' => array(
- '__root__' => array(
- 'pretty_version' => '1.0.0+no-version-set',
- 'version' => '1.0.0.0',
- 'type' => 'library',
- 'install_path' => __DIR__ . '/../../',
- 'aliases' => array(),
- 'reference' => NULL,
- 'dev_requirement' => false,
- ),
'mobiledetect/mobiledetectlib' => array(
- 'pretty_version' => '4.8.09',
- 'version' => '4.8.09.0',
+ 'pretty_version' => '4.11.0',
+ 'version' => '4.11.0.0',
+ 'reference' => 'ab39168b7556f44c11c80be1222b44b239f5c2e4',
'type' => 'library',
'install_path' => __DIR__ . '/../mobiledetect/mobiledetectlib',
'aliases' => array(),
- 'reference' => 'a06fe2e546a06bb8c2639d6823d5250b2efb3209',
'dev_requirement' => false,
),
- 'psr/cache' => array(
+ 'psr/simple-cache' => array(
'pretty_version' => '3.0.0',
'version' => '3.0.0.0',
+ 'reference' => '764e0b3939f5ca87cb904f570ef9be2d78a07865',
'type' => 'library',
- 'install_path' => __DIR__ . '/../psr/cache',
+ 'install_path' => __DIR__ . '/../psr/simple-cache',
'aliases' => array(),
- 'reference' => 'aa5030cfa5405eccfdcb1083ce040c2cb8d253bf',
'dev_requirement' => false,
),
- 'psr/simple-cache' => array(
- 'pretty_version' => '3.0.0',
- 'version' => '3.0.0.0',
+ 'qloapps/mobile-detect-vendor-scratch' => array(
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
+ 'reference' => null,
'type' => 'library',
- 'install_path' => __DIR__ . '/../psr/simple-cache',
+ 'install_path' => __DIR__ . '/../../',
'aliases' => array(),
- 'reference' => '764e0b3939f5ca87cb904f570ef9be2d78a07865',
'dev_requirement' => false,
),
),
diff --git a/tools/mobile_detect/composer/platform_check.php b/tools/mobile_detect/composer/platform_check.php
index adfb472fbd..d32d90c6a9 100644
--- a/tools/mobile_detect/composer/platform_check.php
+++ b/tools/mobile_detect/composer/platform_check.php
@@ -4,8 +4,8 @@
$issues = array();
-if (!(PHP_VERSION_ID >= 80000)) {
- $issues[] = 'Your Composer dependencies require a PHP version ">= 8.0.0". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 80200)) {
+ $issues[] = 'Your Composer dependencies require a PHP version ">= 8.2.0". You are running ' . PHP_VERSION . '.';
}
if ($issues) {
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/CHANGELOG.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/CHANGELOG.md
index 8cfc364801..2379effcbc 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/CHANGELOG.md
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/CHANGELOG.md
@@ -1,5 +1,62 @@
# Change log
+# 4.11.0
+
+## Security
+- [x] **GHSA-mgj4-qjmw-v56v** — the bundled `Detection\Cache\Cache` is now bounded (default 1000 entries, FIFO eviction). Prevents unbounded in-memory growth when one `MobileDetect` instance is reused across many distinct User-Agents in a long-running PHP runtime (RoadRunner, Laravel Octane, FrankenPHP worker mode, Swoole, ReactPHP, queue workers). **Not applicable** to classic PHP-FPM / mod_php deployments — the cache dies with the request. Custom PSR-16 adapters (Redis, APCu, Memcached, Filesystem) are out of scope; their eviction policy is the operator's responsibility.
+
+## Added
+- [x] `Detection\Cache\Cache::__construct(int $maxEntries = Cache::DEFAULT_MAX_ENTRIES)` — tune the in-memory cap via `new MobileDetect(new Cache($n))`.
+- [x] `Cache::DEFAULT_MAX_ENTRIES` constant (1000) and `Cache::getMaxEntries()` accessor.
+
+## Changed
+- [x] `README-EXAMPLES.md` "Long-Running Processes" — worker example now uses `clear()` (was `evictExpired()`, which is a no-op against fresh entries under the default 86 400 s TTL); added explicit note framing in-memory cache bounding as a systems-level concern with the bundled cap, and pointing operators at their own adapter's eviction for custom PSR-16 backends.
+- [x] `Cache::evictExpired()` docblock — clarified that it bounds by *expiration*, not by *cardinality*. Method behavior is unchanged.
+
+# 4.10.0
+
+## Changed
+- [x] `Detection\Cache\Cache` method signatures widened to be Liskov-compatible with `psr/simple-cache` v1, v2, and v3 simultaneously. Resolves [#989](https://github.com/serbanghita/Mobile-Detect/issues/989) — the class no longer fatals at load time on hosts where another package has already registered an older `CacheInterface` (common in WordPress stacks).
+- [x] `composer.json`: `psr/simple-cache` constraint widened to `^1.0 || ^2.0 || ^3.0`.
+- [x] **Minimum PHP version raised to 8.2** in `composer.json` (was `>=8.0`). PHP 8.0 and 8.1 are both end-of-life and had already been dropped from CI in 4.9.0 because `phpbench/phpbench: 1.6.1` requires PHP ^8.2.
+
+## Added
+- [x] `psr16-compat` CI matrix that verifies Cache remains LSP-compatible with every supported major of `psr/simple-cache` (1.x, 2.x, 3.x).
+
+## BC note
+- Subclasses of `Detection\Cache\Cache` that overrode `get`/`set`/`has`/`delete`/`getMultiple`/`setMultiple`/`deleteMultiple` (or protected `checkKey`) with narrowed parameter types (e.g. `function get(string $key, …)`) will fatal at class load on this version. Drop the scalar type from the override, or widen to `mixed`, to restore LSP compatibility.
+
+# 4.9.0
+
+## Added
+- [x] Lenovo: broad `Lenovo TB` prefix match for modern tablets (#1013).
+- [x] Samsung: 2025 tablet models (Tab S11, S10 Lite, A11).
+- [x] `MobileDetect::VERSION_TYPE_STRING` and `VERSION_TYPE_FLOAT` constants promoted to `public` (#991).
+
+## Changed
+- [x] Consistent late static binding for subclass extensibility (#1012).
+- [x] Dropped PHP 8.0 and 8.1 from the CI matrix.
+
+## Fixed
+- [x] PHP 8.4 compatibility: explicit type hints where the engine now requires them.
+- [x] `Cache::getTimestamp()` method name typo (was `getTimeStamp`) (#1007).
+- [x] Version regex now accepts multi-char pre-release suffixes.
+- [x] Pinned composer dependencies to exact versions.
+- [x] GitHub Actions workflow actions updated to their latest versions.
+
+# 4.8.10
+
+## Fixed
+- [x] `Cache::has()` now properly checks TTL expiration before returning `true` (PSR-16 compliance fix). Previously, `has()` returned `true` for expired items.
+
+## Added
+- [x] `Cache::evictExpired()` method to manually clean up expired cache entries. Useful for long-running processes (CLI scripts, workers, daemons) to prevent memory growth.
+- [x] Expanded test coverage for `Cache` class: added 17 new tests covering all if/else branches including custom defaults, DateInterval TTL, key validation edge cases, and expiration scenarios.
+- [x] `README-EXAMPLES.md` with comprehensive usage examples including long-running processes, framework integration, and debugging.
+
+## Changed
+- [x] `Cache::has()` now deletes expired items on check (lazy cleanup, consistent with `get()` behavior).
+
# 4.8.09
- [x] `sha1` is now the default fn for encoding cache keys. Using `base64` [was causing problems](https://github.com/serbanghita/Mobile-Detect/issues/974#issuecomment-2531597903) in Laravel.
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/CLAUDE.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/CLAUDE.md
new file mode 100644
index 0000000000..d60e859dd1
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/CLAUDE.md
@@ -0,0 +1,67 @@
+# CLAUDE.md
+
+Whenever you find a new rule that applies to this project, add it to this file.
+
+## Project
+
+PHP library (`Detection\MobileDetect`) for detecting mobile devices/tablets via User-Agent strings and HTTP headers. Requires PHP >= 8.0. PSR-12 code style.
+
+## Branch & Release
+
+- Active branch: `4.x` (rolling — one branch per major). Always rebase into `4.x` (not `main` or `master`). Tags follow `..`.
+- On new tag: update `@version` docblock + `$VERSION` property in `src/MobileDetect.php`, and `version` in `MobileDetect.json`.
+
+## Commands
+
+```bash
+# Tests
+vendor/bin/phpunit -v -c tests/phpunit.xml
+vendor/bin/phpunit -v -c tests/phpunit.xml --filter testMethodName
+
+# Lint + static analysis
+vendor/bin/phpcs
+vendor/bin/php-cs-fixer fix
+vendor/bin/phpstan analyse --memory-limit=1G --level 3 src tests
+
+# Benchmark (defaults live in /phpbench.json and per-method @Revs/@Iterations)
+composer bench # aggregate report
+composer bench:baseline # stores tag=baseline + phpbench-baseline.xml
+composer bench:compare # runs with --ref=baseline, enforces 2% @Assert
+# Advisory CI: .github/workflows/4.x-bench.yml runs on every PR to 4.x,
+# uploads artifacts, and posts a PR comment. Does not block merge.
+```
+
+## Performance reviews
+
+Every time you run a performance review (ad-hoc benchmarking, before a release,
+after touching a hot path, or at the end of a perf-oriented PR), **append a new
+dated section to `PERFORMANCE.md`** using the template block at the bottom of
+that file. Do not edit prior sections — they are a historical record for
+regression comparison.
+
+Minimum contents per section: branch/commit, PHP image, host, phpbench config,
+the full aggregate table (13 subjects today), and a short notes list
+interpreting what's surprising or actionable in the numbers.
+
+## Architecture
+
+```
+src/
+ MobileDetect.php # Core class: regex patterns, isMobile(), isTablet(), is(), version(), magic isXXXX() via __call
+ MobileDetectStandalone.php # Non-Composer wrapper (loads standalone/ autoloader)
+ Cache/Cache.php # In-memory PSR-16 cache with TTL
+ Exception/ # MobileDetectException + error codes
+tests/
+ providers/vendors/*.php # UA fixture arrays per vendor (Apple, Samsung, etc.)
+ UserAgentTest.php # Data-driven tests from vendor fixtures
+ MobileDetectGeneralTest.php # Core logic tests
+ CacheTest.php, MobileDetectWithCacheTest.php, MobileDetectExceptionTest.php
+ Benchmark/MobileDetectBench.php # PHPBench suite (PSR-4: DetectionTests\Benchmark)
+```
+
+## Key Patterns
+
+- Detection results are cached via PSR-16 (`CacheInterface`). Default: in-memory `Cache`. Cache keys use `sha1` by default.
+- `$_SERVER` HTTP headers auto-initialized unless `autoInitOfHttpHeaders` config is `false`.
+- CloudFront headers (`HTTP_CLOUDFRONT_IS_MOBILE_VIEWER`, etc.) are recognized for AWS detection.
+- Magic `isXXXX()` calls dispatch through `__call` -> `is()` -> `match()` against static regex arrays (`$phoneDevices`, `$tabletDevices`, `$operatingSystems`, `$browsers`).
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/DOCKER-COMPOSE.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/DOCKER-COMPOSE.md
new file mode 100644
index 0000000000..072779d162
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/DOCKER-COMPOSE.md
@@ -0,0 +1,90 @@
+# Docker Compose for Pre-Release Validation
+
+This document describes the Docker Compose setup for running all necessary checks before a release in a controlled PHP environment.
+
+## Architecture Overview
+
+```
+┌─────────────────────────────────────────────────────────────────────────┐
+│ SETUP SERVICE │
+│ (composer:latest) - Installs dependencies into ./vendor │
+└─────────────────────────────────────────────────────────────────────────┘
+ │
+ service_completed_successfully
+ │
+ ┌───────────────────────────┼───────────────────────────┐
+ ▼ ▼ ▼
+┌───────────────┐ ┌─────────────────┐ ┌─────────────────┐
+│ runUnitTests │ │ runPerfTests │ │ runLinting │
+│ (php:8.4+xdebug)│ │ (php:8.4-alpine)│ │ (php:8.4-alpine)│
+│ phpunit │ │ phpbench │ │ phpcs │
+└───────────────┘ └─────────────────┘ └─────────────────┘
+ │ │ │
+ │ │ ▼
+ │ │ ┌─────────────────┐
+ │ │ │ runQualityCheck │
+ │ │ │ (php:8.4-alpine)│
+ │ │ │ phpstan │
+ │ │ └─────────────────┘
+ │ │ │
+ └───────────────────────────┴───────────────────────────┘
+ │
+ all services completed successfully
+ │
+ ▼
+ ┌─────────────────────┐
+ │ runAll │
+ │ Pre-release gate │
+ └─────────────────────┘
+ │
+ ▼
+ ┌─────────────────────┐
+ │ generateJsonModel │
+ │ export_to_json.php │
+ └─────────────────────┘
+```
+
+## Services
+
+| Service | Image | Purpose |
+|---------|-------|---------|
+| `setup` | composer:latest | Install dependencies |
+| `runUnitTests` | alcohol/php:8.4-xdebug | PHPUnit tests with coverage |
+| `runPerfTests` | php:8.4-alpine | PHPBench performance tests |
+| `runLinting` | php:8.4-alpine | PHPCS code style checks + auto-fix |
+| `runQualityCheck` | php:8.4-alpine | PHPStan static analysis |
+| `runAll` | php:8.4-alpine | Pre-release validation gate |
+| `generateJsonModel` | php:8.4-alpine | Export detection rules to JSON |
+
+## Usage
+
+### Run all pre-release checks
+
+```bash
+docker compose -p mobile-detect up --build runAll
+```
+
+### Run individual services
+
+```bash
+# Unit tests with coverage
+docker compose -p mobile-detect up --build runUnitTests
+
+# Performance benchmarks
+docker compose -p mobile-detect up --build runPerfTests
+
+# Code style linting
+docker compose -p mobile-detect up --build runLinting
+
+# Static analysis
+docker compose -p mobile-detect up --build runQualityCheck
+
+# Generate JSON model (runs after all checks pass)
+docker compose -p mobile-detect up --build generateJsonModel
+```
+
+### Clean up
+
+```bash
+docker compose -p mobile-detect down --volumes --remove-orphans
+```
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/KNOWN_LIMITATIONS.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/KNOWN_LIMITATIONS.md
index 0f9666e149..74321e7682 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/KNOWN_LIMITATIONS.md
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/KNOWN_LIMITATIONS.md
@@ -13,3 +13,8 @@ We cannot guarantee that they are using the class properly or if they provide th
* Version `2.x` is made to be PHP 5.3 compatible because of the backward compatibility changes of PHP.
* There are hundreds of devices launched every month, we cannot keep a 100% up-to-date detection rate.
* The script cannot detect the viewport, pixel density or resolution of the screen since it's running server-side.
+* **Full-page edge / proxy caches that don't key on User-Agent will defeat server-side detection.** When a CDN or page-cache plugin stores the rendered HTML and serves it to subsequent visitors without varying by `User-Agent`, the device class baked into the *first* cached response is delivered to everyone — PHP (and Mobile Detect) never run on a cache hit. This is an architectural property of full-page caches, not a bug in this library, and applies equally to any server-side branching (geo redirects, A/B tests, header-based locale, etc.). Known examples reported against this project:
+ * WP Engine *Edge Full Page Cache* — disable it on routes that branch on UA. See [#980](https://github.com/serbanghita/Mobile-Detect/issues/980).
+ * W3 Total Cache (WordPress plugin). See [#447](https://github.com/serbanghita/Mobile-Detect/issues/447).
+ * Cloudflare + Google Signed Exchanges (SXG). See [#945](https://github.com/serbanghita/Mobile-Detect/issues/945).
+ * Possible mitigations belong to the host/CDN config, not the library: disable the cache on UA-sensitive routes, add `Vary: User-Agent` if the CDN honors it, classify UA at the edge (Cloudflare Workers, Akamai EdgeWorkers, Vercel Middleware) and use the result as part of the cache key, or move device-specific logic client-side.
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/MobileDetect.json b/tools/mobile_detect/mobiledetect/mobiledetectlib/MobileDetect.json
index c641602fe7..75f8010717 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/MobileDetect.json
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/MobileDetect.json
@@ -1,5 +1,5 @@
{
- "version": "4.8.09",
+ "version": "4.11.0",
"headerMatch": {
"HTTP_ACCEPT": {
"matches": [
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/PERFORMANCE.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/PERFORMANCE.md
new file mode 100644
index 0000000000..bbec48136c
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/PERFORMANCE.md
@@ -0,0 +1,63 @@
+# Performance log
+
+Each performance review appends a new section below, using the template at the
+bottom of this file. Do not edit prior sections — they are a historical record.
+
+---
+
+## 2026-04-24 — 4.x bench-suite overhaul
+
+- Branch / base: `4.x` @ `c91cc4b`
+- PHP: `8.4-alpine` (linux/amd64), run via `docker compose -p mobile-detect up runPerfTests`
+- Host: Apple Silicon, OrbStack
+- PHPBench config: `iterations=10, revs=1000, warmup=2, retry_threshold=1` (percent; from `/phpbench.json`)
+- Subjects: 13, Assertions: 13, Failures: 0, Errors: 0
+
+| Subject | ops/s | rstdev |
+|---|---:|---:|
+| `benchMatchOnlyBestRegex` | 3,421,012 | ±0.51% |
+| `benchMatchOnlyWorstRegex` | 2,338,811 | ±0.38% |
+| `benchIsMobileCacheWarm` | 1,004,507 | ±0.42% |
+| `benchIsTabletAgainstBestMatch` | 303,764 | ±0.52% |
+| `benchIsIOS` | 99,981 | ±0.36% |
+| `benchIsIpad` | 99,263 | ±0.35% |
+| `benchIsSamsungTablet` | 76,596 | ±0.58% |
+| `benchIsMobileCacheCold` | 69,089 | ±0.44% |
+| `benchIsMobileAgainstBestMatch` | 68,982 | ±0.49% |
+| `benchIsMobileCacheKeyFnCustomAgainstBestMatch` | 66,851 | ±0.52% |
+| `benchIsSamsung` | 56,603 | ±0.53% |
+| `benchIsTabletAgainstWorstMatch` | 19,776 | ±0.16% |
+| `benchIsMobileAgainstWorstMatch` | 8,883 | ±0.30% |
+
+### Notes
+
+- The warm cache hit is ~15× faster than cold (1.00M vs 69k ops/s) — validates the cache-path split was worth adding, and confirms the PSR-16 cache actually short-circuits the regex loop on hit.
+- Isolated `match()` runs at 2.3–3.4M ops/s; `isMobile()` on the same best-match UA runs 50× slower at 69k. So ~98% of an `isMobile()` call is *not* the regex — it's constructor + `$_SERVER` init + cache init/check + loop overhead. Cheap cache-key wins would be the highest-leverage optimization.
+- The self-audit in `setUpMatchOnlyWorst` passed — `UA_KT107` still matches the last tablet key (currently `GenericTablet`). If a future release reorders tablet rules, the audit throws and this fixture needs refreshing.
+
+---
+
+## Template (copy this block, do not fill it in-place)
+
+```md
+## YYYY-MM-DD —
+
+- Branch / base: `` @ ``
+- PHP: `` (), run via ``
+- Host:
+- PHPBench config: `iterations=N, revs=N, warmup=N, retry_threshold=N` (percent; from `/phpbench.json`)
+- Subjects: N, Assertions: N, Failures: N, Errors: N
+
+| Subject | ops/s | rstdev |
+|---|---:|---:|
+| `benchFoo` | N | ±N% |
+| ... | | |
+
+### Notes
+
+- Interpretation bullet 1
+- Interpretation bullet 2
+- Any self-audit / fixture / regression notes
+
+---
+```
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/README-EXAMPLES.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/README-EXAMPLES.md
new file mode 100644
index 0000000000..e1015a9dda
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/README-EXAMPLES.md
@@ -0,0 +1,389 @@
+# MobileDetect Usage Examples
+
+This document provides code examples for common MobileDetect usage scenarios.
+
+## Basic Usage
+
+### Installation
+
+```bash
+composer require mobiledetect/mobiledetectlib
+```
+
+### Simple Detection
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+if ($detect->isMobile()) {
+ // Any mobile device (phones or tablets)
+}
+
+if ($detect->isTablet()) {
+ // Tablets only
+}
+
+if ($detect->isMobile() && !$detect->isTablet()) {
+ // Phones only
+}
+```
+
+### Detect Specific Devices
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+// Detect specific platforms
+if ($detect->isiOS()) {
+ // iOS device
+}
+
+if ($detect->isAndroidOS()) {
+ // Android device
+}
+
+// Detect specific devices
+if ($detect->isiPhone()) {
+ // iPhone
+}
+
+if ($detect->isiPad()) {
+ // iPad
+}
+
+if ($detect->isSamsung()) {
+ // Samsung device
+}
+
+if ($detect->isSamsungTablet()) {
+ // Samsung tablet
+}
+```
+
+### Detect Browsers
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+if ($detect->isChrome()) {
+ // Chrome browser
+}
+
+if ($detect->isSafari()) {
+ // Safari browser
+}
+
+if ($detect->isFirefox()) {
+ // Firefox browser
+}
+
+if ($detect->isOpera()) {
+ // Opera browser
+}
+
+if ($detect->isEdge()) {
+ // Edge browser
+}
+```
+
+### Get Version Information
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+// Get version as string
+$iOSVersion = $detect->version('iOS'); // e.g., "15_0"
+
+// Get version as float
+$iOSVersion = $detect->version('iOS', 'float'); // e.g., 15.0
+
+// Get browser versions
+$chromeVersion = $detect->version('Chrome');
+$safariVersion = $detect->version('Safari');
+```
+
+## Advanced Usage
+
+### Manual User-Agent Setting
+
+```php
+use Detection\MobileDetect;
+
+// Disable auto-initialization for better performance
+$detect = new MobileDetect(null, ['autoInitOfHttpHeaders' => false]);
+
+// Set User-Agent manually
+$detect->setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X)...');
+
+if ($detect->isMobile()) {
+ // Handle mobile
+}
+```
+
+### Custom HTTP Headers
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+// Set custom headers (useful for proxy/CDN scenarios)
+$detect->setHttpHeaders([
+ 'HTTP_USER_AGENT' => 'Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X)...',
+ 'HTTP_ACCEPT' => 'text/html,application/xhtml+xml...',
+]);
+```
+
+### Using the `is()` Method
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+// Generic check using rule name
+$detect->is('iOS'); // Same as $detect->isiOS()
+$detect->is('iPhone'); // Same as $detect->isiPhone()
+$detect->is('Chrome'); // Same as $detect->isChrome()
+$detect->is('mobile'); // Same as $detect->isMobile()
+$detect->is('tablet'); // Same as $detect->isTablet()
+```
+
+### Custom Cache Implementation
+
+```php
+use Detection\MobileDetect;
+use Detection\Cache\Cache;
+use Psr\SimpleCache\CacheInterface;
+
+// Use any PSR-16 compatible cache
+$redisCache = new YourRedisCacheAdapter();
+
+$detect = new MobileDetect($redisCache);
+
+// Or tune the bundled in-memory cache's max entries
+// (default is 1000; entries beyond the cap are evicted FIFO).
+$detect = new MobileDetect(new Cache(5000));
+```
+
+### Custom Cache Key Function
+
+```php
+use Detection\MobileDetect;
+
+// Custom cache key with salt
+$detect = new MobileDetect(null, [
+ 'cacheKeyFn' => fn($key) => sha1($key . 'my-salt'),
+]);
+
+// Or use a different hashing algorithm
+$detect = new MobileDetect(null, [
+ 'cacheKeyFn' => fn($key) => md5($key),
+]);
+```
+
+### Custom Cache TTL
+
+```php
+use Detection\MobileDetect;
+use DateInterval;
+
+// TTL as integer (seconds)
+$detect = new MobileDetect(null, [
+ 'cacheTtl' => 3600, // 1 hour
+]);
+
+// TTL as DateInterval
+$detect = new MobileDetect(null, [
+ 'cacheTtl' => new DateInterval('PT2H'), // 2 hours
+]);
+```
+
+## Long-Running Processes
+
+When using MobileDetect in CLI scripts, workers, or daemons (RoadRunner, Laravel Octane, FrankenPHP worker mode, Swoole,
+ReactPHP, queue workers) that reuse a single `MobileDetect` instance across many distinct User-Agents,
+the in-memory cache would otherwise grow without bound.
+
+**Default-safe since 4.11.0**: the bundled `Detection\Cache\Cache` enforces a hard cap (1000 entries by default, FIFO eviction).
+Tune via `new Cache($n)` for higher legitimate UA cardinality, or inject a different PSR-16 adapter (Redis, APCu, Memcached, Filesystem) —
+that adapter's eviction policy is then the operator's responsibility. Note that `evictExpired()` only removes entries whose TTL has elapsed;
+under the default 86 400 s TTL it does **not** bound cache size by cardinality.
+
+Use the `$maxEntries` cap (or `clear()`) for that.
+
+### Worker Example
+
+```php
+use Detection\MobileDetect;
+use Detection\Cache\Cache;
+
+$detect = new MobileDetect();
+$cache = $detect->getCache();
+
+$iterationCount = 0;
+
+while ($userAgent = getNextUserAgentFromQueue()) {
+ $detect->setUserAgent($userAgent);
+
+ $isMobile = $detect->isMobile();
+ $isTablet = $detect->isTablet();
+
+ // Process the result...
+ processDevice($userAgent, $isMobile, $isTablet);
+
+ $iterationCount++;
+
+ // The bundled Cache is bounded by default (1000 entries, FIFO).
+ // Optionally reset it periodically as a belt-and-braces measure.
+ if ($iterationCount % 1000 === 0 && $cache instanceof Cache) {
+ $cache->clear();
+ }
+}
+```
+
+### Batch Processing Example
+
+```php
+use Detection\MobileDetect;
+use Detection\Cache\Cache;
+
+$detect = new MobileDetect();
+
+// Process a large batch of User-Agents. The bundled Cache caps itself
+// at 1000 entries by default, so memory stays bounded even if the file
+// contains millions of unique UAs.
+$userAgents = file('user-agents.txt', FILE_IGNORE_NEW_LINES);
+
+foreach ($userAgents as $index => $ua) {
+ $detect->setUserAgent($ua);
+
+ $results[] = [
+ 'ua' => $ua,
+ 'mobile' => $detect->isMobile(),
+ 'tablet' => $detect->isTablet(),
+ ];
+}
+
+// Optional: drop the cache entirely once the batch is done.
+$cache = $detect->getCache();
+if ($cache instanceof Cache) {
+ $cache->clear();
+}
+```
+
+## Framework Integration
+
+### Laravel Middleware Example
+
+```php
+namespace App\Http\Middleware;
+
+use Closure;
+use Detection\MobileDetect;
+use Illuminate\Http\Request;
+
+class DetectMobileDevice
+{
+ public function handle(Request $request, Closure $next)
+ {
+ $detect = new MobileDetect();
+
+ $request->attributes->set('is_mobile', $detect->isMobile());
+ $request->attributes->set('is_tablet', $detect->isTablet());
+
+ return $next($request);
+ }
+}
+```
+
+### Symfony Service Example
+
+```php
+// config/services.yaml
+services:
+ Detection\MobileDetect:
+ public: true
+```
+
+```php
+// In a controller
+use Detection\MobileDetect;
+
+class MyController
+{
+ public function index(MobileDetect $detect)
+ {
+ if ($detect->isMobile()) {
+ return $this->render('mobile/index.html.twig');
+ }
+
+ return $this->render('desktop/index.html.twig');
+ }
+}
+```
+
+## CloudFront Integration
+
+MobileDetect automatically recognizes Amazon CloudFront headers for device detection.
+
+```php
+use Detection\MobileDetect;
+
+// When behind CloudFront with device detection enabled,
+// these headers are automatically used:
+// - HTTP_CLOUDFRONT_IS_MOBILE_VIEWER
+// - HTTP_CLOUDFRONT_IS_TABLET_VIEWER
+// - HTTP_CLOUDFRONT_IS_DESKTOP_VIEWER
+
+$detect = new MobileDetect();
+
+// Works automatically when CloudFront headers are present
+if ($detect->isMobile()) {
+ // Mobile device detected via CloudFront
+}
+```
+
+## Debugging
+
+### Get Matching Information
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+$detect->setUserAgent('Mozilla/5.0 (iPhone; CPU iPhone OS 15_0 like Mac OS X)...');
+
+$detect->isMobile();
+
+// Get the regex that matched
+$matchingRegex = $detect->getMatchingRegex();
+
+// Get the matches array
+$matches = $detect->getMatchesArray();
+```
+
+### Access Cache Directly
+
+```php
+use Detection\MobileDetect;
+
+$detect = new MobileDetect();
+
+// Get the cache instance
+$cache = $detect->getCache();
+
+// Check cached keys (for debugging)
+if ($cache instanceof \Detection\Cache\Cache) {
+ $keys = $cache->getKeys();
+ print_r($keys);
+}
+```
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/README.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/README.md
index ed31b5857e..1a117f2a36 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/README.md
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/README.md
@@ -3,34 +3,37 @@
MobileDetect, PHP mobile detection class
========================================
-
-
-
-
-
+[](https://github.com/serbanghita/Mobile-Detect/actions/workflows/4.x-test.yml)
+[](https://packagist.org/packages/mobiledetect/mobiledetectlib)
+[](https://github.com/serbanghita/Mobile-Detect/tags)
+[](https://packagist.org/packages/mobiledetect/mobiledetectlib/stats)
+[](https://packagist.org/packages/mobiledetect/mobiledetectlib/stats)
+[](https://github.com/serbanghita/Mobile-Detect/blob/4.x/LICENSE)
Mobile Detect is a lightweight PHP class for detecting mobile devices (including tablets).
It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.
## Before you install
-There are three versions of MobileDetect.
-`4.8.x` is the main version that is ALWAYS going to be updated first.
+MobileDetect is maintained on one rolling branch per major line. Tags follow the pattern `..` and always live on the matching branch.
-| Version | Tests | Namespace | Code | PHP Version | Status |
-|---------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------|------------------------------------------------------------------|-------------|----------------------|
-| 2.8.x | [](https://github.com/serbanghita/Mobile-Detect/actions/workflows/test.yml) | `\Mobile_Detect` | [2.8](https://github.com/serbanghita/Mobile-Detect/tree/2.8.x) | \>=5.0,<7.0 | Deprecated |
-| 3.74.x | [](https://github.com/serbanghita/Mobile-Detect/actions/workflows/test.yml) | `Detection\MobileDetect` | [3.74](https://github.com/serbanghita/Mobile-Detect/tree/3.74.x) | \>=7.4,<8.0 | LTS |
-| 4.8.x | [](https://github.com/serbanghita/Mobile-Detect/actions/workflows/test.yml) | `Detection\MobileDetect` | [4.8](https://github.com/serbanghita/Mobile-Detect/tree/4.8.x) | \>=8.0 | Current, **Recommended** |
+| Version | Tests | Namespace | Branch | PHP Version | Purpose |
+|---------|-------|--------------------------|-----------------------------------------------------------------|--------------|--------------------------|
+| 2.* | [](https://github.com/serbanghita/Mobile-Detect/actions/workflows/2.x-test.yml) | `\Mobile_Detect` | [`2.x`](https://github.com/serbanghita/Mobile-Detect/tree/2.x) | \>=5.6,<7.0 | Deprecated |
+| 3.* | [](https://github.com/serbanghita/Mobile-Detect/actions/workflows/3.x-test.yml) | `Detection\MobileDetect` | [`3.x`](https://github.com/serbanghita/Mobile-Detect/tree/3.x) | \>=7.4,<8.0 | LTS |
+| 4.* | [](https://github.com/serbanghita/Mobile-Detect/actions/workflows/4.x-test.yml) | `Detection\MobileDetect` | [`4.x`](https://github.com/serbanghita/Mobile-Detect/tree/4.x) | \>=8.2 (since 4.10.0, previously \>=8.0) | Current, **Recommended** |
## 🤝 Supporting
-If you are using Mobile Detect open-source package in your production apps, in presentation demos, hobby projects, school projects or so, you can sponsor my work by [donating a small amount :+1:](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mobiledetectlib%40gmail%2ecom&lc=US&item_name=Mobile%20Detect¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted). I'm currently paying for hosting and spend a lot of my family time to maintain the project and planning the future releases. I would highly appreciate any money donations.
+If you are using Mobile Detect open-source package in your production apps, in presentation demos, hobby projects,
+school projects or so, you can sponsor my work by [donating a small amount :+1:](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=mobiledetectlib%40gmail%2ecom&lc=US&item_name=Mobile%20Detect¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted).
+
+I'm currently paying for domains, hosting and spend a lot of my family time to maintain the project and planning the future
+releases. I would highly appreciate any money donations.
Special thanks to:
* the community :+1: for donations, submitting patches and issues
-* the JetBrains team for the open-source licenses for [PHPStorm IDE](https://www.jetbrains.com/phpstorm/)
* [Gitbook](https://www.gitbook.com/) team for the open-source license for their technical documentation tool.
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/RESEARCH.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/RESEARCH.md
new file mode 100644
index 0000000000..e98948310a
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/RESEARCH.md
@@ -0,0 +1,40 @@
+# Research Methodology for Adding New Device Models
+
+How to find new tablet (or phone) models from a vendor and add them to Mobile-Detect.
+
+## Step 1 -- Identify new models
+
+- Browse the vendor's website across regions to find new devices:
+ - Samsung: samsung.com/us/tablets/, samsung.com/uk/tablets/, samsung.com/global/
+ - Check both the main Catalog section and the Support section for model codes
+- Use GSMArena (gsmarena.com) -- search for e.g. `samsung galaxy tab` and filter by announcement year. Each device page lists all SM-XXXX model variants (Wi-Fi, LTE, 5G, regional suffixes like N, B, F)
+- Check SamMobile (sammobile.com) for Samsung-specific coverage
+- Cross-reference with the existing regex in `src/MobileDetect.php` (search for `SamsungTablet`) and test fixtures in `tests/providers/vendors/Samsung.php` to identify what's missing
+
+## Step 2 -- Find User-Agent strings
+
+- Search UA databases: user-agents.net, whatismybrowser.com, deviceatlas.com, udger.com
+- Search for `"SM-XXXX" user agent` on the web
+- Check Samsung's developer docs: https://developer.samsung.com/internet/user-agent-string-format.html
+- If real UAs aren't available (device too new), construct them using the standard Chrome pattern:
+ ```
+ Mozilla/5.0 (Linux; Android {version}; {model}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/{version}.0.0.0 Safari/537.36
+ ```
+ Use the Android version the device ships with (from GSMArena specs) and a Chrome version contemporary to the device's release date.
+
+## Step 3 -- Add to codebase
+
+- Add model numbers to the appropriate regex array in `src/MobileDetect.php` (e.g., `$tabletDevices['SamsungTablet']`)
+- Add test fixture entries in `tests/providers/vendors/{Vendor}.php`
+- Run `vendor/bin/phpunit -v -c tests/phpunit.xml` to verify
+
+## Samsung model number conventions
+
+- `SM-T###` -- Standard Galaxy Tab series
+- `SM-X###` -- Newer Galaxy Tab S / Tab A series (2022+)
+- `SM-P###` -- Galaxy Tab with S Pen (Tab S6 Lite, etc.)
+- Suffixes: no suffix = Wi-Fi, `B` = global 5G, `N` = Korean, `U` = US carrier, `F` = regional LTE variant
+
+## Note on User-Agent Reduction
+
+Chrome 110+ began rolling out UA reduction, replacing the device model name with `K`. Samsung Browser v24+ also uses `K`. However, many devices and browsers still send the full model number. The library's detection depends on model-number matching, so we continue to add model patterns. Long-term, Client Hints (`Sec-CH-UA-Model`) support may be needed.
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/composer.json b/tools/mobile_detect/mobiledetect/mobiledetectlib/composer.json
index 8e5f05ea55..743a000698 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/composer.json
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/composer.json
@@ -14,16 +14,15 @@
}
],
"require": {
- "php": ">=8.0",
- "psr/simple-cache": "^3",
- "psr/cache": "^3.0"
+ "php": ">=8.2",
+ "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^v3.65.0",
- "phpunit/phpunit": "^9.6.18",
- "squizlabs/php_codesniffer": "^3.11.1",
- "phpbench/phpbench": "^1.2",
- "phpstan/phpstan": "^1.12.x-dev"
+ "friendsofphp/php-cs-fixer": "3.95.1",
+ "phpunit/phpunit": "9.6.34",
+ "squizlabs/php_codesniffer": "3.13.5",
+ "phpbench/phpbench": "1.6.1",
+ "phpstan/phpstan": "2.1.47"
},
"autoload": {
"psr-4": {
@@ -35,7 +34,21 @@
"DetectionTests\\": "tests/"
}
},
+ "scripts": {
+ "bench": "phpbench run --report=aggregate",
+ "bench:baseline": "phpbench run --report=aggregate --tag=baseline --dump-file=phpbench-baseline.xml",
+ "bench:compare": "phpbench run --ref=baseline --report=aggregate"
+ },
"archive": {
- "exclude": ["scripts"]
+ "exclude": [
+ "scripts",
+ "tests",
+ "docs",
+ ".github",
+ ".editorconfig",
+ ".gitattributes",
+ "phpbench.json",
+ "phpbench-*.xml"
+ ]
}
}
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/docker-compose.yml b/tools/mobile_detect/mobiledetect/mobiledetectlib/docker-compose.yml
index 2ff2cee3f4..bb206e50b5 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/docker-compose.yml
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/docker-compose.yml
@@ -3,11 +3,16 @@ services:
build:
context: .
dockerfile: ./docker/Dockerfile.setup
+ platform: linux/amd64
+ volumes:
+ - ./vendor:/app/vendor
+ # Example: docker compose -p mobile-detect up --build runUnitTests
runUnitTests:
# Need xdebug from this image to run with coverage
# https://hub.docker.com/r/alcohol/php/tags
- image: alcohol/php:8.3-xdebug
+ image: alcohol/php:8.4-xdebug
+ platform: linux/amd64
depends_on:
setup:
condition: service_completed_successfully
@@ -15,23 +20,26 @@ services:
environment:
XDEBUG_MODE: coverage
command: >
- /bin/sh -c "vendor/bin/phpunit -v -c tests/phpunit.xml --coverage-html ./coverage --strict-coverage --stop-on-risky"
+ /bin/sh -c "vendor/bin/phpunit -v -c tests/phpunit.xml --coverage-html .coverage --strict-coverage --stop-on-risky"
volumes:
- .:/app
runPerfTests:
- image: php:8.3-rc-alpine3.18
+ image: php:8.4-alpine
+ platform: linux/amd64
depends_on:
setup:
condition: service_completed_successfully
working_dir: /app
+ # Path/iterations/revs/warmup/retry-threshold come from /phpbench.json.
command: >
- /bin/sh -c "vendor/bin/phpbench run tests/benchmark/MobileDetectBench.php --retry-threshold=1 --iterations=10 --revs=1000 --report=aggregate"
+ /bin/sh -c "vendor/bin/phpbench run --report=aggregate"
volumes:
- .:/app
runLinting:
- image: php:8.3-rc-alpine3.18
+ image: php:8.4-alpine
+ platform: linux/amd64
depends_on:
setup:
condition: service_completed_successfully
@@ -41,18 +49,41 @@ services:
volumes:
- .:/app
- generateModel:
- image: php:8.3-rc-alpine3.18
+ runQualityCheck:
+ image: php:8.4-alpine
+ platform: linux/amd64
depends_on:
setup:
condition: service_completed_successfully
+ working_dir: /app
+ command: >
+ /bin/sh -c "vendor/bin/phpstan analyse --debug --memory-limit=1G --level 3 src tests"
+ volumes:
+ - .:/app
+
+ # Pre-release validation gate - runs all checks
+ # Usage: docker compose -p mobile-detect up --build runAll
+ runAll:
+ image: php:8.4-alpine
+ platform: linux/amd64
+ depends_on:
+ runLinting:
+ condition: service_completed_successfully
+ runQualityCheck:
+ condition: service_completed_successfully
runUnitTests:
condition: service_completed_successfully
runPerfTests:
condition: service_completed_successfully
- runLinting:
- condition: service_completed_successfully
+ command: >
+ /bin/sh -c "echo '✅ All pre-release checks passed!'"
+ generateJsonModel:
+ image: php:8.4-alpine
+ platform: linux/amd64
+ depends_on:
+ runAll:
+ condition: service_completed_successfully
working_dir: /app
command: >
/bin/sh -c "php ./scripts/export_to_json.php"
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/Dockerfile.setup b/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/Dockerfile.setup
index 41d1245091..2813c31fad 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/Dockerfile.setup
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/Dockerfile.setup
@@ -2,8 +2,6 @@ FROM composer:latest AS build
WORKDIR /app
COPY . .
COPY ./docker/build.sh .
-RUN pwd
-# Make the script executable
SHELL ["/bin/bash", "-c"]
RUN chmod +x build.sh
-RUN ./build.sh
+CMD ["./build.sh"]
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/build.sh b/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/build.sh
index 1a0cde6a0d..a87f467bb7 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/build.sh
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/docker/build.sh
@@ -1,6 +1,7 @@
echo "Start building ..."
-rm -rf vendor
+rm -rf vendor/*
rm -f composer.lock composer.phar
set -xe
# Install composer with dev dependencies so we can run tests.
-composer install --dev
+# Compose installs by default the dev dependencies.
+composer install
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/phpbench.json b/tools/mobile_detect/mobiledetect/mobiledetectlib/phpbench.json
deleted file mode 100644
index 0df230f5ad..0000000000
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/phpbench.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "$schema":"./vendor/phpbench/phpbench/phpbench.schema.json",
- "runner.bootstrap": "vendor/autoload.php"
-}
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/Cache.php b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/Cache.php
index 0a08a612c9..ac87299ffe 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/Cache.php
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/Cache.php
@@ -1,104 +1,324 @@
cache_db);
+ $this->maxEntries = $maxEntries;
}
/**
- * @return array{string}
+ * @param string $key
+ * @param mixed $default
+ * @return mixed
+ * @throws CacheInvalidArgumentException
*/
- public function getKeys(): array
+ public function get($key, mixed $default = null): mixed
{
- return array_keys($this->cache_db);
+ $key = $this->checkKey($key);
+
+ if (isset($this->cache[$key])) {
+ if ($this->cache[$key]['ttl'] === null || $this->cache[$key]['ttl'] > time()) {
+ return $this->cache[$key]['content'];
+ }
+
+ $this->deleteSingle($key);
+ }
+
+ return $default;
}
/**
- * @throws CacheException
+ * @param string $key
+ * @param mixed $value
+ * @param int|DateInterval|null $ttl
+ * @throws CacheInvalidArgumentException
*/
- public function get(string $key, mixed $default = null): CacheItem|null
+ public function set($key, mixed $value, $ttl = null): bool
{
- if (empty($key)) {
- throw new CacheException('Invalid cache key');
+ $key = $this->checkKey($key);
+ $ttl = $this->checkTtl($ttl);
+
+ // From https://www.php-fig.org/psr/psr-16/ "Definitions" -> "Expiration"
+ // If a negative or zero TTL is provided, the item MUST be deleted from the cache if it exists, as it is expired already.
+ if (is_int($ttl) && $ttl <= 0) {
+ $this->deleteSingle($key);
+ return false;
}
- return $this->cache_db[$key] ?? null;
+ $ttl = $this->getTTL($ttl);
+
+ if ($ttl !== null) {
+ $ttl = (time() + $ttl);
+ }
+
+ // FIFO eviction: if inserting a new key would exceed the cap, drop the oldest first.
+ // Overwriting an existing key never triggers eviction.
+ if (!isset($this->cache[$key]) && count($this->cache) >= $this->maxEntries) {
+ unset($this->cache[array_key_first($this->cache)]);
+ }
+
+ $this->cache[$key] = ['ttl' => $ttl, 'content' => $value];
+
+ return true;
}
/**
- * @throws CacheException
+ * @param string $key
+ * @throws CacheInvalidArgumentException
*/
- public function set(string $key, mixed $value, \DateInterval|int|null $ttl = null): bool
+ public function delete($key): bool
{
- if (empty($key)) {
- throw new CacheException('Invalid cache key');
- }
- $item = new CacheItem($key, $value);
- $item->expiresAfter($ttl);
- $this->cache_db[$key] = $item;
+ $key = $this->checkKey($key);
+ $this->deleteSingle($key);
+
return true;
}
- public function delete(string $key): bool
+ /**
+ * Deletes the cache item from memory.
+ */
+ private function deleteSingle(string $key): void
{
- unset($this->cache_db[$key]);
- return true;
+ unset($this->cache[$key]);
}
+ /** @inheritdoc */
public function clear(): bool
{
- $this->cache_db = [];
+ $this->cache = [];
+
return true;
}
- public function getMultiple(iterable $keys, mixed $default = null): iterable
+ /**
+ * @param string $key
+ * @throws CacheInvalidArgumentException
+ */
+ public function has($key): bool
{
- return array_reduce((array)$keys, function ($result, $key) {
- $result[$key] = $this->get($key);
- return $result;
- }, []);
+ $key = $this->checkKey($key);
+
+ if (isset($this->cache[$key])) {
+ if ($this->cache[$key]['ttl'] === null || $this->cache[$key]['ttl'] > time()) {
+ return true;
+ }
+
+ $this->deleteSingle($key);
+ }
+
+ return false;
+ }
+
+ /**
+ * @param iterable $keys
+ * @param mixed $default
+ * @throws CacheInvalidArgumentException
+ */
+ public function getMultiple($keys, mixed $default = null): iterable
+ {
+ $keys = $this->checkIterable($keys, 'keys');
+
+ $data = [];
+ foreach ($keys as $key) {
+ $data[$key] = $this->get($key, $default);
+ }
+
+ return $data;
}
/**
- * @param array $values
- * @param \DateInterval|int|null $ttl
- * @return bool
- * @throws CacheException
+ * @param iterable $values
+ * @param int|DateInterval|null $ttl
+ * @throws CacheInvalidArgumentException
*/
- public function setMultiple(iterable $values, \DateInterval|int|null $ttl = null): bool
+ public function setMultiple($values, $ttl = null): bool
{
+ $values = $this->checkIterable($values, 'values');
+ $ttl = $this->checkTtl($ttl);
+
+ $return = [];
foreach ($values as $key => $value) {
- $this->set($key, $value, $ttl);
+ $return[] = $this->set($key, $value, $ttl);
}
- return true;
+
+ return $this->checkReturn($return);
}
- public function deleteMultiple(iterable $keys): bool
+ /**
+ * @param iterable $keys
+ * @throws CacheInvalidArgumentException
+ */
+ public function deleteMultiple($keys): bool
{
+ $keys = $this->checkIterable($keys, 'keys');
+
foreach ($keys as $key) {
- unset($this->cache_db[$key]);
+ $this->delete($key);
}
+
return true;
}
- public function has(string $key): bool
+ /**
+ * @param mixed $key
+ * @throws CacheInvalidArgumentException
+ */
+ protected function checkKey($key): string
{
- return isset($this->cache_db[$key]);
+ if (!is_string($key)) {
+ throw new CacheInvalidArgumentException('Cache key must be a string.');
+ }
+
+ if ($key === '' || !preg_match('/^[A-Za-z0-9_.]{1,64}$/', $key)) {
+ throw new CacheInvalidArgumentException("Invalid key: '$key'. Must be alphanumeric, can contain _ and . and can be maximum of 64 chars.");
+ }
+
+ return $key;
+ }
+
+ /**
+ * @param mixed $ttl
+ * @throws CacheInvalidArgumentException
+ */
+ protected function checkTtl($ttl): int|DateInterval|null
+ {
+ if ($ttl !== null && !is_int($ttl) && !($ttl instanceof DateInterval)) {
+ throw new CacheInvalidArgumentException('TTL must be null, int, or DateInterval.');
+ }
+
+ return $ttl;
+ }
+
+ /**
+ * @param mixed $iterable
+ * @return iterable
+ * @throws CacheInvalidArgumentException
+ */
+ protected function checkIterable($iterable, string $argName): iterable
+ {
+ if (!is_iterable($iterable)) {
+ throw new CacheInvalidArgumentException(sprintf('%s must be iterable.', ucfirst($argName)));
+ }
+
+ return $iterable;
+ }
+
+ protected function getTTL(DateInterval|int|null $ttl): ?int
+ {
+ if ($ttl instanceof DateInterval) {
+ return (new DateTime())->add($ttl)->getTimestamp() - time();
+ }
+
+ // We treat 0 as a valid value.
+ if (is_int($ttl)) {
+ return $ttl;
+ }
+
+ return null;
+ }
+
+ /**
+ * @param bool[]|int[] $booleans
+ */
+ protected function checkReturn(array $booleans): bool
+ {
+ foreach ($booleans as $boolean) {
+ if (!$boolean) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Get all cache keys.
+ *
+ * @internal Needed for testing purposes.
+ * @return array{string}
+ */
+ public function getKeys(): array
+ {
+ return array_keys($this->cache);
+ }
+
+ /**
+ * Get the configured maximum number of cache entries.
+ */
+ public function getMaxEntries(): int
+ {
+ return $this->maxEntries;
+ }
+
+ /**
+ * Evict all expired items from the cache.
+ *
+ * Removes only entries whose TTL has already elapsed (`ttl <= time()`).
+ * Entries with a null TTL or a TTL still in the future are kept.
+ *
+ * This is bounded by *expiration*, not by *cardinality*: under the default
+ * cacheTtl of 86400 seconds, repeated calls during a single run typically
+ * evict zero entries. For cardinality bounding (the case that matters in
+ * long-running workers facing attacker-controlled keys) the in-memory
+ * Cache enforces a hard cap; see $maxEntries / the constructor.
+ *
+ * @return int Number of items evicted
+ */
+ public function evictExpired(): int
+ {
+ $evicted = 0;
+ $now = time();
+
+ foreach ($this->cache as $key => $item) {
+ if ($item['ttl'] !== null && $item['ttl'] <= $now) {
+ unset($this->cache[$key]);
+ $evicted++;
+ }
+ }
+
+ return $evicted;
}
}
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/CacheException.php b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/CacheException.php
index e23bcd8ac4..b90f0005d8 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/CacheException.php
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Cache/CacheException.php
@@ -1,16 +1,9 @@
true)
- */
- protected bool|null $value = null;
- /**
- * @var DateTimeInterface|null
- */
- public DateTimeInterface|null $expiresAt = null;
- /**
- * @var DateInterval|null
- */
- public DateInterval|null $expiresAfter = null;
-
- public function __construct($key, $value = null)
- {
- $this->key = $key;
- if (!is_null($value)) {
- $this->value = $value;
- }
- }
-
- /**
- * @return string
- */
- public function getKey(): string
- {
- return $this->key;
- }
-
- /**
- * @return bool|null
- */
- public function get(): ?bool
- {
- return $this->value;
- }
-
- /**
- * @return bool
- */
- public function isHit(): bool
- {
- // Item never expires.
- if ($this->expiresAt === null && $this->expiresAfter === null) {
- return true;
- }
-
- if (!is_null($this->expiresAt) && $this->expiresAt > new DateTime()) {
- return true;
- }
-
- if (!is_null($this->expiresAfter)) {
- try {
- $future_date = (new DateTime())->add($this->expiresAfter);
- } catch (\Exception $e) {
- return false;
- }
-
- if ($future_date > new DateTime()) {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * @param mixed $value
- * @return $this
- */
- public function set(mixed $value): static
- {
- $this->value = $value;
- return $this;
- }
-
- /**
- * @param \DateTimeInterface|null $expiration
- * @return $this
- */
- public function expiresAt(?\DateTimeInterface $expiration): static
- {
- $this->expiresAt = $expiration instanceof \DateTime ? $expiration : null;
-
- return $this;
- }
-
- /**
- * @param int|\DateInterval|null $time
- * @return $this
- */
- public function expiresAfter(\DateInterval|int|null $time): static
- {
- $expiresAfter = null;
-
- if ($time instanceof \DateInterval) {
- $expiresAfter = $time;
- } elseif (is_int($time)) {
- if ($time > 0) {
- $expiresAfter = new \DateInterval("PT{$time}S");
- }
- }
-
- $this->expiresAfter = $expiresAfter;
-
- return $this;
- }
-}
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php
index 2667e9b9f7..c0209474bf 100644
--- a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php
@@ -1,5 +1,7 @@
* @author: Victor Stanciu (original author)
*
- * @version 4.8.09
+ * @version 4.11.0
*/
declare(strict_types=1);
@@ -29,10 +29,11 @@
use BadMethodCallException;
use Detection\Cache\Cache;
use Detection\Cache\CacheException;
+use Detection\Cache\CacheInvalidArgumentException;
use Detection\Exception\MobileDetectException;
-use Psr\Cache\CacheItemInterface;
-use Psr\Cache\InvalidArgumentException;
+use Detection\Exception\MobileDetectExceptionCode;
use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\InvalidArgumentException as PsrInvalidArgumentException;
/**
* Auto-generated isXXXX() magic methods.
@@ -241,7 +242,7 @@ class MobileDetect
/**
* Stores the version number of the current release.
*/
- protected string $VERSION = '4.8.09';
+ protected string $VERSION = '4.11.0';
protected array $config = [
// Auto-initialization on HTTP headers from $_SERVER['HTTP...']
@@ -268,12 +269,12 @@ class MobileDetect
/**
* A type for the version() method indicating a string return value.
*/
- private const VERSION_TYPE_STRING = 'text';
+ public const VERSION_TYPE_STRING = 'text';
/**
* A type for the version() method indicating a float return value.
*/
- private const VERSION_TYPE_FLOAT = 'float';
+ public const VERSION_TYPE_FLOAT = 'float';
/**
* The User-Agent HTTP header is stored in here.
@@ -500,9 +501,12 @@ class MobileDetect
// https://en.wikipedia.org/wiki/Pixel_C
'GoogleTablet' => 'Android.*Pixel C',
'SamsungTablet' => [
+ 'SM-X926B|SM-X620|SM-X526B|SM-X520|SM-X626B|SM-X920|SM-X820|SM-X826B|SM-P625|SM-P620|SM-X306B|SM-T730|SM-T976B|SM-T875|SM-T575|SM-T545',
+ 'SM-X210R|SM-X216R|SM-X356B|SM-T860X|SM-T636B|SM-T509|SM-T503|SM-T720X|SM-T570|SM-T540|SM-T510X|SM-T830X|SM-T820X|SM-T710X|SM-T810X|SM-T365|SM-T550X|SM-T116',
'SM-X616B|SM-X610|SM-X516B|SM-X910|SM-X916B|SM-X816B|SM-X810|SM-X710|SM-X716B|SM-X510|SM-P619|SM-T225|SM-T225N|SM-T736B|SM-T505|SM-T733|SM-X205|SM-X210|SM-X216B',
'SM-X700|SM-X706|SM-X706B|SM-X706U|SM-X706N|SM-X800|SM-X806|SM-X806B|SM-X806U|SM-X806N|SM-X900|SM-X906|SM-X906B|SM-X906U|SM-X906N|SM-P613|SM-X110|SM-X115',
'SM-T970|SM-T380|SM-T5950|SM-T905|SM-T231|SM-T500|SM-T860|SM-T536|SM-T837A|SM-X200|SM-T220|SM-T870|SM-X906C', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone.
+ 'SM-X930|SM-X930N|SM-X936B|SM-X936N|SM-X730|SM-X736|SM-X736B|SM-X400|SM-X406|SM-X406B|SM-X230|SM-X236B|SM-X133|SM-X135|SM-X135F',
'SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V|SM-P610|SM-T290|SM-T515|SM-T590|SM-T595|SM-T725|SM-T817P|SM-P585N0|SM-T395|SM-T295|SM-T865|SM-P610N|SM-P615',
'SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU',
'SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715',
@@ -560,7 +564,7 @@ class MobileDetect
'TB-X704L|TB-J606F|TB-X606F|TB-X306X|YT-J706X|TB128FU',
'YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X|TB-X704F|TB-X104F|TB3-X70F|TB-X705F|TB-8504F|TB3-X70L|TB3-710F',
'TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F',
- 'Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)',
+ 'Lenovo TB|Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)',
],
// http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets
'DellTablet' => 'Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7',
@@ -1043,6 +1047,14 @@ class MobileDetect
/**
* Construct an instance of this class.
+ *
+ * The bundled in-memory `Detection\Cache\Cache` is bounded by default
+ * (see `Cache::DEFAULT_MAX_ENTRIES`) to prevent unbounded growth in
+ * long-running PHP runtimes where one instance is reused across many
+ * distinct User-Agents (see GHSA-mgj4-qjmw-v56v). To tune the cap, pass
+ * `new Cache($n)` explicitly. To use a different backend (Redis, APCu,
+ * Memcached, Filesystem), inject any PSR-16 `CacheInterface`; the
+ * adapter's eviction policy is then the operator's responsibility.
*/
public function __construct(
?CacheInterface $cache = null,
@@ -1082,16 +1094,16 @@ public function autoInitKnownHttpHeaders(): void
// Go through known HTTP headers that we care about.
// See "4.1.18. Protocol-Specific Meta-Variables" of http://www.faqs.org/rfcs/rfc3875.html
$knownHttpHeaders = array_merge(
- array_values(self::$knownUserAgentHttpHeaders),
- array_keys(self::$knownMobilePositiveHeaders),
- array_values(self::$knownCloudFrontHeaders)
+ array_values(static::$knownUserAgentHttpHeaders),
+ array_keys(static::$knownMobilePositiveHeaders),
+ array_values(static::$knownCloudFrontHeaders)
);
// Did not iterate through global $_SERVER to find ['HTTP...'] header values
// because it's very slow and on some servers it can have more than 50 worthless keys.
-// $httpHeaders = array_filter($_SERVER, function ($key) {
-// return str_starts_with($key, 'HTTP_');
-// }, ARRAY_FILTER_USE_KEY);
+ // $httpHeaders = array_filter($_SERVER, function ($key) {
+ // return str_starts_with($key, 'HTTP_');
+ // }, ARRAY_FILTER_USE_KEY);
$httpHeaders = [];
foreach ($knownHttpHeaders as $headerName) {
if (isset($_SERVER[$headerName])) {
@@ -1137,10 +1149,10 @@ public function setHttpHeaders(array $httpHeaders = []): void
// Override User-Agent string if 'Amazon Cloudfront' specific HTTP headers are present.
if (
- $this->hasHttpHeader(self::$knownCloudFrontHeaders[0]) ||
- $this->hasHttpHeader(self::$knownCloudFrontHeaders[1])
+ $this->hasHttpHeader(static::$knownCloudFrontHeaders[0]) ||
+ $this->hasHttpHeader(static::$knownCloudFrontHeaders[1])
) {
- $this->setUserAgent(self::$cloudFrontUA);
+ $this->setUserAgent(static::$cloudFrontUA);
}
}
@@ -1315,10 +1327,10 @@ public static function getBrowsers(): array
*/
public function getRules(): array
{
- static $rules;
-
- if (!$rules) {
- $rules = array_merge(
+ static $rulesByClass = [];
+ $class = static::class;
+ if (!isset($rulesByClass[$class])) {
+ $rulesByClass[$class] = array_merge(
static::$browsers,
static::$operatingSystems,
static::$phoneDevices,
@@ -1326,7 +1338,7 @@ public function getRules(): array
);
}
- return $rules;
+ return $rulesByClass[$class];
}
/**
@@ -1370,15 +1382,13 @@ public function checkHttpHeadersForMobile(): bool
/**
* Magic overloading method.
*
- * @method boolean is[...]()
* @param string $name
* @param array $arguments
* @return bool
* @throws BadMethodCallException when the method doesn't exist and doesn't start with 'is'
* @throws \Exception
- * @throws InvalidArgumentException
*/
- public function __call(string $name, array $arguments)
+ public function __call(string $name, array $arguments): bool
{
// make sure the name starts with 'is', otherwise
if (!str_starts_with($name, 'is')) {
@@ -1399,7 +1409,7 @@ public function __call(string $name, array $arguments)
public function isMobile(): bool
{
if (!$this->hasUserAgent()) {
- throw new MobileDetectException('No valid user-agent has been set.');
+ throw new MobileDetectException('No valid user-agent has been set.', MobileDetectExceptionCode::INVALID_USER_AGENT_ERR);
}
if ($this->isUserAgentEmpty()) {
@@ -1411,16 +1421,12 @@ public function isMobile(): bool
$cacheKey = $this->createCacheKey("mobile");
$cacheItem = $this->cache->get($cacheKey);
if ($cacheItem !== null) {
- if ($cacheItem instanceof CacheItemInterface) {
- return $cacheItem->get();
- } else {
- return $cacheItem;
- }
+ return $cacheItem;
}
// Special case: Amazon CloudFront mobile viewer
if (
- $this->getUserAgent() === self::$cloudFrontUA &&
+ $this->getUserAgent() === static::$cloudFrontUA &&
$this->getHttpHeader('HTTP_CLOUDFRONT_IS_MOBILE_VIEWER') === 'true'
) {
$this->cache->set($cacheKey, true, $this->config['cacheTtl']);
@@ -1435,8 +1441,8 @@ public function isMobile(): bool
$this->cache->set($cacheKey, $result, $this->config['cacheTtl']);
return $result;
}
- } catch (CacheException $e) {
- throw new MobileDetectException("Cache problem in isMobile(): {$e->getMessage()}");
+ } catch (CacheInvalidArgumentException | CacheException | PsrInvalidArgumentException $e) {
+ throw new MobileDetectException("Cache problem in isMobile(): {$e->getMessage()}", MobileDetectExceptionCode::IS_MOBILE_ERR, $e);
}
}
@@ -1449,7 +1455,7 @@ public function isMobile(): bool
public function isTablet(): bool
{
if (!$this->hasUserAgent()) {
- throw new MobileDetectException('No user-agent has been set.');
+ throw new MobileDetectException('No user-agent has been set.', MobileDetectExceptionCode::INVALID_USER_AGENT_ERR);
}
if ($this->isUserAgentEmpty()) {
@@ -1461,16 +1467,12 @@ public function isTablet(): bool
$cacheKey = $this->createCacheKey("tablet");
$cacheItem = $this->cache->get($cacheKey);
if ($cacheItem !== null) {
- if ($cacheItem instanceof CacheItemInterface) {
- return $cacheItem->get();
- } else {
- return $cacheItem;
- }
+ return $cacheItem;
}
// Special case: Amazon CloudFront mobile viewer
if (
- $this->getUserAgent() === self::$cloudFrontUA &&
+ $this->getUserAgent() === static::$cloudFrontUA &&
$this->getHttpHeader('HTTP_CLOUDFRONT_IS_TABLET_VIEWER') === 'true'
) {
$this->cache->set($cacheKey, true, $this->config['cacheTtl']);
@@ -1488,27 +1490,27 @@ public function isTablet(): bool
return true;
}
-// if (is_array($_regex)) {
-// foreach ($_regex as $regexString) {
-// $result = $this->match($regexString, $this->getUserAgent());
-// if ($result) {
-// $this->cache->set($cacheKey, true, $this->config['cacheTtl']);
-// return true;
-// }
-// }
-// } else {
-// // assume the regex is a "string"
-// if ($this->match($_regex, $this->getUserAgent())) {
-// $this->cache->set($cacheKey, true, $this->config['cacheTtl']);
-// return true;
-// }
-// }
+ // if (is_array($_regex)) {
+ // foreach ($_regex as $regexString) {
+ // $result = $this->match($regexString, $this->getUserAgent());
+ // if ($result) {
+ // $this->cache->set($cacheKey, true, $this->config['cacheTtl']);
+ // return true;
+ // }
+ // }
+ // } else {
+ // // assume the regex is a "string"
+ // if ($this->match($_regex, $this->getUserAgent())) {
+ // $this->cache->set($cacheKey, true, $this->config['cacheTtl']);
+ // return true;
+ // }
+ // }
}
$this->cache->set($cacheKey, false, $this->config['cacheTtl']);
return false;
- } catch (CacheException $e) {
- throw new MobileDetectException("Cache problem in isTablet(): {$e->getMessage()}");
+ } catch (CacheInvalidArgumentException | CacheException | PsrInvalidArgumentException $e) {
+ throw new MobileDetectException("Cache problem in isTablet(): {$e->getMessage()}", MobileDetectExceptionCode::IS_TABLET_ERR, $e);
}
}
@@ -1522,7 +1524,7 @@ public function isTablet(): bool
public function is(string $ruleName): bool
{
if (!$this->hasUserAgent()) {
- throw new MobileDetectException('No user-agent has been set.');
+ throw new MobileDetectException('No user-agent has been set.', MobileDetectExceptionCode::INVALID_USER_AGENT_ERR);
}
if ($this->isUserAgentEmpty()) {
@@ -1534,11 +1536,7 @@ public function is(string $ruleName): bool
$cacheKey = $this->createCacheKey($ruleName);
$cacheItem = $this->cache->get($cacheKey);
if ($cacheItem !== null) {
- if ($cacheItem instanceof CacheItemInterface) {
- return $cacheItem->get();
- } else {
- return $cacheItem;
- }
+ return $cacheItem;
}
$result = $this->matchUserAgentWithRule($ruleName);
@@ -1546,8 +1544,8 @@ public function is(string $ruleName): bool
// Cache save.
$this->cache->set($cacheKey, $result, $this->config['cacheTtl']);
return $result;
- } catch (CacheException $e) {
- throw new MobileDetectException("Cache problem in is(): {$e->getMessage()}");
+ } catch (CacheInvalidArgumentException | CacheException | PsrInvalidArgumentException $e) {
+ throw new MobileDetectException("Cache problem in is(): {$e->getMessage()}", MobileDetectExceptionCode::IS_MAGIC_ERR, $e);
}
}
@@ -1630,16 +1628,16 @@ protected function matchUserAgentWithRule(string $ruleName): bool
$regexString = implode("|", $_rules[$ruleName]);
}
$result = $this->match($regexString, $this->getUserAgent());
-// if (is_array($_rules[$ruleName])) {
-// foreach($_rules[$ruleName] as $ruleRegex) {
-// $result = $this->match($ruleRegex, $this->getUserAgent());
-// if ($result) {
-// return true;
-// }
-// }
-// } else {
-// $result = $this->match($_rules[$ruleName], $this->getUserAgent());
-// }
+ // if (is_array($_rules[$ruleName])) {
+ // foreach($_rules[$ruleName] as $ruleRegex) {
+ // $result = $this->match($ruleRegex, $this->getUserAgent());
+ // if ($result) {
+ // return true;
+ // }
+ // }
+ // } else {
+ // $result = $this->match($_rules[$ruleName], $this->getUserAgent());
+ // }
}
return $result;
@@ -1654,11 +1652,11 @@ protected function matchUserAgentWithRule(string $ruleName): bool
*/
public function prepareVersionNo(string $ver): float
{
- $ver = str_replace(array('_', ' ', '/'), '.', $ver);
+ $ver = str_replace(['_', ' ', '/'], '.', $ver);
$arrVer = explode('.', $ver, 2);
if (isset($arrVer[1])) {
- $arrVer[1] = @str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
+ $arrVer[1] = str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
}
return (float) implode('.', $arrVer);
@@ -1688,7 +1686,7 @@ public function version(string $propertyName, string $type = self::VERSION_TYPE_
$type = self::VERSION_TYPE_STRING;
}
- $properties = self::getProperties();
+ $properties = static::getProperties();
// Check if the property exists in the properties array.
if (true === isset($properties[$propertyName])) {
@@ -1697,7 +1695,7 @@ public function version(string $propertyName, string $type = self::VERSION_TYPE_
$properties[$propertyName] = (array) $properties[$propertyName];
foreach ($properties[$propertyName] as $propertyMatchString) {
- $propertyPattern = str_replace('[VER]', self::VERSION_REGEX, $propertyMatchString);
+ $propertyPattern = str_replace('[VER]', static::VERSION_REGEX, $propertyMatchString);
// Identify and extract the version.
preg_match(sprintf('#%s#is', $propertyPattern), $this->userAgent, $match);
@@ -1711,12 +1709,15 @@ public function version(string $propertyName, string $type = self::VERSION_TYPE_
return false;
}
- public function getCache(): Cache
+ public function getCache(): CacheInterface
{
return $this->cache;
}
/**
+ * Creates the cache key string based on the defined fn.
+ * Function can be customized in the constructor. See `$config['cacheKeyFn']`.
+ *
* @throws CacheException
*/
protected function createCacheKey(string $key): string
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/src/MobileDetectStandalone.php b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/MobileDetectStandalone.php
new file mode 100644
index 0000000000..17c2651e00
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/src/MobileDetectStandalone.php
@@ -0,0 +1,9 @@
+ $dir . "/../src/Cache/Cache.php",
+ "Detection\Cache\CacheException" => $dir . "/../src/Cache/CacheException.php",
+ "Detection\Cache\CacheInvalidArgumentException" => $dir . "/../src/Cache/CacheInvalidArgumentException.php",
+ "Detection\Exception\MobileDetectException" => $dir . "/../src/Exception/MobileDetectException.php",
+ "Detection\Exception\MobileDetectExceptionCode" => $dir . "/../src/Exception/MobileDetectExceptionCode.php",
+ "Detection\MobileDetect" => $dir . "/../src/MobileDetect.php",
+
+ // "psr/simple-cache"
+ "Psr\SimpleCache\CacheException" => $dir . "/deps/simple-cache/src/CacheException.php",
+ "Psr\SimpleCache\CacheInterface" => $dir . "/deps/simple-cache/src/CacheInterface.php",
+ "Psr\SimpleCache\InvalidArgumentException" => $dir . "/deps/simple-cache/src/InvalidArgumentException.php",
+ ];
+
+ $fileFound = $classMap[$class] ?? false;
+
+ if ($fileFound) {
+ require $fileFound;
+ return true;
+ }
+
+ return false;
+});
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/LICENSE.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/LICENSE.md
new file mode 100644
index 0000000000..e49a7c85a1
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/LICENSE.md
@@ -0,0 +1,21 @@
+# The MIT License (MIT)
+
+Copyright (c) 2016 PHP Framework Interoperability Group
+
+> Permission is hereby granted, free of charge, to any person obtaining a copy
+> of this software and associated documentation files (the "Software"), to deal
+> in the Software without restriction, including without limitation the rights
+> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+> copies of the Software, and to permit persons to whom the Software is
+> furnished to do so, subject to the following conditions:
+>
+> The above copyright notice and this permission notice shall be included in
+> all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+> THE SOFTWARE.
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/README.md b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/README.md
new file mode 100644
index 0000000000..43641d175c
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/README.md
@@ -0,0 +1,8 @@
+PHP FIG Simple Cache PSR
+========================
+
+This repository holds all interfaces related to PSR-16.
+
+Note that this is not a cache implementation of its own. It is merely an interface that describes a cache implementation. See [the specification](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-16-simple-cache.md) for more details.
+
+You can find implementations of the specification by looking for packages providing the [psr/simple-cache-implementation](https://packagist.org/providers/psr/simple-cache-implementation) virtual package.
diff --git a/tools/mobile_detect/psr/cache/composer.json b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/composer.json
similarity index 56%
rename from tools/mobile_detect/psr/cache/composer.json
rename to tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/composer.json
index 4b687971e4..f307a84568 100644
--- a/tools/mobile_detect/psr/cache/composer.json
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/composer.json
@@ -1,7 +1,7 @@
{
- "name": "psr/cache",
- "description": "Common interface for caching libraries",
- "keywords": ["psr", "psr-6", "cache"],
+ "name": "psr/simple-cache",
+ "description": "Common interfaces for simple caching",
+ "keywords": ["psr", "psr-16", "cache", "simple-cache", "caching"],
"license": "MIT",
"authors": [
{
@@ -14,12 +14,12 @@
},
"autoload": {
"psr-4": {
- "Psr\\Cache\\": "src/"
+ "Psr\\SimpleCache\\": "src/"
}
},
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "3.0.x-dev"
}
}
}
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/src/CacheException.php b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/src/CacheException.php
new file mode 100644
index 0000000000..f61b24c2b4
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/src/CacheException.php
@@ -0,0 +1,10 @@
+ $keys A list of keys that can be obtained in a single operation.
+ * @param mixed $default Default value to return for keys that do not exist.
+ *
+ * @return iterable A list of key => value pairs. Cache keys that do not exist or are stale will have $default as value.
+ *
+ * @throws \Psr\SimpleCache\InvalidArgumentException
+ * MUST be thrown if $keys is neither an array nor a Traversable,
+ * or if any of the $keys are not a legal value.
+ */
+ public function getMultiple(iterable $keys, mixed $default = null): iterable;
+
+ /**
+ * Persists a set of key => value pairs in the cache, with an optional TTL.
+ *
+ * @param iterable $values A list of key => value pairs for a multiple-set operation.
+ * @param null|int|\DateInterval $ttl Optional. The TTL value of this item. If no value is sent and
+ * the driver supports TTL then the library may set a default value
+ * for it or let the driver take care of that.
+ *
+ * @return bool True on success and false on failure.
+ *
+ * @throws \Psr\SimpleCache\InvalidArgumentException
+ * MUST be thrown if $values is neither an array nor a Traversable,
+ * or if any of the $values are not a legal value.
+ */
+ public function setMultiple(iterable $values, null|int|\DateInterval $ttl = null): bool;
+
+ /**
+ * Deletes multiple cache items in a single operation.
+ *
+ * @param iterable $keys A list of string-based keys to be deleted.
+ *
+ * @return bool True if the items were successfully removed. False if there was an error.
+ *
+ * @throws \Psr\SimpleCache\InvalidArgumentException
+ * MUST be thrown if $keys is neither an array nor a Traversable,
+ * or if any of the $keys are not a legal value.
+ */
+ public function deleteMultiple(iterable $keys): bool;
+
+ /**
+ * Determines whether an item is present in the cache.
+ *
+ * NOTE: It is recommended that has() is only to be used for cache warming type purposes
+ * and not to be used within your live applications operations for get/set, as this method
+ * is subject to a race condition where your has() will return true and immediately after,
+ * another script can remove it making the state of your app out of date.
+ *
+ * @param string $key The cache item key.
+ *
+ * @return bool
+ *
+ * @throws \Psr\SimpleCache\InvalidArgumentException
+ * MUST be thrown if the $key string is not a legal value.
+ */
+ public function has(string $key): bool;
+}
diff --git a/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/src/InvalidArgumentException.php b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/src/InvalidArgumentException.php
new file mode 100644
index 0000000000..6a9524a20c
--- /dev/null
+++ b/tools/mobile_detect/mobiledetect/mobiledetectlib/standalone/deps/simple-cache/src/InvalidArgumentException.php
@@ -0,0 +1,13 @@
+ PDF issue - PR #855
+
+6.10.1 (2025-11-21)
+ - cI: Add 8.5 to CI matrix - PR #836
+ - Fix PHP 8.5 deprecation for xml_parser_free - PR #835
+ - Fix bad text-align from HTML source - PR #833
+ - Fix image on footer problems - PR #823
+ - Preserving percentage gradient decimals and correctly clamp coordinates - PR #815
+ - Enables compression for PDF/A - PR #820
+
+6.10.0 (2025-05-27)
+ - Embedded files support (Factur-X 1.07 / ZUGFeRD 2.3) #789
+
+6.9.5 (2025-05-27)
+ - Automatically add destinations from HTML code #804
+ - Wrong default value when $table_el['old_cell_padding'] is missing #807
+ - Fixed PHP warning when empty hash link for image exists in HTML #809
+ - Fix for application of alpha component to SVG RGBA fills #810
+
+6.9.4 (2025-05-13)
+ - Update donation link.
+
+6.9.3 (2025-04-20)
+ - New fix for "Deserialization of untrusted data" (check on valid protocols).
+ - Removed global phar configuration.
+
+6.9.2 (2025-04-18)
+ - Quick fix for "Deserialization of untrusted data" security vulnerability reported by Positive Technologies.
+ - Disable phar protocol globally.
+
+6.9.1 (2025-04-03)
+ - Fixed "Path Traversal" security vulnerability reported by Positive Technologies.
+
+6.9.0 (2025-03-30)
+ - Added PHP 8.4 testing.
+ - Removed tcpdf_import.php and tcpdf_parser.php files (for a parser check the tc-lib-pdf-parser project instead).
+ - Fix composer.json.
+
+6.8.2 (2025-01-26)
+ - Fix some annotation flags values.
+ - Remove examples from packaging.
+
+6.8.1 (2025-01-26) - UNTAGGED
+ - Check relative paths on SVG images.
+
+6.8.0 (2024-12-23)
+ - Requires PHP 7.1+ and curl extension.
+ - Escape error message.
+ - Use strict time-constant function to compare TCPDF-tag hashes.
+ - Add K_CURLOPTS config array to set custom cURL options (NOTE: some defaults have changed).
+ - Add some addTTFfont fixes from tc-lib-pdf-font.
+
6.7.8 (2024-12-13)
- Improve SVG detection by checking for (mandatory) namespace.
- Use late state binding now that minimum PHP version is 5.5.
@@ -1780,7 +1850,7 @@
addTOCPage(), endTOCPage(), addHTMLTOC().
5.0.000 (2010-05-05)
- - Method ImageSVG() was added to embedd SVG images (see example n. 58). Note that not all SVG images are supported.
+ - Method ImageSVG() was added to embed SVG images (see example n. 58). Note that not all SVG images are supported.
- Method setRasterizeVectorImages() was added to enable/disable rasterization for vector images via ImageMagick library.
- Method RoundedRectXY() was added.
- Method PieSectorXY() was added.
@@ -2507,7 +2577,7 @@
- A bug relative to fill color on next page was fixed.
4.2.007 (2008-11-12)
- - The function setListIndentWidth() was added to set custom indentation widht for HTML lists.
+ - The function setListIndentWidth() was added to set custom indentation width for HTML lists.
4.2.006 (2008-11-06)
- A bug relative to HTML justification was fixed.
@@ -2701,7 +2771,7 @@
4.0.011 (2008-07-23)
- Font support was improved.
- - The folder /fonts/utils contains new utilities and instructions for embedd font files.
+ - The folder /fonts/utils contains new utilities and instructions for embed font files.
- Documentation was updated.
4.0.010 (2008-07-22)
diff --git a/tools/tcpdf/LICENSE.TXT b/tools/tcpdf/LICENSE.TXT
index ec7968a7e2..b85904e8bc 100644
--- a/tools/tcpdf/LICENSE.TXT
+++ b/tools/tcpdf/LICENSE.TXT
@@ -7,7 +7,7 @@
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
- 2002-2024 Nicola Asuni - Tecnick.com LTD
+ 2002-2026 Nicola Asuni - Tecnick.com LTD
**********************************************************************
**********************************************************************
@@ -15,7 +15,7 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -184,7 +184,7 @@ Library.
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007 Free Software Foundation, Inc.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -828,7 +828,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
Also add information on how to contact you by electronic and paper mail.
@@ -847,14 +847,14 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
-.
+.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
-.
+.
**********************************************************************
**********************************************************************
diff --git a/tools/tcpdf/Makefile b/tools/tcpdf/Makefile
new file mode 100644
index 0000000000..83c0df5c7a
--- /dev/null
+++ b/tools/tcpdf/Makefile
@@ -0,0 +1,154 @@
+# Makefile
+#
+# @since 2026-04-21
+# @category Library
+# @package TCPDF
+# @author Nicola Asuni
+# @copyright 2002-2026 Nicola Asuni - Tecnick.com LTD
+# @license https://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
+# @link https://github.com/tecnickcom/TCPDF
+#
+# This file is part of tcpdf software library.
+# ----------------------------------------------------------------------------------------------------------------------
+
+SHELL=/bin/bash
+.SHELLFLAGS=-o pipefail -c
+
+# Project owner
+OWNER=tecnickcom
+
+# Project vendor
+VENDOR=${OWNER}
+
+# Project name
+PROJECT=tcpdf
+
+# Project version (strip trailing line endings and accidental literal "\\n")
+VERSION=$(shell sed -E 's/\\n$$//' VERSION | tr -d '\r\n')
+
+# Current directory
+CURRENTDIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+# Target directory
+TARGETDIR=$(CURRENTDIR)target
+
+# sed argument for in-place substitutions
+SEDINPLACE=-i
+ifeq ($(shell uname -s),Darwin)
+ SEDINPLACE=-i ''
+endif
+
+# Default port number for the example server
+PORT?=8971
+
+# PHP binary
+PHP=$(shell which php)
+
+# Composer executable
+COMPOSER=$(PHP) -d "apc.enable_cli=0" $(shell which composer)
+
+# --- MAKE TARGETS ---
+
+# Display general help about this command
+.PHONY: help
+help:
+ @echo ""
+ @echo "$(PROJECT) Makefile."
+ @echo "The following commands are available:"
+ @echo ""
+ @awk '/^## /{desc=substr($$0,4)} /^\.PHONY:/{if(NF>1) {target=$$2; if(desc) printf " make %-15s: %s\n",target,desc; desc=""}}' Makefile
+ @echo ""
+ @echo "To test and build everything from scratch, use the shortcut:"
+ @echo " make x"
+ @echo ""
+
+# Alias for help target
+.PHONY: all
+all: help
+
+# Test and build everything from scratch
+.PHONY: x
+x: buildall
+
+## Test and build everything from scratch
+.PHONY: buildall
+buildall: deps
+ $(MAKE) qa
+
+## Delete vendor and generated directories
+.PHONY: clean
+clean:
+ rm -rf ./vendor ./tests/vendor $(TARGETDIR) ./build ./cache
+
+## Download dependencies for the library and test harness
+.PHONY: deps
+deps: ensuretarget
+ $(COMPOSER) install --no-interaction
+ @if [ -f ./tests/composer.json ]; then \
+ $(COMPOSER) --working-dir=tests install --no-interaction; \
+ fi
+
+## Generate source code documentation with Doctum if available
+.PHONY: doc
+doc:
+ @if [ -x ./vendor/bin/doctum ]; then \
+ ./vendor/bin/doctum update ./scripts/doctum.php --force; \
+ else \
+ echo "Doctum is not installed. Run make deps first."; \
+ exit 1; \
+ fi
+
+## Create missing target directories for test and build artifacts
+.PHONY: ensuretarget
+ensuretarget:
+ mkdir -p $(TARGETDIR)/test
+ mkdir -p $(TARGETDIR)/report
+ mkdir -p $(TARGETDIR)/doc
+
+## Lint PHP files (syntax only)
+.PHONY: lint
+lint:
+ find . -type f -name '*.php' \
+ -not -path './vendor/*' \
+ -not -path './tests/vendor/*' \
+ -print0 | xargs -0 -n1 -P4 $(PHP) -l > /dev/null
+
+## Run all checks
+.PHONY: qa
+qa: version ensuretarget lint test
+
+## Generate quality reports (not implemented in this legacy repository)
+.PHONY: report
+report: ensuretarget
+ @echo "No additional report target is configured for TCPDF."
+
+## Start the development server
+.PHONY: server
+server:
+ $(PHP) -t examples -S localhost:$(PORT)
+
+## Tag this git version
+.PHONY: tag
+tag:
+ git checkout main && \
+ git tag -a ${VERSION} -m "Release ${VERSION}" && \
+ git push origin --tags && \
+ git pull
+
+## Run integration tests from tests/launch.sh
+.PHONY: test
+test:
+ XDEBUG_MODE=coverage sh ./tests/launch.sh
+
+## Set the code version from the VERSION file
+.PHONY: version
+version:
+ sed $(SEDINPLACE) -E "s#^([[:space:]]*private static [^=]+ = ')[^']*';#\1${VERSION}';#" include/tcpdf_static.php
+ sed $(SEDINPLACE) -E "1,170 s#^// Version[[:space:]]+: .*#// Version : ${VERSION}#" tcpdf.php
+ sed $(SEDINPLACE) -E "1,170 s#^ \* @version .*# * @version ${VERSION}#" tcpdf.php
+
+## Increase the version patch number
+.PHONY: versionup
+versionup:
+ echo ${VERSION} | gawk -F. '{printf("%d.%d.%d\n",$$1,$$2,(($$3+1)));}' > VERSION
+ $(MAKE) version
diff --git a/tools/tcpdf/README.md b/tools/tcpdf/README.md
index f59f663399..00ad81a188 100644
--- a/tools/tcpdf/README.md
+++ b/tools/tcpdf/README.md
@@ -1,83 +1,131 @@
# TCPDF
-*PHP PDF Library*
-[](https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20TCPDF%20project)
-*Please consider supporting this project by making a donation via [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations¤cy_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20TCPDF%20project)*
+> Legacy PDF engine for PHP. **Deprecated** and maintained for existing integrations.
-* **category** Library
-* **author** Nicola Asuni
-* **copyright** 2002-2024 Nicola Asuni - Tecnick.com LTD
-* **license** http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
-* **link** http://www.tcpdf.org
-* **source** https://github.com/tecnickcom/TCPDF
+[](https://packagist.org/packages/tecnickcom/tcpdf)
+[](https://packagist.org/packages/tecnickcom/tcpdf)
+[](https://packagist.org/packages/tecnickcom/tcpdf)
+[](https://www.paypal.com/donate/?hosted_button_id=NZUEC5XS8MFBJ)
+If TCPDF helps your business, please consider supporting development via [PayPal](https://www.paypal.com/donate/?hosted_button_id=NZUEC5XS8MFBJ).
-## NOTE
-A new version of this library is under development at https://github.com/tecnickcom/tc-lib-pdf and as a consequence this library is in support only mode.
+---
+## Deprecation Notice
+TCPDF is **deprecated** and in **maintenance-only mode**.
-## Description
+Active feature development has moved to [tc-lib-pdf](https://github.com/tecnickcom/tc-lib-pdf), the modern and modular successor.
-PHP library for generating PDF documents on-the-fly.
+For new projects, use `tecnickcom/tc-lib-pdf`. This repository remains available for legacy systems and critical compatibility fixes.
-### Main Features:
-* no external libraries are required for the basic functions;
-* all standard page formats, custom page formats, custom margins and units of measure;
-* UTF-8 Unicode and Right-To-Left languages;
-* TrueTypeUnicode, OpenTypeUnicode v1, TrueType, OpenType v1, Type1 and CID-0 fonts;
-* font subsetting;
-* methods to publish some XHTML + CSS code, Javascript and Forms;
-* images, graphic (geometric figures) and transformation methods;
-* supports JPEG, PNG and SVG images natively, all images supported by GD (GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM) and all images supported via ImagMagick (http://www.imagemagick.org/script/formats.php)
-* 1D and 2D barcodes: CODE 39, ANSI MH10.8M-1983, USD-3, 3 of 9, CODE 93, USS-93, Standard 2 of 5, Interleaved 2 of 5, CODE 128 A/B/C, 2 and 5 Digits UPC-Based Extension, EAN 8, EAN 13, UPC-A, UPC-E, MSI, POSTNET, PLANET, RMS4CC (Royal Mail 4-state Customer Code), CBC (Customer Bar Code), KIX (Klant index - Customer index), Intelligent Mail Barcode, Onecode, USPS-B-3200, CODABAR, CODE 11, PHARMACODE, PHARMACODE TWO-TRACKS, Datamatrix, QR-Code, PDF417;
-* JPEG and PNG ICC profiles, Grayscale, RGB, CMYK, Spot Colors and Transparencies;
-* automatic page header and footer management;
-* document encryption up to 256 bit and digital signature certifications;
-* transactions to UNDO commands;
-* PDF annotations, including links, text and file attachments;
-* text rendering modes (fill, stroke and clipping);
-* multiple columns mode;
-* no-write page regions;
-* bookmarks, named destinations and table of content;
-* text hyphenation;
-* text stretching and spacing (tracking);
-* automatic page break, line break and text alignments including justification;
-* automatic page numbering and page groups;
-* move and delete pages;
-* page compression (requires php-zlib extension);
-* XOBject Templates;
-* Layers and object visibility.
-* PDF/A-1b support.
+### Migration Path
-### Third party fonts:
+- New projects: install `tecnickcom/tc-lib-pdf`.
+- Existing TCPDF users: keep TCPDF for current production workloads and migrate in phases.
+- Teams seeking modern architecture, Composer-first design, and stronger type-safety should prioritize `tc-lib-pdf`.
-This library may include third party font files released with different licenses.
+### Why Migrate to tc-lib-pdf
-All the PHP files on the fonts directory are subject to the general TCPDF license (GNU-LGPLv3),
-they do not contain any binary data but just a description of the general properties of a particular font.
-These files can be also generated on the fly using the font utilities and TCPDF methods.
+- Modern architecture: modular libraries and cleaner component boundaries improve maintainability.
+- Better extensibility: new features are easier to add without patching a monolithic legacy core.
+- Stronger tooling fit: modern package structure works better with static analysis, CI, and automated tests.
+- Lower long-term risk: reduces technical debt tied to legacy APIs and supports ongoing PHP ecosystem evolution.
+- Improved delivery speed: teams can implement and ship new PDF capabilities with less friction.
-All the original binary TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files).
+Migration still requires planning and regression checks to preserve rendering parity for existing documents.
-The binary files (.z) that begins with the prefix "free" have been extracted from the GNU FreeFont collection (GNU-GPLv3).
-The binary files (.z) that begins with the prefix "pdfa" have been derived from the GNU FreeFont, so they are subject to the same license.
-For the details of Copyright, License and other information, please check the files inside the directory fonts/freefont-20120503
-Link : http://www.gnu.org/software/freefont/
+### Future Compatibility Possibility
-The binary files (.z) that begins with the prefix "dejavu" have been extracted from the DejaVu fonts 2.33 (Bitstream) collection.
-For the details of Copyright, License and other information, please check the files inside the directory fonts/dejavu-fonts-ttf-2.33
-Link : http://dejavu-fonts.org
+As a long-term possibility, TCPDF could be refactored to use `tc-lib-pdf` internally as a backend while preserving a practical level of backward compatibility for existing TCPDF integrations.
-The binary files (.z) that begins with the prefix "ae" have been extracted from the Arabeyes.org collection (GNU-GPLv2).
-Link : http://projects.arabeyes.org/
+This is not part of a committed roadmap and there is no guarantee it will happen. It is documented here only as a potential direction that may be evaluated in the future.
-### ICC profile:
+---
-TCPDF includes the sRGB.icc profile from the icc-profiles-free Debian package:
-https://packages.debian.org/source/stable/icc-profiles-free
+## Overview
+TCPDF is a pure-PHP library for generating PDF documents and barcodes directly in application code.
-## Developer(s) Contact
+It has been widely used across many PHP stacks and still provides a complete feature set for text rendering, page composition, graphics, signatures, forms, and standards-oriented output.
-* Nicola Asuni
+| | |
+|---|---|
+| **Package** | `tecnickcom/tcpdf` |
+| **Author** | Nicola Asuni |
+| **License** | [GNU LGPL v3](https://www.gnu.org/copyleft/lesser.html) (see [LICENSE.TXT](LICENSE.TXT)) |
+| **Website** | |
+| **Source** | |
+
+---
+
+## Features
+
+### Text & Fonts
+- UTF-8 Unicode and right-to-left (RTL) language support
+- TrueTypeUnicode, OpenTypeUnicode v1, TrueType, OpenType v1, Type1, and CID-0 fonts
+- Font subsetting
+- Text hyphenation, stretching, spacing, and rendering modes (fill/stroke/clipping)
+- Automatic line breaks, page breaks, and justification
+
+### Layout & Content
+- Standard and custom page formats, margins, and measurement units
+- XHTML + CSS rendering, JavaScript, and forms
+- Automatic headers and footers
+- Multi-column mode and no-write page regions
+- Bookmarks, named destinations, and table of contents
+- Automatic page numbering, page groups, move/delete pages, and undo transactions
+
+### Images, Graphics & Color
+- Native JPEG, PNG, and SVG support
+- Geometric drawing primitives and transformations
+- Support for GD image formats (`GD`, `GD2`, `GD2PART`, `GIF`, `JPEG`, `PNG`, `BMP`, `XBM`, `XPM`)
+- Additional formats via ImageMagick (when available)
+- JPEG/PNG ICC profiles, grayscale/RGB/CMYK/spot colors, and transparencies
+
+### Security, Standards & Advanced Output
+- Encryption up to 256-bit and digital signature certifications
+- PDF annotations (links, text, and file attachments)
+- 1D and 2D barcode support (including CODE 128, EAN/UPC, Datamatrix, QR Code, PDF417)
+- XObject templates and layers with object visibility controls
+- PDF/A-1b support
+
+---
+
+## Requirements
+
+- PHP 7.1 or later
+- `ext-curl`
+
+Optional extensions for richer output in some workflows: `gd`, `zlib`, `imagick`.
+
+---
+
+## Third-Party Fonts
+
+This library may include third-party font files released under different licenses.
+
+PHP metadata files under [fonts](fonts) are covered by the TCPDF license (GNU LGPL v3). They contain font metadata and can also be generated using TCPDF font utilities.
+
+Original binary TTF files are renamed for compatibility and compressed with PHP `gzcompress` (the `.z` format).
+
+| Prefix | Source | License |
+|---|---|---|
+| `free*` | [GNU FreeFont](https://www.gnu.org/software/freefont/) | GNU GPL v3 |
+| `pdfa*` | Derived from GNU FreeFont | GNU GPL v3 |
+| `dejavu*` | [DejaVu Fonts](http://dejavu-fonts.org) | Bitstream/DejaVu terms |
+| `ae*` | [Arabeyes.org](http://projects.arabeyes.org/) | GNU GPL v2 |
+
+For full details, see the bundled notices in the corresponding subdirectories under [fonts](fonts).
+
+---
+
+## ICC Profile
+
+TCPDF includes `sRGB.icc` from the Debian [`icc-profiles-free`](https://packages.debian.org/source/stable/icc-profiles-free) package.
+
+---
+
+## Contact
+
+Nicola Asuni
diff --git a/tools/tcpdf/VERSION b/tools/tcpdf/VERSION
index eed6de4bbb..060e73a63b 100644
--- a/tools/tcpdf/VERSION
+++ b/tools/tcpdf/VERSION
@@ -1 +1 @@
-6.7.8
+6.11.3
\ No newline at end of file
diff --git a/tools/tcpdf/composer.json b/tools/tcpdf/composer.json
new file mode 100644
index 0000000000..cc5904d207
--- /dev/null
+++ b/tools/tcpdf/composer.json
@@ -0,0 +1,75 @@
+{
+ "name": "tecnickcom/tcpdf",
+ "type": "library",
+ "description": "Deprecated legacy PDF engine for PHP. For new projects use tecnickcom/tc-lib-pdf.",
+ "keywords": [
+ "PDF",
+ "tcpdf",
+ "PDFD32000-2008",
+ "qrcode",
+ "datamatrix",
+ "pdf417",
+ "barcodes"
+ ],
+ "homepage": "https://tcpdf.org",
+ "license": "LGPL-3.0-or-later",
+ "authors": [
+ {
+ "name": "Nicola Asuni",
+ "email": "info@tecnick.com",
+ "role": "lead"
+ }
+ ],
+ "require": {
+ "php": ">=7.1.0",
+ "ext-curl": "*"
+ },
+ "suggest": {
+ "tecnickcom/tc-lib-pdf": "Modern replacement for TCPDF for new projects.",
+ "ext-gd": "Enables additional image handling in some workflows.",
+ "ext-imagick": "Enables additional image format support when available.",
+ "ext-zlib": "Recommended for compressed streams and related features."
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "config": {
+ "sort-packages": true
+ },
+ "autoload": {
+ "classmap": [
+ "config",
+ "include",
+ "tcpdf.php",
+ "tcpdf_barcodes_1d.php",
+ "tcpdf_barcodes_2d.php",
+ "include/tcpdf_colors.php",
+ "include/tcpdf_filters.php",
+ "include/tcpdf_font_data.php",
+ "include/tcpdf_fonts.php",
+ "include/tcpdf_images.php",
+ "include/tcpdf_static.php",
+ "include/barcodes/datamatrix.php",
+ "include/barcodes/pdf417.php",
+ "include/barcodes/qrcode.php"
+ ]
+ },
+ "archive": {
+ "exclude": [
+ "/.github",
+ "/.phpdoc",
+ "/examples",
+ "/scripts",
+ "/tests"
+ ]
+ },
+ "support": {
+ "issues": "https://github.com/tecnickcom/TCPDF/issues",
+ "source": "https://github.com/tecnickcom/TCPDF"
+ },
+ "funding": [
+ {
+ "type": "paypal",
+ "url": "https://www.paypal.com/donate/?hosted_button_id=NZUEC5XS8MFBJ"
+ }
+ ]
+}
diff --git a/tools/tcpdf/config/tcpdf_config.php b/tools/tcpdf/config/tcpdf_config.php
index 9888a6778b..d430ee4d06 100644
--- a/tools/tcpdf/config/tcpdf_config.php
+++ b/tools/tcpdf/config/tcpdf_config.php
@@ -6,9 +6,9 @@
//
// Description : Configuration file for TCPDF.
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
-// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// License : GNU-LGPL v3 (https://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
-// Copyright (C) 2004-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2004-2014 2026 Nicola Asuni - Tecnick.com LTD
//
// This file is part of TCPDF software library.
//
@@ -23,7 +23,7 @@
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
-// along with TCPDF. If not, see .
+// along with TCPDF. If not, see .
//
// See LICENSE.TXT file for more information.
//============================================================+
@@ -114,7 +114,7 @@
/**
* Header description string.
*/
-define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
+define ('PDF_HEADER_STRING', "by2026 Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
/**
* Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].
diff --git a/tools/tcpdf/examples/barcodes/example_1d_html.php b/tools/tcpdf/examples/barcodes/example_1d_html.php
deleted file mode 100644
index 6d3233bd62..0000000000
--- a/tools/tcpdf/examples/barcodes/example_1d_html.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_1d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_1d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.000
- * @group barcode
- * @group 1d
- * @group html
- * @group comparable
- */
-
-// include 1D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_1d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128');
-
-// output the barcode as HTML object
-echo $barcodeobj->getBarcodeHTML(2, 30, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_1d_png.php b/tools/tcpdf/examples/barcodes/example_1d_png.php
deleted file mode 100644
index 02ed1660e8..0000000000
--- a/tools/tcpdf/examples/barcodes/example_1d_png.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_1d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_1d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.000
- * @group barcode
- * @group 1d
- * @group png
- */
-
-// include 1D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_1d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128');
-
-// output the barcode as PNG image
-$barcodeobj->getBarcodePNG(2, 30, array(0,0,0));
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_1d_svg.php b/tools/tcpdf/examples/barcodes/example_1d_svg.php
deleted file mode 100644
index 5e5ccfc355..0000000000
--- a/tools/tcpdf/examples/barcodes/example_1d_svg.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_1d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_1d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.000
- * @group barcode
- * @group 1d
- * @group svg
- * @group comparable
- */
-
-// include 1D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_1d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128');
-
-// output the barcode as SVG image
-$barcodeobj->getBarcodeSVG(2, 30, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_1d_svgi.php b/tools/tcpdf/examples/barcodes/example_1d_svgi.php
deleted file mode 100644
index 8c65b669be..0000000000
--- a/tools/tcpdf/examples/barcodes/example_1d_svgi.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_1d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_1d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.000
- * @group barcode
- * @group 1d
- * @group svg
- * @group comparable
- */
-
-// include 1D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_1d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128');
-
-// output the barcode as SVG inline code
-echo $barcodeobj->getBarcodeSVGcode(2, 40, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_html.php b/tools/tcpdf/examples/barcodes/example_2d_datamatrix_html.php
deleted file mode 100644
index e0d200cc74..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_html.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group datamatrix
- * @group html
- * @group comparable
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX');
-
-// output the barcode as HTML object
-echo $barcodeobj->getBarcodeHTML(6, 6, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_png.php b/tools/tcpdf/examples/barcodes/example_2d_datamatrix_png.php
deleted file mode 100644
index 35d344dac0..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_png.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group datamatrix
- * @group png
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX');
-
-// output the barcode as PNG image
-$barcodeobj->getBarcodePNG(6, 6, array(0,0,0));
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php b/tools/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php
deleted file mode 100644
index 10d0aa36a7..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_svg.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group datamatrix
- * @group svg
- * @group comparable
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX');
-
-// output the barcode as SVG image
-$barcodeobj->getBarcodeSVG(6, 6, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php b/tools/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php
deleted file mode 100644
index 42627006f1..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_datamatrix_svgi.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group datamatrix
- * @group svg
- * @group comparable
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX');
-
-// output the barcode as SVG inline code
-echo $barcodeobj->getBarcodeSVGcode(6, 6, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_pdf417_html.php b/tools/tcpdf/examples/barcodes/example_2d_pdf417_html.php
deleted file mode 100644
index 3d8de31026..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_pdf417_html.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group pdf417
- * @group html
- * @group comparable
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417');
-
-// output the barcode as HTML object
-echo $barcodeobj->getBarcodeHTML(4, 4, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_pdf417_png.php b/tools/tcpdf/examples/barcodes/example_2d_pdf417_png.php
deleted file mode 100644
index b7c95855a9..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_pdf417_png.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group pdf417
- * @group png
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417');
-
-// output the barcode as PNG image
-$barcodeobj->getBarcodePNG(4, 4, array(0,0,0));
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_pdf417_svg.php b/tools/tcpdf/examples/barcodes/example_2d_pdf417_svg.php
deleted file mode 100644
index 9017e5bcb8..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_pdf417_svg.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group pdf417
- * @group svg
- * @group comparable
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417');
-
-// output the barcode as SVG image
-$barcodeobj->getBarcodeSVG(4, 4, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php b/tools/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php
deleted file mode 100644
index 2075da7402..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_pdf417_svgi.php
+++ /dev/null
@@ -1,57 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group pdf417
- * @group svg
- * @group comparable
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417');
-
-// output the barcode as SVG inline code
-echo $barcodeobj->getBarcodeSVGcode(4, 4, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_qrcode_html.php b/tools/tcpdf/examples/barcodes/example_2d_qrcode_html.php
deleted file mode 100644
index 7c05f00f2d..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_qrcode_html.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group qrcode
- * @group html
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H');
-
-// output the barcode as HTML object
-echo $barcodeobj->getBarcodeHTML(6, 6, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_qrcode_png.php b/tools/tcpdf/examples/barcodes/example_2d_qrcode_png.php
deleted file mode 100644
index 75daa7c07d..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_qrcode_png.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group qrcode
- * @group png
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H');
-
-// output the barcode as PNG image
-$barcodeobj->getBarcodePNG(6, 6, array(0,0,0));
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_qrcode_svg.php b/tools/tcpdf/examples/barcodes/example_2d_qrcode_svg.php
deleted file mode 100644
index c104ca63fe..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_qrcode_svg.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group qrcode
- * @group svg
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H');
-
-// output the barcode as SVG image
-$barcodeobj->getBarcodeSVG(6, 6, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php b/tools/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php
deleted file mode 100644
index f31a10083b..0000000000
--- a/tools/tcpdf/examples/barcodes/example_2d_qrcode_svgi.php
+++ /dev/null
@@ -1,56 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-// -------------------------------------------------------------------
-//
-// Description : Example for tcpdf_barcodes_2d.php class
-//
-//============================================================+
-
-/**
- * @file
- * Example for tcpdf_barcodes_2d.php class
- * @package com.tecnick.tcpdf
- * @author Nicola Asuni
- * @version 1.0.009
- * @group barcode
- * @group qrcode
- * @group svg
- */
-
-// include 2D barcode class (search for installation path)
-require_once(dirname(__FILE__).'/tcpdf_barcodes_2d_include.php');
-
-// set the barcode content and type
-$barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H');
-
-// output the barcode as SVG inline code
-echo $barcodeobj->getBarcodeSVGcode(6, 6, 'black');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php b/tools/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php
deleted file mode 100644
index 0add5ec6fb..0000000000
--- a/tools/tcpdf/examples/barcodes/tcpdf_barcodes_1d_include.php
+++ /dev/null
@@ -1,46 +0,0 @@
-.
-//
-// See LICENSE.TXT file for more information.
-//============================================================+
-
-/**
- * Example of alternative configuration file for TCPDF.
- * @author Nicola Asuni
- * @package com.tecnick.tcpdf
- * @version 4.9.005
- * @since 2004-10-27
- */
-
-/**
- * Define the following constant to ignore the default configuration file.
- */
-define ('K_TCPDF_EXTERNAL_CONFIG', true);
-
-/**
- * Installation path (/var/www/tcpdf/).
- * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_MAIN', '');
-
-/**
- * URL path to tcpdf installation folder (http://localhost/tcpdf/).
- * By default it is automatically set but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_URL', '');
-
-/**
- * Path for PDF fonts.
- * By default it is automatically set but you can also set it as a fixed string to improve performances.
- */
-//define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-/**
- * Default images directory.
- * By default it is automatically set but you can also set it as a fixed string to improve performances.
- */
-define ('K_PATH_IMAGES', dirname(__FILE__).'/../images/');
-
-/**
- * Deafult image logo used be the default Header() method.
- * Please set here your own logo or an empty string to disable it.
- */
-define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
-
-/**
- * Header logo image width in user units.
- */
-define ('PDF_HEADER_LOGO_WIDTH', 30);
-
-/**
- * Cache directory for temporary files (full path).
- */
-define ('K_PATH_CACHE', sys_get_temp_dir().'/');
-
-/**
- * Generic name for a blank image.
- */
-define ('K_BLANK_IMAGE', '_blank.png');
-
-/**
- * Page format.
- */
-define ('PDF_PAGE_FORMAT', 'A4');
-
-/**
- * Page orientation (P=portrait, L=landscape).
- */
-define ('PDF_PAGE_ORIENTATION', 'P');
-
-/**
- * Document creator.
- */
-define ('PDF_CREATOR', 'TCPDF');
-
-/**
- * Document author.
- */
-define ('PDF_AUTHOR', 'TCPDF');
-
-/**
- * Header title.
- */
-define ('PDF_HEADER_TITLE', 'TCPDF Example');
-
-/**
- * Header description string.
- */
-define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
-
-/**
- * Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].
- */
-define ('PDF_UNIT', 'mm');
-
-/**
- * Header margin.
- */
-define ('PDF_MARGIN_HEADER', 5);
-
-/**
- * Footer margin.
- */
-define ('PDF_MARGIN_FOOTER', 10);
-
-/**
- * Top margin.
- */
-define ('PDF_MARGIN_TOP', 27);
-
-/**
- * Bottom margin.
- */
-define ('PDF_MARGIN_BOTTOM', 25);
-
-/**
- * Left margin.
- */
-define ('PDF_MARGIN_LEFT', 15);
-
-/**
- * Right margin.
- */
-define ('PDF_MARGIN_RIGHT', 15);
-
-/**
- * Default main font name.
- */
-define ('PDF_FONT_NAME_MAIN', 'helvetica');
-
-/**
- * Default main font size.
- */
-define ('PDF_FONT_SIZE_MAIN', 10);
-
-/**
- * Default data font name.
- */
-define ('PDF_FONT_NAME_DATA', 'helvetica');
-
-/**
- * Default data font size.
- */
-define ('PDF_FONT_SIZE_DATA', 8);
-
-/**
- * Default monospaced font name.
- */
-define ('PDF_FONT_MONOSPACED', 'courier');
-
-/**
- * Ratio used to adjust the conversion of pixels to user units.
- */
-define ('PDF_IMAGE_SCALE_RATIO', 1.25);
-
-/**
- * Magnification factor for titles.
- */
-define('HEAD_MAGNIFICATION', 1.1);
-
-/**
- * Height of cell respect font height.
- */
-define('K_CELL_HEIGHT_RATIO', 1.25);
-
-/**
- * Title magnification respect main font size.
- */
-define('K_TITLE_MAGNIFICATION', 1.3);
-
-/**
- * Reduction factor for small font.
- */
-define('K_SMALL_RATIO', 2/3);
-
-/**
- * Set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language.
- */
-define('K_THAI_TOPCHARS', true);
-
-/**
- * If true allows to call TCPDF methods using HTML syntax
- * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
- */
-define('K_TCPDF_CALLS_IN_HTML', true);
-
-/**
- * List of TCPDF methods that are allowed to be called using HTML syntax.
- * Note: each method name must end with surrounded with | (pipe) character.
- * The constant K_TCPDF_CALLS_IN_HTML must be set to true.
- * IMPORTANT: For security reason, disable this feature if you are allowing user HTML content.
- */
-define('K_ALLOWED_TCPDF_TAGS', '|AddPage|Rect|SetDrawColor|write1DBarcode|');
-
-/**
- * If true and PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
- */
-define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/data/cert/tcpdf.crt b/tools/tcpdf/examples/data/cert/tcpdf.crt
deleted file mode 100644
index f0491391cf..0000000000
--- a/tools/tcpdf/examples/data/cert/tcpdf.crt
+++ /dev/null
@@ -1,40 +0,0 @@
-Bag Attributes
- localKeyID: 7B AB 1B 7A BE 4C 85 C0 1A A6 DC 59 3F 79 48 C3 93 38 68 9C
-subject=/CN=TCPDF DEMO/O=TCPDF/OU=DEMO/emailAddress=you@example.com/C=IT
-issuer=/CN=TCPDF DEMO/O=TCPDF/OU=DEMO/emailAddress=you@example.com/C=IT
------BEGIN CERTIFICATE-----
-MIIC1TCCAj6gAwIBAgIKkehOL/XGkB5cjjANBgkqhkiG9w0BAQUFADBhMRMwEQYD
-VQQDEwpUQ1BERiBERU1PMQ4wDAYDVQQKEwVUQ1BERjENMAsGA1UECxMEREVNTzEe
-MBwGCSqGSIb3DQEJARYPeW91QGV4YW1wbGUuY29tMQswCQYDVQQGEwJJVDAeFw0w
-OTA4MjExMjU0NDhaFw0xNDA4MjExMjU0NDhaMGExEzARBgNVBAMTClRDUERGIERF
-TU8xDjAMBgNVBAoTBVRDUERGMQ0wCwYDVQQLEwRERU1PMR4wHAYJKoZIhvcNAQkB
-Fg95b3VAZXhhbXBsZS5jb20xCzAJBgNVBAYTAklUMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQDAqIL0uGKmTR98Lxx2vEEE1OGKkMXFo0JViitALe7Onhxxqx0H
-XMUDKF5mvEVu1rcvh7/oAnAfrCuEpL/up3u1mQCgBE7WXBnFFE/AE3jCksh9OkS0
-Z0Xj9woN5bzxRDsGoPiOu/4xzk5qSEXt8jf2Ep90QuNkqLIRT4swAzpDbwIDAQAB
-o4GTMIGQMDcGA1UdEgQwMC6gEQYDVQQDDApUQ1BERiBERU1PoAwGA1UECgwFVENQ
-REagCwYDVQQLDARERU1PMDcGA1UdEQQwMC6gEQYDVQQDDApUQ1BERiBERU1PoAwG
-A1UECgwFVENQREagCwYDVQQLDARERU1PMA8GCSqGSIb3LwEBCgQCBQAwCwYDVR0P
-BAQDAgSQMA0GCSqGSIb3DQEBBQUAA4GBAEhTQfqX3ZNdHmpTLDbIj22RHXii2roE
-OavCbu9WsHoWpva0qSd+yIoD594VHvYAd29sfzDfiN+7W0aiZfDhq5jpaSQMVlN8
-RGYMupbHY/+a9Gz1wqxnR84mlTtIkZVRYAhsfPwy6M1BEjdMqfdh9h40JIdkdjtb
-8faTCfXPePWQ
------END CERTIFICATE-----
-Bag Attributes
- localKeyID: 7B AB 1B 7A BE 4C 85 C0 1A A6 DC 59 3F 79 48 C3 93 38 68 9C
-Key Attributes:
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDAqIL0uGKmTR98Lxx2vEEE1OGKkMXFo0JViitALe7Onhxxqx0H
-XMUDKF5mvEVu1rcvh7/oAnAfrCuEpL/up3u1mQCgBE7WXBnFFE/AE3jCksh9OkS0
-Z0Xj9woN5bzxRDsGoPiOu/4xzk5qSEXt8jf2Ep90QuNkqLIRT4swAzpDbwIDAQAB
-AoGAXc+wNMmz/5Z+RlIKYia44klmqbplEx+0JULqXI4BQsrqvs67i+I4bJkznoL+
-rEIRYSuQ3sCRKFsFtckjTGpxadnxkB+uwGKc6pZChv99BFX6HFR4hgBlT/BBRAQA
-hMDlM2JIRr4S4SMVXR7MHwGMUf9mUeanGLR3ZWtU3aXJrIECQQD7OaYUVYNEEnM9
-uXyjm22CuHyqyEf5gb13sK0uQty67547yJTMUQZd/sQc9KGwhzBbhrob2LO2jAhh
-S+f+NSRnAkEAxFHm3fMI5RgXmswxlGm4QW07a/Ueo7ZJG6xjTkFXluJhd+XHswRD
-dQIO3zG9nGjNUoeMrPhXhPvKqFc2F9RDuQJAQBEGin74N77gxqfr4ik79y8nE8J5
-oGZ2s/RJZdfFRKLg3mwbjjNHhWb4Ck5UgZkoOt8TzRApXG8/n9hktE5HFwJBALur
-M5AueO1Pl5kB489lNJ9OxUQRYUXMxpxuscuoCQwSwmv0O2+0/qtG2WKhUQnI4aYo
-L+FV0YwtivBb1jj3T/kCQQDIWOxq8eRowdaMzvJpRUHFgMcf1AVZExKyrugwYOWd
-KNsDxC4KaQOsPt8iT/Ulo4g/MJC0HolCOhWibKmR9Ayl
------END RSA PRIVATE KEY-----
diff --git a/tools/tcpdf/examples/data/cert/tcpdf.fdf b/tools/tcpdf/examples/data/cert/tcpdf.fdf
deleted file mode 100644
index a8f7c35d9a..0000000000
Binary files a/tools/tcpdf/examples/data/cert/tcpdf.fdf and /dev/null differ
diff --git a/tools/tcpdf/examples/data/cert/tcpdf.p12 b/tools/tcpdf/examples/data/cert/tcpdf.p12
deleted file mode 100644
index 611f0dfb17..0000000000
Binary files a/tools/tcpdf/examples/data/cert/tcpdf.p12 and /dev/null differ
diff --git a/tools/tcpdf/examples/data/chapter_demo_1.txt b/tools/tcpdf/examples/data/chapter_demo_1.txt
deleted file mode 100644
index 4025de9303..0000000000
--- a/tools/tcpdf/examples/data/chapter_demo_1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
diff --git a/tools/tcpdf/examples/data/chapter_demo_2.txt b/tools/tcpdf/examples/data/chapter_demo_2.txt
deleted file mode 100644
index a0210ff020..0000000000
--- a/tools/tcpdf/examples/data/chapter_demo_2.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.
-
-Integer non sem eget neque mattis accumsan. Maecenas eu nisl mauris, sit amet interdum ipsum. In pharetra erat vel lectus venenatis elementum. Nulla non elit ligula, sit amet mollis urna. Morbi ut gravida est. Mauris tincidunt sem et turpis molestie malesuada. Curabitur vel nulla risus, sed mollis erat. Suspendisse vehicula accumsan purus nec varius. Donec fermentum lorem id felis sodales dictum. Quisque et dolor ipsum. Nam luctus consectetur dui vitae fermentum. Curabitur sodales consequat augue, id ultricies augue tempor ac. Aliquam ac magna id ipsum vehicula bibendum. Sed elementum congue tristique. Phasellus vel lorem eu lectus porta sodales. Etiam neque tortor, sagittis id pharetra quis, laoreet vel arcu.
-
-Cras quam mi, ornare laoreet laoreet vel, vehicula at lacus. Maecenas a lacus accumsan augue convallis sagittis sed quis odio. Morbi sit amet turpis diam, dictum convallis urna. Cras eget interdum augue. Cras eu nisi sit amet dolor faucibus porttitor. Suspendisse potenti. Nunc vitae dolor risus, at cursus libero. Suspendisse bibendum tellus non nibh hendrerit tristique. Mauris eget orci elit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam porta libero non ante laoreet semper. Proin volutpat sodales mi, ac fermentum erat sagittis in. Vivamus at viverra felis. Ut pretium facilisis ante et pharetra.
-
-Nulla facilisi. Cras varius quam eget libero aliquam vitae tincidunt leo rutrum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Pellentesque a nisl massa, quis pretium urna. Proin vel porttitor tortor. Cras rhoncus congue velit in bibendum. Donec pharetra semper augue id lacinia. Quisque magna quam, hendrerit eu aliquam et, pellentesque ut tellus. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Maecenas nulla quam, rutrum eu feugiat at, elementum eu libero. Maecenas ullamcorper leo et turpis rutrum ac laoreet eros faucibus. Phasellus condimentum lorem quis neque imperdiet quis molestie enim iaculis. Phasellus risus est, vestibulum ut convallis ultrices, dignissim nec erat. Etiam congue lobortis laoreet. Nulla ut neque sed velit dapibus semper. Quisque nec dolor id nibh eleifend iaculis. Vivamus vitae fermentum odio. Etiam malesuada quam in nulla aliquam sed convallis dui feugiat.
diff --git a/tools/tcpdf/examples/data/table_data_demo.txt b/tools/tcpdf/examples/data/table_data_demo.txt
deleted file mode 100644
index 5a48a42e77..0000000000
--- a/tools/tcpdf/examples/data/table_data_demo.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Austria;Vienna;83859;8075
-Belgium;Brussels;30518;10192
-Denmark;Copenhagen;43094;5295
-Finland;Helsinki;304529;5147
-France;Paris;543965;58728
-Germany;Berlin;357022;82057
-Greece;Athens;131625;10511
-Ireland;Dublin;70723;3694
-Italy;Roma;301316;57563
-Luxembourg;Luxembourg;2586;424
-Netherlands;Amsterdam;41526;15654
-Portugal;Lisbon;91906;9957
-Spain;Madrid;504790;39348
-Sweden;Stockholm;410934;8839
-United Kingdom;London;243820;58862
diff --git a/tools/tcpdf/examples/data/utf8test.txt b/tools/tcpdf/examples/data/utf8test.txt
deleted file mode 100644
index 291d4e7355..0000000000
--- a/tools/tcpdf/examples/data/utf8test.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-Sentences that contain all letters commonly used in a language
---------------------------------------------------------------
-
-This file is UTF-8 encoded.
-
-Czech (cz)
----------
-
- Příšerně žluťoučký kůň úpěl ďábelské ódy.
- Hleď, toť přízračný kůň v mátožné póze šíleně úpí.
- Zvlášť zákeřný učeň s ďolíčky běží podél zóny úlů.
- Loď čeří kýlem tůň obzvlášť v Grónské úžině.
- Ó, náhlý déšť již zvířil prach a čilá laň teď běží s houfcem gazel k úkrytům.
-
-Danish (da)
----------
-
- Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen
- Wolther spillede på xylofon.
- (= Quiz contestants were eating strawbery with cream while Wolther
- the circus clown played on xylophone.)
-
-German (de)
------------
-
- Falsches Üben von Xylophonmusik quält jeden größeren Zwerg
- (= Wrongful practicing of xylophone music tortures every larger dwarf)
-
- Zwölf Boxkämpfer jagten Eva quer über den Sylter Deich
- (= Twelve boxing fighters hunted Eva across the dike of Sylt)
-
- Heizölrückstoßabdämpfung
- (= fuel oil recoil absorber)
- (jqvwxy missing, but all non-ASCII letters in one word)
-
-English (en)
-------------
-
- The quick brown fox jumps over the lazy dog
-
-Spanish (es)
-------------
-
- El pingüino Wenceslao hizo kilómetros bajo exhaustiva lluvia y
- frío, añoraba a su querido cachorro.
- (Contains every letter and every accent, but not every combination
- of vowel + acute.)
-
-French (fr)
------------
-
- Portez ce vieux whisky au juge blond qui fume sur son île intérieure, à
- côté de l'alcôve ovoïde, où les bûches se consument dans l'âtre, ce
- qui lui permet de penser à la cænogenèse de l'être dont il est question
- dans la cause ambiguë entendue à Moÿ, dans un capharnaüm qui,
- pense-t-il, diminue çà et là la qualité de son œuvre.
-
- l'île exiguë
- Où l'obèse jury mûr
- Fête l'haï volapük,
- Âne ex aéquo au whist,
- Ôtez ce vœu déçu.
-
- Le cœur déçu mais l'âme plutôt naïve, Louÿs rêva de crapaüter en
- canoë au delà des îles, près du mälström où brûlent les novæ.
-
-Irish Gaelic (ga)
------------------
-
- D'fhuascail Íosa, Úrmhac na hÓighe Beannaithe, pór Éava agus Ádhaimh
-
-Hungarian (hu)
---------------
-
- Árvíztűrő tükörfúrógép
- (= flood-proof mirror-drilling machine, only all non-ASCII letters)
-
-Icelandic (is)
---------------
-
- Kæmi ný öxi hér ykist þjófum nú bæði víl og ádrepa
-
- Sævör grét áðan því úlpan var ónýt
- (some ASCII letters missing)
-
-Greek (el)
--------------
-
- Γαζέες καὶ μυρτιὲς δὲν θὰ βρῶ πιὰ στὸ χρυσαφὶ ξέφωτο
- (= No more shall I see acacias or myrtles in the golden clearing)
-
- Ξεσκεπάζω τὴν ψυχοφθόρα βδελυγμία
- (= I uncover the soul-destroying abhorrence)
-
-Hebrew (iw)
------------
-
- ? דג סקרן שט בים מאוכזב ולפתע מצא לו חברה איך הקליטה
-
-Polish (pl)
------------
-
- Pchnąć w tę łódź jeża lub osiem skrzyń fig
- (= To push a hedgehog or eight bins of figs in this boat)
-
- Zażółć gęślą jaźń
-
-Russian (ru)
-------------
-
- В чащах юга жил бы цитрус? Да, но фальшивый экземпляр!
- (= Would a citrus live in the bushes of south? Yes, but only a fake one!)
-
-Thai (th)
----------
-
- [--------------------------|------------------------]
- ๏ เป็นมนุษย์สุดประเสริฐเลิศคุณค่า กว่าบรรดาฝูงสัตว์เดรัจฉาน
- จงฝ่าฟันพัฒนาวิชาการ อย่าล้างผลาญฤๅเข่นฆ่าบีฑาใคร
- ไม่ถือโทษโกรธแช่งซัดฮึดฮัดด่า หัดอภัยเหมือนกีฬาอัชฌาสัย
- ปฏิบัติประพฤติกฎกำหนดใจ พูดจาให้จ๊ะๆ จ๋าๆ น่าฟังเอย ฯ
-
- [The copyright for the Thai example is owned by The Computer
- Association of Thailand under the Royal Patronage of His Majesty the
- King.]
-
-Please let me know if you find others! Special thanks to the people
-from all over the world who contributed these sentences.
diff --git a/tools/tcpdf/examples/example_001.php b/tools/tcpdf/examples/example_001.php
deleted file mode 100644
index 82555e6b25..0000000000
--- a/tools/tcpdf/examples/example_001.php
+++ /dev/null
@@ -1,110 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 001');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 001', PDF_HEADER_STRING, array(0,64,255), array(0,64,128));
-$pdf->setFooterData(array(0,64,0), array(0,64,128));
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set default font subsetting mode
-$pdf->setFontSubsetting(true);
-
-// Set font
-// dejavusans is a UTF-8 Unicode font, if you only need to
-// print standard ASCII chars, you can use core fonts like
-// helvetica or times to reduce file size.
-$pdf->setFont('dejavusans', '', 14, '', true);
-
-// Add a page
-// This method has several options, check the source code documentation for more information.
-$pdf->AddPage();
-
-// set text shadow effect
-$pdf->setTextShadow(array('enabled'=>true, 'depth_w'=>0.2, 'depth_h'=>0.2, 'color'=>array(196,196,196), 'opacity'=>1, 'blend_mode'=>'Normal'));
-
-// Set some content to print
-$html = <<Welcome to TCPDF !
-This is the first example of TCPDF library.
-This text is printed using the writeHTMLCell() method but you can also use: Multicell(), writeHTML(), Write(), Cell() and Text().
-Please check the source code documentation and other examples for further information.
-TO IMPROVE AND EXPAND TCPDF I NEED YOUR SUPPORT, PLEASE MAKE A DONATION!
-EOD;
-
-// Print text using writeHTMLCell()
-$pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
-
-// ---------------------------------------------------------
-
-// Close and output PDF document
-// This method has several options, check the source code documentation for more information.
-$pdf->Output('example_001.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_002.php b/tools/tcpdf/examples/example_002.php
deleted file mode 100644
index f40a2014a3..0000000000
--- a/tools/tcpdf/examples/example_002.php
+++ /dev/null
@@ -1,91 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 002');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// remove default header/footer
-$pdf->setPrintHeader(false);
-$pdf->setPrintFooter(false);
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('times', 'BI', 20);
-
-// add a page
-$pdf->AddPage();
-
-// set some text to print
-$txt = <<Write(0, $txt, '', 0, 'C', true, 0, false, false, 0);
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_002.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_003.php b/tools/tcpdf/examples/example_003.php
deleted file mode 100644
index eeeb0c8d5e..0000000000
--- a/tools/tcpdf/examples/example_003.php
+++ /dev/null
@@ -1,122 +0,0 @@
-Image($image_file, 10, 10, 15, '', 'JPG', '', 'T', false, 300, '', false, false, 0, false, false, false);
- // Set font
- $this->setFont('helvetica', 'B', 20);
- // Title
- $this->Cell(0, 15, '<< TCPDF Example 003 >>', 0, false, 'C', 0, '', 0, false, 'M', 'M');
- }
-
- // Page footer
- public function Footer() {
- // Position at 15 mm from bottom
- $this->setY(-15);
- // Set font
- $this->setFont('helvetica', 'I', 8);
- // Page number
- $this->Cell(0, 10, 'Page '.$this->getAliasNumPage().'/'.$this->getAliasNbPages(), 0, false, 'C', 0, '', 0, false, 'T', 'M');
- }
-}
-
-// create new PDF document
-$pdf = new MYPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);
-
-// set document information
-$pdf->setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 003');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('times', 'BI', 12);
-
-// add a page
-$pdf->AddPage();
-
-// set some text to print
-$txt = <<Write(0, $txt, '', 0, 'C', true, 0, false, false, 0);
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_003.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_004.php b/tools/tcpdf/examples/example_004.php
deleted file mode 100644
index a1f69a5b90..0000000000
--- a/tools/tcpdf/examples/example_004.php
+++ /dev/null
@@ -1,123 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 004');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 004', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('times', '', 11);
-
-// add a page
-$pdf->AddPage();
-
-//Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=0, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M')
-
-// test Cell stretching
-$pdf->Cell(0, 0, 'TEST CELL STRETCH: no stretch', 1, 1, 'C', 0, '', 0);
-$pdf->Cell(0, 0, 'TEST CELL STRETCH: scaling', 1, 1, 'C', 0, '', 1);
-$pdf->Cell(0, 0, 'TEST CELL STRETCH: force scaling', 1, 1, 'C', 0, '', 2);
-$pdf->Cell(0, 0, 'TEST CELL STRETCH: spacing', 1, 1, 'C', 0, '', 3);
-$pdf->Cell(0, 0, 'TEST CELL STRETCH: force spacing', 1, 1, 'C', 0, '', 4);
-
-$pdf->Ln(5);
-
-$pdf->Cell(45, 0, 'TEST CELL STRETCH: scaling', 1, 1, 'C', 0, '', 1);
-$pdf->Cell(45, 0, 'TEST CELL STRETCH: force scaling', 1, 1, 'C', 0, '', 2);
-$pdf->Cell(45, 0, 'TEST CELL STRETCH: spacing', 1, 1, 'C', 0, '', 3);
-$pdf->Cell(45, 0, 'TEST CELL STRETCH: force spacing', 1, 1, 'C', 0, '', 4);
-
-$pdf->AddPage();
-
-// example using general stretching and spacing
-
-for ($stretching = 90; $stretching <= 110; $stretching += 10) {
- for ($spacing = -0.254; $spacing <= 0.254; $spacing += 0.254) {
-
- // set general stretching (scaling) value
- $pdf->setFontStretching($stretching);
-
- // set general spacing value
- $pdf->setFontSpacing($spacing);
-
- $pdf->Cell(0, 0, 'Stretching '.$stretching.'%, Spacing '.sprintf('%+.3F', $spacing).'mm, no stretch', 1, 1, 'C', 0, '', 0);
- $pdf->Cell(0, 0, 'Stretching '.$stretching.'%, Spacing '.sprintf('%+.3F', $spacing).'mm, scaling', 1, 1, 'C', 0, '', 1);
- $pdf->Cell(0, 0, 'Stretching '.$stretching.'%, Spacing '.sprintf('%+.3F', $spacing).'mm, force scaling', 1, 1, 'C', 0, '', 2);
- $pdf->Cell(0, 0, 'Stretching '.$stretching.'%, Spacing '.sprintf('%+.3F', $spacing).'mm, spacing', 1, 1, 'C', 0, '', 3);
- $pdf->Cell(0, 0, 'Stretching '.$stretching.'%, Spacing '.sprintf('%+.3F', $spacing).'mm, force spacing', 1, 1, 'C', 0, '', 4);
-
- $pdf->Ln(2);
- }
-}
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_004.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_005.php b/tools/tcpdf/examples/example_005.php
deleted file mode 100644
index c27dfeac44..0000000000
--- a/tools/tcpdf/examples/example_005.php
+++ /dev/null
@@ -1,160 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 005');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 005', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('times', '', 10);
-
-// add a page
-$pdf->AddPage();
-
-// set cell padding
-$pdf->setCellPaddings(1, 1, 1, 1);
-
-// set cell margins
-$pdf->setCellMargins(1, 1, 1, 1);
-
-// set color for background
-$pdf->setFillColor(255, 255, 127);
-
-// MultiCell($w, $h, $txt, $border=0, $align='J', $fill=0, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0)
-
-// set some text for example
-$txt = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.';
-
-// Multicell test
-$pdf->MultiCell(55, 5, '[LEFT] '.$txt, 1, 'L', 1, 0, '', '', true);
-$pdf->MultiCell(55, 5, '[RIGHT] '.$txt, 1, 'R', 0, 1, '', '', true);
-$pdf->MultiCell(55, 5, '[CENTER] '.$txt, 1, 'C', 0, 0, '', '', true);
-$pdf->MultiCell(55, 5, '[JUSTIFY] '.$txt."\n", 1, 'J', 1, 2, '' ,'', true);
-$pdf->MultiCell(55, 5, '[DEFAULT] '.$txt, 1, '', 0, 1, '', '', true);
-
-$pdf->Ln(4);
-
-// set color for background
-$pdf->setFillColor(220, 255, 220);
-
-// Vertical alignment
-$pdf->MultiCell(55, 40, '[VERTICAL ALIGNMENT - TOP] '.$txt, 1, 'J', 1, 0, '', '', true, 0, false, true, 40, 'T');
-$pdf->MultiCell(55, 40, '[VERTICAL ALIGNMENT - MIDDLE] '.$txt, 1, 'J', 1, 0, '', '', true, 0, false, true, 40, 'M');
-$pdf->MultiCell(55, 40, '[VERTICAL ALIGNMENT - BOTTOM] '.$txt, 1, 'J', 1, 1, '', '', true, 0, false, true, 40, 'B');
-
-$pdf->Ln(4);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// set color for background
-$pdf->setFillColor(215, 235, 255);
-
-// set some text for example
-$txt = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue. Sed vel velit erat. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Cras eget velit nulla, eu sagittis elit. Nunc ac arcu est, in lobortis tellus. Praesent condimentum rhoncus sodales. In hac habitasse platea dictumst. Proin porta eros pharetra enim tincidunt dignissim nec vel dolor. Cras sapien elit, ornare ac dignissim eu, ultricies ac eros. Maecenas augue magna, ultrices a congue in, mollis eu nulla. Nunc venenatis massa at est eleifend faucibus. Vivamus sed risus lectus, nec interdum nunc.
-
-Fusce et felis vitae diam lobortis sollicitudin. Aenean tincidunt accumsan nisi, id vehicula quam laoreet elementum. Phasellus egestas interdum erat, et viverra ipsum ultricies ac. Praesent sagittis augue at augue volutpat eleifend. Cras nec orci neque. Mauris bibendum posuere blandit. Donec feugiat mollis dui sit amet pellentesque. Sed a enim justo. Donec tincidunt, nisl eget elementum aliquam, odio ipsum ultrices quam, eu porttitor ligula urna at lorem. Donec varius, eros et convallis laoreet, ligula tellus consequat felis, ut ornare metus tellus sodales velit. Duis sed diam ante. Ut rutrum malesuada massa, vitae consectetur ipsum rhoncus sed. Suspendisse potenti. Pellentesque a congue massa.';
-
-// print a blox of text using multicell()
-$pdf->MultiCell(80, 5, $txt."\n", 1, 'J', 1, 1, '' ,'', true);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// AUTO-FITTING
-
-// set color for background
-$pdf->setFillColor(255, 235, 235);
-
-// Fit text on cell by reducing font size
-$pdf->MultiCell(55, 60, '[FIT CELL] '.$txt."\n", 1, 'J', 1, 1, 125, 145, true, 0, false, true, 60, 'M', true);
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// CUSTOM PADDING
-
-// set color for background
-$pdf->setFillColor(255, 255, 215);
-
-// set font
-$pdf->setFont('helvetica', '', 8);
-
-// set cell padding
-$pdf->setCellPaddings(2, 4, 6, 8);
-
-$txt = "CUSTOM PADDING:\nLeft=2, Top=4, Right=6, Bottom=8\nLorem ipsum dolor sit amet, consectetur adipiscing elit. In sed imperdiet lectus. Phasellus quis velit velit, non condimentum quam. Sed neque urna, ultrices ac volutpat vel, laoreet vitae augue.\n";
-
-$pdf->MultiCell(55, 5, $txt, 1, 'J', 1, 2, 125, 210, true);
-
-// move pointer to last page
-$pdf->lastPage();
-
-// ---------------------------------------------------------
-
-//Close and output PDF document
-$pdf->Output('example_005.pdf', 'I');
-
-//============================================================+
-// END OF FILE
-//============================================================+
diff --git a/tools/tcpdf/examples/example_006.php b/tools/tcpdf/examples/example_006.php
deleted file mode 100644
index f2c7dbca71..0000000000
--- a/tools/tcpdf/examples/example_006.php
+++ /dev/null
@@ -1,347 +0,0 @@
-setCreator(PDF_CREATOR);
-$pdf->setAuthor('Nicola Asuni');
-$pdf->setTitle('TCPDF Example 006');
-$pdf->setSubject('TCPDF Tutorial');
-$pdf->setKeywords('TCPDF, PDF, example, test, guide');
-
-// set default header data
-$pdf->setHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE.' 006', PDF_HEADER_STRING);
-
-// set header and footer fonts
-$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN));
-$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA));
-
-// set default monospaced font
-$pdf->setDefaultMonospacedFont(PDF_FONT_MONOSPACED);
-
-// set margins
-$pdf->setMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT);
-$pdf->setHeaderMargin(PDF_MARGIN_HEADER);
-$pdf->setFooterMargin(PDF_MARGIN_FOOTER);
-
-// set auto page breaks
-$pdf->setAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM);
-
-// set image scale factor
-$pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);
-
-// set some language-dependent strings (optional)
-if (@file_exists(dirname(__FILE__).'/lang/eng.php')) {
- require_once(dirname(__FILE__).'/lang/eng.php');
- $pdf->setLanguageArray($l);
-}
-
-// ---------------------------------------------------------
-
-// set font
-$pdf->setFont('dejavusans', '', 10);
-
-// add a page
-$pdf->AddPage();
-
-// writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='')
-// writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=0, $reseth=true, $align='', $autopadding=true)
-
-// create some HTML content
-$html = 'HTML Example
-Some special characters: < € € € & è è © > \\slash \\\\double-slash \\\\\\triple-slash
-List
-List example:
-
- 
test image- bold text
- - italic text
- - underlined text
- - bbibiubib
- - link to http://www.tecnick.com
- - Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo.
Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt.
- - SUBLIST
-
- - row one
-
-
- - row two
-
-
- - TEST
line through
- - font + 3
- - small text normal small text normal subscript normal superscript normal
-
-
- - Coffee
- - Black hot drink
- - Milk
- - White cold drink
-
-';
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-
-// output some RTL HTML content
-$html = 'The words “מזל [mazel] טוב [tov]” mean “Congratulations!”
';
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// test some inline CSS
-$html = 'This is just an example of html code to demonstrate some supported CSS inline styles.
-bold text
-line-trough
-underline and line-trough
-color
-background color
-bold
-xx-small
-x-small
-small
-medium
-large
-x-large
-xx-large
-
';
-
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// reset pointer to the last page
-$pdf->lastPage();
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// Print a table
-
-// add a page
-$pdf->AddPage();
-
-// create some HTML content
-$subtable = '';
-
-$html = 'HTML TABLE:
-
-
- | # |
- RIGHT align |
- LEFT align |
- 4A |
-
-
- | 1 |
- A1 example link column span. One two tree four five six seven eight nine ten.
line after br
small text normal subscript normal superscript normal bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla- first
- sublist
- sublist
- second
small small small small small small small small small small small small small small small small small small small small |
- 4B |
-
-
- | '.$subtable.' |
- A2 € € € & è è
A2 € € € & è è |
- Red Yellow BG |
- 4C |
-
-
- | 1A |
- 2AA
2AB
2AC |
- 4D |
-
-
- | 1B |
- 4E |
-
-
- | 1C |
- 2C |
- 3C |
- 4F |
-
-
';
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// Print some HTML Cells
-
-$html = 'red green blue
red green blue';
-
-$pdf->setFillColor(255,255,0);
-
-$pdf->writeHTMLCell(0, 0, '', '', $html, 'LRTB', 1, 0, true, 'L', true);
-$pdf->writeHTMLCell(0, 0, '', '', $html, 'LRTB', 1, 1, true, 'C', true);
-$pdf->writeHTMLCell(0, 0, '', '', $html, 'LRTB', 1, 0, true, 'R', true);
-
-// reset pointer to the last page
-$pdf->lastPage();
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// Print a table
-
-// add a page
-$pdf->AddPage();
-
-// create some HTML content
-$html = 'Image alignments on HTML table
-';
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// create some HTML content
-$html = 'Embedded Images
-
-| src="@..." |  |
-| src="data..." |  |
-
';
-
-$data = base64_encode(file_get_contents("images/logo_example.png"));
-$html = str_replace("@DATA1@", "@" . $data, $html);
-$html = str_replace("@DATA2@", "data:image/png;base64," . $data, $html);
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// reset pointer to the last page
-$pdf->lastPage();
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// Print all HTML colors
-
-// add a page
-$pdf->AddPage();
-
-$textcolors = 'HTML Text Colors
';
-$bgcolors = '
HTML Background Colors
';
-
-foreach(TCPDF_COLORS::$webcolor as $k => $v) {
- $textcolors .= ''.$v.' ';
- $bgcolors .= ''.$v.' ';
-}
-
-// output the HTML content
-$pdf->writeHTML($textcolors, true, false, true, false, '');
-$pdf->writeHTML($bgcolors, true, false, true, false, '');
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-// Test word-wrap
-
-// create some HTML content
-$html = '
-Various tests
-link to page 2
-thisisaverylongword thisisanotherverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword thisisanotherverylongword thisisaverylongword';
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// Test fonts nesting
-$html1 = 'Default Courier Helvetica Times dejavusans Times Helvetica Courier Default';
-$html2 = 'small text normal small text normal subscript normal superscript normal';
-$html3 = 'The quick brown fox jumps over the lazy dog.';
-
-$html = $html1.'
'.$html2.'
'.$html3.'
'.$html3.'
'.$html2;
-
-// output the HTML content
-$pdf->writeHTML($html, true, false, true, false, '');
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-// test pre tag
-
-// add a page
-$pdf->AddPage();
-
-$html = <<
-Hello World!
-Hello
-
-