From c094fba53821eb26ea94bb9e4e85bbcb9bbf582b Mon Sep 17 00:00:00 2001 From: MDW Date: Fri, 12 Jan 2024 17:54:14 +0100 Subject: [PATCH] Qual: Fix trailing whitespace in yaml file. (#27466) # Qual: Fix trailing whitespace in yaml file. Yaml check tools complain about trailing whitespace, so I fix them. pre-commit (#27392) has rules to fix them automatically (locally). --- .codeclimate.yml | 2 +- .github/ISSUE_TEMPLATE/bug_report.yml | 10 ++++----- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- .github/workflows/exakat.yml | 6 ++--- .github/workflows/stale-issues-safe.yml | 4 ++-- .travis.yml | 26 +++++++++++----------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index a84e6c1fdd0..98b8fd499e6 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -4,7 +4,7 @@ languages: JavaScript: true PHP: true engines: - phpcodesniffer: true + phpcodesniffer: true exclude_paths: - 'build/*' - 'dev/*' diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 3795b1b7222..2c79a8cea03 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -7,7 +7,7 @@ body: attributes: value: | This is a template to help you report good issues. You may use [Github Markdown](https://help.github.com/articles/getting-started-with-writing-and-formatting-on-github/) syntax to format your issue report. - + - type: textarea id: bug attributes: @@ -27,19 +27,19 @@ body: attributes: label: Environment OS description: Server OS type and version - + - type: input id: environment-webserver attributes: label: Environment Web server description: Webserver type and version - + - type: input id: environment-php attributes: label: Environment PHP description: PHP version - + - type: input id: environment-database attributes: @@ -63,7 +63,7 @@ body: attributes: label: Steps to reproduce the behavior description: Verbose description - + - type: textarea id: files attributes: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 885f3472d18..5d97ee6a5be 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -21,7 +21,7 @@ body: attributes: label: Use case description: Verbose description - + - type: textarea id: suggested-implementation attributes: diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml index 0b33ede5f4f..f4928280e3d 100644 --- a/.github/workflows/exakat.yml +++ b/.github/workflows/exakat.yml @@ -22,7 +22,7 @@ jobs: - name: Exakat uses: docker://exakat/exakat-ga with: - ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' + ignore_rules: 'Classes/UseInstanceof,Performances/PrePostIncrement,Functions/UndefinedFunctions,Functions/WrongNumberOfArguments,Functions/WrongTypeWithCall,Variables/UndefinedVariable,Classes/DontUnsetProperties,Classes/NonPpp,Classes/StaticMethodsCalledFromObject,Classes/UseClassOperator,Functions/UsesDefaultArguments,Php/NoClassInGlobal,Php/ShouldUseCoalesce,Php/WrongTypeForNativeFunction,Structures/AddZero,Structures/DropElseAfterReturn,Structures/IfWithSameConditions,Structures/MergeIfThen,Structures/NestedTernary,Structures/ElseIfElseif,Structures/ExitUsage,Structures/RepeatedPrint,Structures/RepeatedRegex,Structures/SameConditions,Structures/SwitchWithoutDefault,Structures/ShouldMakeTernary,Structures/UselessParenthesis,Structures/UseConstant' ignore_dirs: '/htdocs/includes/,/htdocs/install/doctemplates/,/build/,/dev/,/doc/,/scripts/,/test/' - file_extensions: php - project_reports: Perfile \ No newline at end of file + file_extensions: php + project_reports: Perfile \ No newline at end of file diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml index af04675d48d..d2678feecd4 100644 --- a/.github/workflows/stale-issues-safe.yml +++ b/.github/workflows/stale-issues-safe.yml @@ -7,7 +7,7 @@ on: issue_comment: types: [created] workflow_dispatch: - + permissions: {} # none jobs: @@ -26,4 +26,4 @@ jobs: days-before-close: 10 operations-per-run: 100 dry-run: false - + diff --git a/.travis.yml b/.travis.yml index 5c42cd5371e..275129ba8c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ jobs: - stage: PHP min and max if: type = push php: '7.1' - env: + env: - DB=postgresql - TRAVIS_PHP_VERSION=7.1 - stage: PHP min and max @@ -49,7 +49,7 @@ jobs: - stage: PHP 8.3 if: type = push AND branch = develop php: '8.3' - env: + env: - DB=mysql - TRAVIS_PHP_VERSION=8.3 @@ -89,7 +89,7 @@ before_install: if [ "$TRAVIS_PHP_VERSION" = '8.3' ]; then sudo apt install unzip apache2 php8.3 php8.3-cli php8.3-curl php8.3-mysql php8.3-pgsql php8.3-gd php8.3-imap php8.3-intl php8.3-ldap php8.3-xml php8.3-mbstring php8.3-xml php8.3-zip libapache2-mod-php8.3 fi - + - | echo Install pgsql if run is for pgsql if [ "$DB" = 'postgresql' ]; then @@ -116,15 +116,15 @@ install: - | if [ "$TRAVIS_PHP_VERSION" = '7.1' ]; then sudo update-alternatives --set php /usr/bin/php7.1 - fi + fi if [ "$TRAVIS_PHP_VERSION" = '8.1' ]; then sudo update-alternatives --set php /usr/bin/php8.1 - fi + fi if [ "$TRAVIS_PHP_VERSION" = '8.2' ]; then sudo update-alternatives --set php /usr/bin/php8.2 - fi + fi php -i | head - - + - | echo "Updating Composer config" curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php @@ -133,7 +133,7 @@ install: php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" sudo php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer sudo chmod -R a+rwx /usr/local/bin/composer - + #sudo apt install composer composer -V composer -n config -g vendor-dir htdocs/includes @@ -229,7 +229,7 @@ before_script: #sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa sudo mysqld_safe --skip-grant-tables --socket=/tmp/aaa & sleep 3 - sudo ps fauxww + sudo ps fauxww echo "MySQL set root password" sudo mysql -u root -h 127.0.0.1 -e "FLUSH PRIVILEGES; CREATE DATABASE IF NOT EXISTS travis CHARACTER SET = 'utf8'; ALTER USER 'root'@'localhost' IDENTIFIED BY 'password'; CREATE USER 'root'@'127.0.0.1' IDENTIFIED BY 'password'; CREATE USER 'travis'@'127.0.0.1' IDENTIFIED BY 'password'; GRANT ALL PRIVILEGES ON travis.* TO root@127.0.0.1; GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1; FLUSH PRIVILEGES;" echo "MySQL grant" @@ -238,7 +238,7 @@ before_script: sudo mysql -u root -h 127.0.0.1 -ppassword -e 'use mysql; select * from user;' echo "List pid file" sudo mysql -u root -h 127.0.0.1 -ppassword -e "show variables like '%pid%';" - + #sudo kill `cat /var/lib/mysqld/mysqld.pid` #sudo systemctl start mariadb @@ -246,7 +246,7 @@ before_script: sudo mysql -u root -h 127.0.0.1 -ppassword -e 'GRANT ALL PRIVILEGES ON travis.* TO travis@127.0.0.1;' echo "MySQL flush" sudo mysql -u root -h 127.0.0.1 -ppassword -e 'FLUSH PRIVILEGES;' - + echo "MySQL load sql" sudo mysql -u root -h 127.0.0.1 -ppassword -D travis < dev/initdemo/mysqldump_dolibarr_3.5.0.sql fi @@ -415,12 +415,12 @@ script: echo '$'force_install_main_data_root=\'$TRAVIS_BUILD_DIR/htdocs\'';' >> $INSTALL_FORCED_FILE #cat $INSTALL_FORCED_FILE echo - + - | echo "Upgrading Dolibarr" # Ensure we catch errors with -e. Set this to +e if you want to go to the end to see log files. # Note: We keep +e because with pgsql, one of upgrade process fails even if migration seems ok, so - # I disable stop on error to be able to continue. + # I disable stop on error to be able to continue. set +e cd htdocs/install php upgrade.php 3.5.0 3.6.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade350360.log