From 3e4f096eec8253276930c9c7caf6e76f208c16d8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Sep 2020 04:24:20 +0200 Subject: [PATCH 1/5] Travis --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd33dca86d7..1b0bc1b9c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -277,10 +277,11 @@ script: # Ensure we catch errors set -e #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/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/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame . + --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/maximebf \ + --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/webmozart --blame . set +e echo From 175276c504a37960729b1c79d065d1a8ef827981 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Sep 2020 05:07:35 +0200 Subject: [PATCH 2/5] Fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b0bc1b9c27..4d3fb663b32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -278,7 +278,7 @@ script: set -e #parallel-lint --exclude htdocs/includes --blame . 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/maximebf \ --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/webmozart --blame . From 051be517f25d48e0313fe1bd626ebe72ae475019 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Sep 2020 05:10:48 +0200 Subject: [PATCH 3/5] Fix travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d3fb663b32..c47e1b19598 100644 --- a/.travis.yml +++ b/.travis.yml @@ -281,7 +281,7 @@ script: --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/maximebf \ - --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/webmozart --blame . + --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/tecnickcom/tcpdf/include/barcodes --exclude htdocs/includes/webmozart --blame . set +e echo From fab24e8c55c8077d4ee5151c3ee27251f54d0aee Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Sep 2020 05:12:08 +0200 Subject: [PATCH 4/5] Fix phpcs --- htdocs/core/class/lessc.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php index 8ab9e58aa58..b85cfc3f399 100644 --- a/htdocs/core/class/lessc.class.php +++ b/htdocs/core/class/lessc.class.php @@ -750,7 +750,7 @@ class Lessc { if ($suffix !== null && $subProp[0] == "assign" && is_string($subProp[1]) && - $subProp[1]{0} != $this->vPrefix + $subProp[1][0] != $this->vPrefix ) { $subProp[2] = array( 'list', ' ', From f567d410550a7ca204dafe5c86bc0b7eebe219b6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 8 Sep 2020 05:16:37 +0200 Subject: [PATCH 5/5] Fix php8 --- htdocs/includes/tcpdi/tcpdi_parser.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/includes/tcpdi/tcpdi_parser.php b/htdocs/includes/tcpdi/tcpdi_parser.php index d8374ec8c00..13e9839f2b4 100644 --- a/htdocs/includes/tcpdi/tcpdi_parser.php +++ b/htdocs/includes/tcpdi/tcpdi_parser.php @@ -703,11 +703,11 @@ class tcpdi_parser { $objtype = ''; // object type 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) - while (strspn($data{$offset}, "\x00\x09\x0a\x0c\x0d\x20") == 1) { + while (strspn($data[$offset], "\x00\x09\x0a\x0c\x0d\x20") == 1) { $offset++; } // get first char - $char = $data{$offset}; + $char = $data[$offset]; // get object type switch ($char) { case '%': { // \x25 PERCENT SIGN @@ -738,10 +738,10 @@ class tcpdi_parser { if ($char == '(') { $open_bracket = 1; while ($open_bracket > 0) { - if (!isset($data{$strpos})) { + if (!isset($data[$strpos])) { break; } - $ch = $data{$strpos}; + $ch = $data[$strpos]; switch ($ch) { case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash) // skip next character @@ -786,7 +786,7 @@ class tcpdi_parser { } case '<': // \x3C LESS-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 $objtype = PDF_TYPE_DICTIONARY; if ($char == '<') { @@ -809,7 +809,7 @@ class tcpdi_parser { break; } 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) { case 'endo': // indirect object @@ -886,16 +886,16 @@ class tcpdi_parser { $dict = ''; $offset += 2; do { - if ($data{$offset} == '>' && $data{$offset+1} == '>') { + if ($data[$offset] == '>' && $data[$offset+1] == '>') { $i--; $dict .= '>>'; $offset += 2; - } else if ($data{$offset} == '<' && $data{$offset+1} == '<') { + } else if ($data[$offset] == '<' && $data[$offset+1] == '<') { $i++; $dict .= '<<'; $offset += 2; } else { - $dict .= $data{$offset}; + $dict .= $data[$offset]; $offset++; } } while ($i>0);