Skip to content

Commit 8334961

Browse files
authored
Merge pull request #1010 from nextcloud/deps/noid/php-saml-stable-3.3
[stable-3.3] build(deps): bump onelogin/php-saml to 3.8.1
2 parents 45a4816 + ae57eba commit 8334961

Some content is hidden

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

48 files changed

+1696
-518
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: 2 additions & 1 deletion
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/**'
@@ -34,7 +35,7 @@ concurrency:
3435

3536
jobs:
3637
phpunit-oci:
37-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-22.04
3839

3940
strategy:
4041
matrix:

.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/**'

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
3rdparty/vendor/onelogin/php-saml/endpoints/
88

99
build
10-
vendor
10+
/vendor
1111
composer.lock

3rdparty/composer.lock

Lines changed: 37 additions & 20 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: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22

33
// autoload.php @generated by Composer
44

5+
if (PHP_VERSION_ID < 50600) {
6+
if (!headers_sent()) {
7+
header('HTTP/1.1 500 Internal Server Error');
8+
}
9+
$err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
10+
if (!ini_get('display_errors')) {
11+
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
12+
fwrite(STDERR, $err);
13+
} elseif (!headers_sent()) {
14+
echo $err;
15+
}
16+
}
17+
throw new RuntimeException($err);
18+
}
19+
520
require_once __DIR__ . '/composer/autoload_real.php';
621

722
return ComposerAutoloaderInitcc75f134f7630c1ee3a8e4d7c86f3bcc::getLoader();

0 commit comments

Comments
 (0)