Skip to content

Commit bea93d3

Browse files
authored
Merge pull request #1008 from nextcloud/deps/noid/php-saml-stable-5.1
[stable-5.1] build(deps): bump onelogin/php-saml to 4.3.1
2 parents 50396c3 + ad7356c commit bea93d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+850
-372
lines changed

.github/workflows/phpunit-mysql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
paths:
1111
- '.github/workflows/**'
12+
- '3rdparty/**'
1213
- 'appinfo/**'
1314
- 'lib/**'
1415
- 'templates/**'

.github/workflows/phpunit-oci.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
paths:
1111
- '.github/workflows/**'
12+
- '3rdparty/**'
1213
- 'appinfo/**'
1314
- 'lib/**'
1415
- 'templates/**'
@@ -39,7 +40,7 @@ env:
3940

4041
jobs:
4142
phpunit-oci:
42-
runs-on: ubuntu-latest
43+
runs-on: ubuntu-22.04
4344

4445
strategy:
4546
matrix:
@@ -48,10 +49,24 @@ jobs:
4849

4950
services:
5051
oracle:
51-
image: deepdiver/docker-oracle-xe-11g # 'wnameless/oracle-xe-11g-r2'
52+
image: ghcr.io/gvenzl/oracle-xe:11
53+
54+
# Provide passwords and other environment variables to container
55+
env:
56+
ORACLE_RANDOM_PASSWORD: true
57+
APP_USER: autotest
58+
APP_USER_PASSWORD: owncloud
59+
5260
ports:
5361
- 1521:1521/tcp
5462

63+
# Provide healthcheck script options for startup
64+
options: >-
65+
--health-cmd healthcheck.sh
66+
--health-interval 10s
67+
--health-timeout 5s
68+
--health-retries 10
69+
5570
steps:
5671
- name: Set app env
5772
run: |

.github/workflows/phpunit-pgsql.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
paths:
1111
- '.github/workflows/**'
12+
- '3rdparty/**'
1213
- 'appinfo/**'
1314
- 'lib/**'
1415
- 'templates/**'

.github/workflows/phpunit-sqlite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
pull_request:
1010
paths:
1111
- '.github/workflows/**'
12+
- '3rdparty/**'
1213
- 'appinfo/**'
1314
- 'lib/**'
1415
- 'templates/**'

3rdparty/composer.lock

Lines changed: 31 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3rdparty/vendor/autoload.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
echo $err;
1515
}
1616
}
17-
trigger_error(
18-
$err,
19-
E_USER_ERROR
20-
);
17+
throw new RuntimeException($err);
2118
}
2219

2320
require_once __DIR__ . '/composer/autoload_real.php';

0 commit comments

Comments
 (0)