Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/NatLibFi/NDL-VuFind2 into fi…
Browse files Browse the repository at this point in the history 
…nna-1243
  • Loading branch information
@tmikkonen
tmikkonen committed Apr 4, 2024
2 parents 7c93439 + 7dfd962 commit 47e68fd
Show file tree
Hide file tree
Showing 404 changed files with 2,811 additions and 2,429 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
/downloads
/Gruntfile.local.js
/solr/vendor
/themes/minktest
/vendor
ChangeLog
TAGS
Expand Down
7 changes: 4 additions & 3 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<property name="phpunit_html_validation_params" value="VUFIND_HTML_VALIDATOR=${html_validator} VUFIND_HTML_VALIDATOR_FAIL_TESTS=${html_validator_fail_tests} VUFIND_HTML_VALIDATOR_LOG_FILE=${html_validator_log_file} VUFIND_HTML_VALIDATOR_QUIET=${html_validator_quiet}" />
<property name="phpunit_remote_coverage" value="" /><!-- set to 1 to enable code coverage for Mink tests -->
<property name="retain_coverage_files" value="false" /><!-- set to true to keep temporary coverage files from Mink tests -->
<property name="test_theme" value="" /><!-- set to a theme name to override the default theme for Mink tests -->

<property name="version" value="9.1.1" />

Expand Down Expand Up @@ -290,7 +291,7 @@
<property name="paramCoverageDir" value="" />
</else>
</if>
<exec dir="${srcdir}/module/VuFind/tests" command="XDEBUG_MODE=coverage VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_DEFAULT_TEST_TIMEOUT=${default_test_timeout} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} SOLR_PORT=${solr_port} ${paramCoverageDir} ${phpunit_command} --log-junit ${builddir}/reports/phpunit.xml --coverage-php ${coveragedir}/tmp/unit.cov ${phpunit_extra_params}" passthru="true" checkreturn="true" />
<exec dir="${srcdir}/module/VuFind/tests" command="XDEBUG_MODE=coverage VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_DEFAULT_TEST_TIMEOUT=${default_test_timeout} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} VUFIND_TEST_THEME=${test_theme} SOLR_PORT=${solr_port} ${paramCoverageDir} ${phpunit_command} --log-junit ${builddir}/reports/phpunit.xml --coverage-php ${coveragedir}/tmp/unit.cov ${phpunit_extra_params}" passthru="true" checkreturn="true" />

<!-- Produce coverage reports -->
<exec command="${srcdir}/vendor/bin/phpcov merge --clover ${coveragedir}/clover.xml --html ${coveragedir} ${coveragedir}/tmp" passthru="true" checkreturn="true" />
Expand All @@ -310,12 +311,12 @@

<!-- PHPUnit without logging output -->
<target name="phpunitfast" description="Run tests">
<exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_DEFAULT_TEST_TIMEOUT=${default_test_timeout} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} SOLR_PORT=${solr_port} ${phpunit_command} ${phpunit_extra_params}" passthru="true" checkreturn="true" />
<exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_DEFAULT_TEST_TIMEOUT=${default_test_timeout} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} VUFIND_TEST_THEME=${test_theme} SOLR_PORT=${solr_port} ${phpunit_command} ${phpunit_extra_params}" passthru="true" checkreturn="true" />
</target>

<!-- PHPUnit without logging output, stopping at first error or failure -->
<target name="phpunitfaster" description="Run tests until first failure">
<exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_DEFAULT_TEST_TIMEOUT=${default_test_timeout} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} SOLR_PORT=${solr_port} ${phpunit_command} --stop-on-defect ${phpunit_extra_params}" passthru="true" checkreturn="true" />
<exec dir="${srcdir}/module/VuFind/tests" command="VUFIND_MINK_DRIVER=${mink_driver} VUFIND_SCREENSHOT_DIR=${screenshot_dir} ${phpunit_html_validation_params} VUFIND_SELENIUM_BROWSER=${selenium_browser} VUFIND_SNOOZE_MULTIPLIER=${snooze_multiplier} VUFIND_DEFAULT_TEST_TIMEOUT=${default_test_timeout} VUFIND_LOCAL_DIR=${localdir} VUFIND_URL=${vufindurl} VUFIND_TEST_THEME=${test_theme} SOLR_PORT=${solr_port} ${phpunit_command} --stop-on-defect ${phpunit_extra_params}" passthru="true" checkreturn="true" />
</target>

<target name="installsolr" description="Install Solr">
Expand Down
26 changes: 13 additions & 13 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"apereo/phpcas": "1.6.1",
"browscap/browscap-php": "^7.2",
"cap60552/php-sip2": "1.0.0",
"colinmollenhour/credis": "1.15.0",
"colinmollenhour/credis": "1.16.0",
"composer/package-versions-deprecated": "1.11.99.5",
"composer/semver": "3.4.0",
"endroid/qr-code": "4.8.2",
Expand Down Expand Up @@ -72,22 +72,22 @@
"laminas/laminas-text": "2.10.0",
"laminas/laminas-validator": "2.30.1",
"laminas/laminas-view": "2.27.0",
"league/commonmark": "2.4.1",
"league/commonmark": "2.4.2",
"league/oauth2-server": "8.5.4",
"lm-commons/lmc-rbac-mvc": "3.3.2",
"matthiasmullie/minify": "1.3.71",
"pear/archive_tar": "^1.4",
"pear/http_request2": "2.5.1",
"pear/http_request2": "2.6.0",
"phing/phing": "2.17.4",
"ppito/laminas-whoops": "2.2.0",
"scssphp/scssphp": "1.11.1",
"scssphp/scssphp": "1.12.1",
"serialssolutions/summon": "1.3.1",
"slm/locale": "1.1.0",
"steverhoades/oauth2-openid-connect-server": "2.6.1",
"swagger-api/swagger-ui": "5.9.0",
"swagger-api/swagger-ui": "5.11.8",
"symfony/console": "5.4.28",
"symfony/yaml": "5.4.23",
"vstelmakh/url-highlight": "3.0.2",
"symfony/yaml": "6.4.3",
"vstelmakh/url-highlight": "3.0.3",
"vufind-org/vufindcode": "1.2",
"vufind-org/vufinddate": "1.2.0",
"vufind-org/vufindharvest": "5.2.0",
Expand All @@ -102,15 +102,15 @@
"behat/mink": "1.11.0",
"behat/mink-selenium2-driver": "1.7.0",
"dmore/chrome-mink-driver": "2.9.2",
"firebase/php-jwt": "6.8.1",
"friendsofphp/php-cs-fixer": "3.49.0",
"firebase/php-jwt": "6.10.0",
"friendsofphp/php-cs-fixer": "3.51.0",
"phpmd/phpmd": "2.15.0",
"phpstan/phpstan": "1.10.57",
"phpstan/phpstan": "1.10.59",
"phpunit/php-code-coverage": "10.1.11",
"phpunit/phpcov": "^9.0",
"phpunit/phpunit": "10.5.10",
"pietercolpaert/hardf": "0.3.1",
"squizlabs/php_codesniffer": "3.8.1"
"phpunit/phpunit": "10.5.11",
"pietercolpaert/hardf": "0.4.0",
"squizlabs/php_codesniffer": "3.9.0"
},
"extra": {
"merge-plugin": {
Expand Down
Loading

0 comments on commit 47e68fd

Please sign in to comment.