Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge remote-tracking branch 'upstream/develop' into 13a11

Browse Source
This commit is contained in:
Alexandre SPANGARO
2020-09-08 08:35:42 +02:00
parent d1ba6b9476 f567d41055
commit 9165ea9e67
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@@ -277,10 +277,11 @@ script:
# Ensure we catch errors # Ensure we catch errors
set -e set -e
#parallel-lint --exclude htdocs/includes --blame . #parallel-lint --exclude htdocs/includes --blame .
parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \ parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/composer --exclude htdocs/includes/myclabs --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes \
--exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \ --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian \
--exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony --exclude htdocs/includes/mike42/escpos-php/example \ --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/php-parallel-lint --exclude htdocs/includes/symfony \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame . --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/maximebf \
--exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame .
set +e set +e
echo echo

2
htdocs/core/class/lessc.class.php
View File

@@ -750,7 +750,7 @@ class Lessc {
if ($suffix !== null && if ($suffix !== null &&
$subProp[0] == "assign" && $subProp[0] == "assign" &&
is_string($subProp[1]) && is_string($subProp[1]) &&
$subProp[1]{0} != $this->vPrefix $subProp[1][0] != $this->vPrefix
) { ) {
$subProp[2] = array( $subProp[2] = array(
'list', ' ', 'list', ' ',

18
htdocs/includes/tcpdi/tcpdi_parser.php
View File

@@ -703,11 +703,11 @@ class tcpdi_parser {
$objtype = ''; // object type to be returned $objtype = ''; // object type to be returned
$objval = ''; // object value to be returned $objval = ''; // object value to be returned
// skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP) // skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
while (strspn($data{$offset}, "\x00\x09\x0a\x0c\x0d\x20") == 1) { while (strspn($data[$offset], "\x00\x09\x0a\x0c\x0d\x20") == 1) {
$offset++; $offset++;
} }
// get first char // get first char
$char = $data{$offset}; $char = $data[$offset];
// get object type // get object type
switch ($char) { switch ($char) {
case '%': { // \x25 PERCENT SIGN case '%': { // \x25 PERCENT SIGN
@@ -738,10 +738,10 @@ class tcpdi_parser {
if ($char == '(') { if ($char == '(') {
$open_bracket = 1; $open_bracket = 1;
while ($open_bracket > 0) { while ($open_bracket > 0) {
if (!isset($data{$strpos})) { if (!isset($data[$strpos])) {
break; break;
} }
$ch = $data{$strpos}; $ch = $data[$strpos];
switch ($ch) { switch ($ch) {
case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash) case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash)
// skip next character // skip next character
@@ -786,7 +786,7 @@ class tcpdi_parser {
} }
case '<': // \x3C LESS-THAN SIGN case '<': // \x3C LESS-THAN SIGN
case '>': { // \x3E GREATER-THAN SIGN case '>': { // \x3E GREATER-THAN SIGN
if (isset($data{($offset + 1)}) AND ($data{($offset + 1)} == $char)) { if (isset($data[($offset + 1)]) AND ($data[($offset + 1)] == $char)) {
// dictionary object // dictionary object
$objtype = PDF_TYPE_DICTIONARY; $objtype = PDF_TYPE_DICTIONARY;
if ($char == '<') { if ($char == '<') {
@@ -809,7 +809,7 @@ class tcpdi_parser {
break; break;
} }
default: { default: {
$frag = $data{$offset} . @$data{$offset+1} . @$data{$offset+2} . @$data{$offset+3}; $frag = $data[$offset] . @$data[$offset+1] . @$data[$offset+2] . @$data[$offset+3];
switch ($frag) { switch ($frag) {
case 'endo': case 'endo':
// indirect object // indirect object
@@ -886,16 +886,16 @@ class tcpdi_parser {
$dict = ''; $dict = '';
$offset += 2; $offset += 2;
do { do {
if ($data{$offset} == '>' && $data{$offset+1} == '>') { if ($data[$offset] == '>' && $data[$offset+1] == '>') {
$i--; $i--;
$dict .= '>>'; $dict .= '>>';
$offset += 2; $offset += 2;
} else if ($data{$offset} == '<' && $data{$offset+1} == '<') { } else if ($data[$offset] == '<' && $data[$offset+1] == '<') {
$i++; $i++;
$dict .= '<<'; $dict .= '<<';
$offset += 2; $offset += 2;
} else { } else {
$dict .= $data{$offset}; $dict .= $data[$offset];
$offset++; $offset++;
} }
} while ($i>0); } while ($i>0);