Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump submodules/php-plugin from 0f710ff to fe1a810 #4347

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Bump submodules/php-plugin from 0f710ff to fe1a810 #4347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32e36e3
Bump submodules/php-plugin from `0f710ff` to `fe1a810`
dependabot[bot] Nov 24, 2023
f25b79f
update php plugin
dzmitry-rudnouski Dec 14, 2023
3b6abfe
update checkstyle plugin
dzmitry-rudnouski Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
nginx_config_path: /etc/nginx/conf.d/sonar.conf

# Plugin versions
checkstyle_pversion: "{% if sonar_version is version(\"8.9.3\", \">=\") %}10.12.3\
checkstyle_pversion: "{% if sonar_version is version(\"8.9.3\", \">=\") %}10.12.5\
{% elif sonar_version is version(\"7.9\", \">=\") %}8.45.1\
{% else %}4.27\
{% endif %}"
Expand Down Expand Up @@ -166,7 +166,7 @@
{% else %}3.2.0.2082\
{% endif %}"

php_pversion: "{% if sonar_version is version(\"9.6\", \">=\") %}3.33.0.11274\
php_pversion: "{% if sonar_version is version(\"9.6\", \">=\") %}3.34.0.11311\
{% elif sonar_version is version(\"7.9\", \">=\") %}3.28.0.9490\
{% elif sonar_version is version(\"7.8\", \">=\") %}3.1.1.4762\
{% elif sonar_version is version(\"7.0\", \">=\") %}3.0.0.4537\
Expand Down Expand Up @@ -348,7 +348,7 @@
- "https://github.com/wttech/AEM-Rules-for-SonarQube/releases/download/\
v{{ aem_pversion }}/sonar-aemrules-plugin-{{ aem_pversion }}.jar"

sonar_all_plugins: "{{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) +\

Check warning on line 351 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / all-sonar-latest

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) +sonar_update_default_plugins | ternary(sonar_default_plugins, []) +sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }} -> {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) + sonar_update_default_plugins | ternary(sonar_default_plugins, []) + sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }}

Check warning on line 351 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / ubuntu1804-ansible-old (6)

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) +sonar_update_default_plugins | ternary(sonar_default_plugins, []) +sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }} -> {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) + sonar_update_default_plugins | ternary(sonar_default_plugins, []) + sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }}

Check warning on line 351 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / ubuntu1804-sonar-old (8.9.10.61524)

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) +sonar_update_default_plugins | ternary(sonar_default_plugins, []) +sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }} -> {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) + sonar_update_default_plugins | ternary(sonar_default_plugins, []) + sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }}

Check warning on line 351 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / ubuntu1804-sonar-old (7.9.6)

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) +sonar_update_default_plugins | ternary(sonar_default_plugins, []) +sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }} -> {{ sonar_install_recommended_plugins | ternary(sonar_recommended_plugins, []) + sonar_update_default_plugins | ternary(sonar_default_plugins, []) + sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }}
sonar_update_default_plugins | ternary(sonar_default_plugins, []) +\
sonar_install_optional_plugins | ternary(sonar_optional_plugins, []) }}"

Expand Down Expand Up @@ -596,7 +596,7 @@
# Override this var to exclude default plugins you don't need
sonar_default_excluded_plugins: []

sonar_all_excluded_plugins: "{{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) +\

Check warning on line 599 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / all-sonar-latest

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) +sonar_default_excluded_plugins }} -> {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) + sonar_default_excluded_plugins }}

Check warning on line 599 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / ubuntu1804-ansible-old (6)

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) +sonar_default_excluded_plugins }} -> {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) + sonar_default_excluded_plugins }}

Check warning on line 599 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / ubuntu1804-sonar-old (8.9.10.61524)

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) +sonar_default_excluded_plugins }} -> {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) + sonar_default_excluded_plugins }}

Check warning on line 599 in defaults/main.yml

View workflow job for this annotation

GitHub Actions / ubuntu1804-sonar-old (7.9.6)

jinja[spacing] 

Jinja2 spacing could be improved: {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) +sonar_default_excluded_plugins }} -> {{ sonar_update_default_plugins | ternary(sonar_excluded_plugins, []) + sonar_default_excluded_plugins }}
sonar_default_excluded_plugins }}"

# SonarQube configuration
Expand Down
2 changes: 1 addition & 1 deletion submodules/php-plugin
Open in desktop
Submodule php-plugin updated 20 files
+3 −9 .cirrus.yml
+3 −4 its/plugin/tests/src/test/java/com/sonar/it/php/CustomRulesTest.java
+4 −4 its/plugin/tests/src/test/java/com/sonar/it/php/NoSonarTest.java
+2 −3 its/plugin/tests/src/test/java/com/sonar/it/php/NonPhpProjectTest.java
+3 −4 its/plugin/tests/src/test/java/com/sonar/it/php/PHPIntegrationTest.java
+8 −10 its/plugin/tests/src/test/java/com/sonar/it/php/PHPTest.java
+2 −2 its/plugin/tests/src/test/java/com/sonar/it/php/PHPUnitTest.java
+2 −2 its/plugin/tests/src/test/java/com/sonar/it/php/PhpStanReportTest.java
+2 −2 its/plugin/tests/src/test/java/com/sonar/it/php/PsalmReportTest.java
+2 −2 its/plugin/tests/src/test/java/com/sonar/it/php/SuppressWarningsTest.java
+9 −0 its/plugin/tests/src/test/java/com/sonar/it/php/Tests.java
+1 −1 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S112.html
+1 −1 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S113.html
+1 −1 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S113.json
+1 −1 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S1603.html
+39 −24 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S3333.html
+0 −1 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S3333.json
+2 −2 php-checks/src/main/resources/org/sonar/l10n/php/rules/php/S3415.html
+1 −2 pom.xml
+1 −1 sonarpedia.json
Loading