Skip to content

Commit

Permalink
Merge branch 'dev' into folio-request-check-current-loan
Browse files Browse the repository at this point in the history
  • Loading branch information
@maccabeelevine
maccabeelevine committed Sep 11, 2024
2 parents 37f8eb7 + 053de2e commit 134d0b8
Show file tree
Hide file tree
Showing 272 changed files with 4,292 additions and 1,551 deletions.
17 changes: 10 additions & 7 deletions build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,7 @@
<regexp pattern=";file\s+= /var/log/vufind.log:alert,error,notice,debug" replace="file = ${srcdir}/vufind-exception.log:alert-5,error-5" />
<regexp pattern="(\[System\]\s+)" replace="\1runningTestSuite=1" />
<regexp pattern="(url\s+= http://localhost):8983/solr" replace="\1:${solr_port}/solr" />
<regexp pattern="browserDetectLanguage = true" replace="browserDetectLanguage = false" />
</replaceregexp>
</filterchain>
</copy>
Expand Down Expand Up @@ -805,19 +806,21 @@ return [
</then>
<else>
<exec executable="sudo">
<arg line="su -c &quot;psql -c \&quot;DROP DATABASE ${vufinddb};\&quot;&quot; ${pgsqlrootuser}" />
<arg line="su -c &quot;psql -c 'DROP DATABASE ${vufinddb};'&quot; ${pgsqlrootuser}" />
</exec>
<exec executable="sudo">
<arg line="su -c &quot;psql -c \&quot;DROP USER ${vufinddbuser};\&quot;&quot; ${pgsqlrootuser}" />
<arg line="su -c &quot;psql -c 'DROP USER ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
</exec>
<exec executable="sudo" checkreturn="true">
<arg line="su -c &quot;psql -c \&quot;CREATE DATABASE ${vufinddb};\&quot;&quot; ${pgsqlrootuser}" />
<arg line="su -c &quot;psql -c 'CREATE DATABASE ${vufinddb};'&quot; ${pgsqlrootuser}" />
</exec>
<exec executable="sudo" checkreturn="true">
<arg line="su -c &quot;psql -c \&quot;CREATE USER ${vufinddbuser} PASSWORD '${vufinddbpass}';\&quot;&quot; ${pgsqlrootuser}" />
<!-- due to deep quote nesting and Phing bugs, we need to use a variable to make this work -->
<env key="PG_COMMAND" value="&quot;\&quot;CREATE USER ${vufinddbuser} PASSWORD '${vufinddbpass}';\&quot;&quot;" />
<arg line="su -c &quot;psql -c $PG_COMMAND &quot; ${pgsqlrootuser}" />
</exec>
<exec executable="sudo" checkreturn="true">
<arg line="su -c &quot;psql -c \&quot;GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};\&quot;&quot; ${pgsqlrootuser}" />
<arg line="su -c &quot;psql -c 'GRANT ALL ON DATABASE ${vufinddb} TO ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
</exec>
</else>
</if>
Expand Down Expand Up @@ -966,10 +969,10 @@ ${git_status}
<equals arg1="${dbtype}" arg2="pgsql" />
<then>
<exec executable="sudo" checkreturn="true">
<arg line="su -c &quot;psql -c \&quot;DROP DATABASE ${vufinddb};\&quot;&quot; ${pgsqlrootuser}" />
<arg line="su -c &quot;psql -c 'DROP DATABASE ${vufinddb};'&quot; ${pgsqlrootuser}" />
</exec>
<exec executable="sudo" checkreturn="true">
<arg line="su -c &quot;psql -c \&quot;DROP USER ${vufinddbuser};\&quot;&quot; ${pgsqlrootuser}" />
<arg line="su -c &quot;psql -c 'DROP USER ${vufinddbuser};'&quot; ${pgsqlrootuser}" />
</exec>
</then>
<else>
Expand Down
52 changes: 26 additions & 26 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,35 @@
"apereo/phpcas": "1.6.1",
"browscap/browscap-php": "^7.2",
"cap60552/php-sip2": "1.0.0",
"colinmollenhour/credis": "1.16.0",
"colinmollenhour/credis": "1.16.1",
"composer/package-versions-deprecated": "1.11.99.5",
"composer/semver": "3.4.0",
"composer/semver": "3.4.2",
"endroid/qr-code": "5.0.9",
"guzzlehttp/guzzle": "7.8.1",
"guzzlehttp/guzzle": "7.9.2",
"jaybizzle/crawler-detect": "^1.2",
"laminas/laminas-cache": "3.12.1",
"laminas/laminas-cache": "3.12.2",
"laminas/laminas-cache-storage-adapter-blackhole": "^2.0",
"laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
"laminas/laminas-cache-storage-adapter-memcached": "^2.0",
"laminas/laminas-cache-storage-adapter-memory": "^2.0",
"laminas/laminas-captcha": "2.17.0",
"laminas/laminas-code": "4.13.0",
"laminas/laminas-code": "4.14.0",
"laminas/laminas-config": "3.9.0",
"laminas/laminas-crypt": "3.11.0",
"laminas/laminas-db": "2.20.0",
"laminas/laminas-diactoros": "3.3.1",
"laminas/laminas-dom": "2.14.0",
"laminas/laminas-escaper": "2.13.0",
"laminas/laminas-eventmanager": "3.13.0",
"laminas/laminas-eventmanager": "3.13.1",
"laminas/laminas-feed": "2.22.0",
"laminas/laminas-filter": "2.35.2",
"laminas/laminas-form": "3.19.2",
"laminas/laminas-filter": "2.37.0",
"laminas/laminas-form": "3.20.1",
"laminas/laminas-http": "2.19.0",
"laminas/laminas-i18n": "2.26.0",
"laminas/laminas-i18n": "2.28.0",
"laminas/laminas-loader": "2.10.0",
"laminas/laminas-log": "2.17.0",
"laminas/laminas-mail": "2.25.1",
"laminas/laminas-modulemanager": "2.15.0",
"laminas/laminas-modulemanager": "2.16.0",
"laminas/laminas-mvc": "3.7.0",
"laminas/laminas-mvc-i18n": "1.8.0",
"laminas/laminas-mvc-plugin-flashmessenger": "1.10.1",
Expand All @@ -68,29 +68,29 @@
"laminas/laminas-recaptcha": "3.7.0",
"laminas/laminas-serializer": "2.17.0",
"laminas/laminas-servicemanager": "3.22.1",
"laminas/laminas-session": "2.20.0",
"laminas/laminas-session": "2.21.0",
"laminas/laminas-stdlib": "3.19.0",
"laminas/laminas-text": "2.11.0",
"laminas/laminas-validator": "2.55.0",
"laminas/laminas-view": "2.27.0",
"league/commonmark": "2.4.2",
"league/commonmark": "2.5.3",
"league/oauth2-server": "8.5.4",
"lm-commons/lmc-rbac-mvc": "3.3.2",
"lm-commons/lmc-rbac-mvc": "3.4.0",
"matthiasmullie/minify": "1.3.73",
"pear/archive_tar": "^1.4",
"pear/http_request2": "2.6.0",
"phing/phing": "3.0.0",
"ppito/laminas-whoops": "2.2.0",
"scssphp/scssphp": "1.12.1",
"scssphp/scssphp": "1.13.0",
"serialssolutions/summon": "1.3.1",
"slm/locale": "1.1.0",
"steverhoades/oauth2-openid-connect-server": "2.6.1",
"swagger-api/swagger-ui": "5.11.10",
"symfony/console": "6.4.8",
"swagger-api/swagger-ui": "5.17.14",
"symfony/console": "6.4.11",
"symfony/rate-limiter": "^6.4",
"symfony/var-dumper": "6.4.8",
"symfony/yaml": "6.4.8",
"vstelmakh/url-highlight": "3.0.3",
"symfony/var-dumper": "6.4.11",
"symfony/yaml": "6.4.11",
"vstelmakh/url-highlight": "3.1.0",
"vufind-org/vufindcode": "1.2",
"vufind-org/vufinddate": "1.2.0",
"vufind-org/vufindharvest": "5.3.0",
Expand All @@ -104,16 +104,16 @@
"require-dev": {
"behat/mink": "1.11.0",
"behat/mink-selenium2-driver": "1.7.0",
"dmore/chrome-mink-driver": "2.9.2",
"dmore/chrome-mink-driver": "2.9.3",
"firebase/php-jwt": "6.10.1",
"friendsofphp/php-cs-fixer": "3.51.0",
"friendsofphp/php-cs-fixer": "3.64.0",
"phpmd/phpmd": "2.15.0",
"phpstan/phpstan": "1.11.4",
"phpunit/php-code-coverage": "10.1.14",
"phpstan/phpstan": "1.12.2",
"phpunit/php-code-coverage": "10.1.16",
"phpunit/phpcov": "^9.0",
"phpunit/phpunit": "10.5.20",
"pietercolpaert/hardf": "0.4.0",
"squizlabs/php_codesniffer": "3.10.1"
"phpunit/phpunit": "10.5.32",
"pietercolpaert/hardf": "0.5.0",
"squizlabs/php_codesniffer": "3.10.2"
},
"extra": {
"merge-plugin": {
Expand Down
Loading

0 comments on commit 134d0b8

Please sign in to comment.