Commit c459b179 authored by Jacob Priddy's avatar Jacob Priddy 👌

update simplesamlphp usages to 1.18.7

parent 97fd47a0
...@@ -33,11 +33,11 @@ services: ...@@ -33,11 +33,11 @@ services:
- ./nginx/conf.d/app.conf:/etc/nginx/conf.d/app.conf - ./nginx/conf.d/app.conf:/etc/nginx/conf.d/app.conf
- ./nginx/dhparam/:/run/dhparam - ./nginx/dhparam/:/run/dhparam
# Saml config # Saml config
- ./simplesamlphp-1.18.5:/var/simplesamlphp - ./simplesamlphp-1.18.7:/var/simplesamlphp
- ./simple-saml/cert:/var/simplesamlphp/cert - ./simple-saml/cert:/var/simplesamlphp/cert
- ./simple-saml/config:/var/simplesamlphp/config - ./simple-saml/config:/var/simplesamlphp/config
- ./simple-saml/metadata:/var/simplesamlphp/metadata - ./simple-saml/metadata:/var/simplesamlphp/metadata
- ./simplesamlphp-1.18.5:/var/simplesamlphp-idp - ./simplesamlphp-1.18.7:/var/simplesamlphp-idp
- ./simple-saml-idp/cert:/var/simplesamlphp-idp/cert - ./simple-saml-idp/cert:/var/simplesamlphp-idp/cert
- ./simple-saml-idp/config:/var/simplesamlphp-idp/config - ./simple-saml-idp/config:/var/simplesamlphp-idp/config
- ./simple-saml-idp/metadata:/var/simplesamlphp-idp/metadata - ./simple-saml-idp/metadata:/var/simplesamlphp-idp/metadata
...@@ -83,11 +83,11 @@ services: ...@@ -83,11 +83,11 @@ services:
- ./src:/var/www - ./src:/var/www
- ./php/dev.ini:/usr/local/etc/php/conf.d/local.ini - ./php/dev.ini:/usr/local/etc/php/conf.d/local.ini
# Map saml files to the php-fpm server so it has access to them as well # Map saml files to the php-fpm server so it has access to them as well
- ./simplesamlphp-1.18.5:/var/simplesamlphp - ./simplesamlphp-1.18.7:/var/simplesamlphp
- ./simple-saml/cert:/var/simplesamlphp/cert - ./simple-saml/cert:/var/simplesamlphp/cert
- ./simple-saml/config:/var/simplesamlphp/config - ./simple-saml/config:/var/simplesamlphp/config
- ./simple-saml/metadata:/var/simplesamlphp/metadata - ./simple-saml/metadata:/var/simplesamlphp/metadata
- ./simplesamlphp-1.18.5:/var/simplesamlphp-idp - ./simplesamlphp-1.18.7:/var/simplesamlphp-idp
- ./simple-saml-idp/cert:/var/simplesamlphp-idp/cert - ./simple-saml-idp/cert:/var/simplesamlphp-idp/cert
- ./simple-saml-idp/config:/var/simplesamlphp-idp/config - ./simple-saml-idp/config:/var/simplesamlphp-idp/config
- ./simple-saml-idp/metadata:/var/simplesamlphp-idp/metadata - ./simple-saml-idp/metadata:/var/simplesamlphp-idp/metadata
......
...@@ -35,7 +35,7 @@ services: ...@@ -35,7 +35,7 @@ services:
- ./nginx/conf.d/prod.conf:/etc/nginx/conf.d/prod.conf - ./nginx/conf.d/prod.conf:/etc/nginx/conf.d/prod.conf
- ./nginx/dhparam/:/run/dhparam - ./nginx/dhparam/:/run/dhparam
# Saml config # Saml config
- ./simplesamlphp-1.18.5:/var/simplesamlphp - ./simplesamlphp-1.18.7:/var/simplesamlphp
- ./simple-saml-prod/cert:/var/simplesamlphp/cert - ./simple-saml-prod/cert:/var/simplesamlphp/cert
- ./simple-saml-prod/config:/var/simplesamlphp/config - ./simple-saml-prod/config:/var/simplesamlphp/config
- ./simple-saml-prod/metadata:/var/simplesamlphp/metadata - ./simple-saml-prod/metadata:/var/simplesamlphp/metadata
...@@ -78,7 +78,7 @@ services: ...@@ -78,7 +78,7 @@ services:
- ./src:/var/www - ./src:/var/www
- ./php/prod.ini:/usr/local/etc/php/conf.d/local.ini - ./php/prod.ini:/usr/local/etc/php/conf.d/local.ini
# Map saml files to the php-fpm server so it has access to them as well # Map saml files to the php-fpm server so it has access to them as well
- ./simplesamlphp-1.18.5:/var/simplesamlphp - ./simplesamlphp-1.18.7:/var/simplesamlphp
- ./simple-saml-prod/cert:/var/simplesamlphp/cert - ./simple-saml-prod/cert:/var/simplesamlphp/cert
- ./simple-saml-prod/config:/var/simplesamlphp/config - ./simple-saml-prod/config:/var/simplesamlphp/config
- ./simple-saml-prod/metadata:/var/simplesamlphp/metadata - ./simple-saml-prod/metadata:/var/simplesamlphp/metadata
......
<?php
declare (strict_types=1);
return [
// The prefix configuration. If a non null value will be used, a random prefix will be generated.
'prefix' => 'ScopedSimpleSamlPHP',
// By default when running php-scoper add-prefix, it will prefix all relevant code found in the current working
// directory. You can however define which files should be scoped by defining a collection of Finders in the
// following configuration key.
//
// For more see: https://github.com/humbug/php-scoper#finders-and-paths
'finders' => [
\Isolated\Symfony\Component\Finder\Finder::create()
->files()
->ignoreVCS(\true)
->notName('/LICENSE|.*\\.md|.*\\.dist|Makefile|composer\\.json|composer\\.lock/')
->exclude([
'cert',
'cache',
'config',
'config-templates',
'metadata',
'metadata-templates',
'vendor-bin',
'locales',
'docs',
'www',
'lib/SimpleSAML/Auth',
'templates',
])->in('.'),
\Isolated\Symfony\Component\Finder\Finder::create()->append(['composer.json'])
],
// PHP-Scoper's goal is to make sure that all code for a project lies in a distinct PHP namespace. However, you
// may want to share a common API between the bundled code of your PHAR and the consumer code. For example if
// you have a PHPUnit PHAR with isolated code, you still want the PHAR to be able to understand the
// PHPUnit\Framework\TestCase class.
//
// A way to achieve this is by specifying a list of classes to not prefix with the following configuration key. Note
// that this does not work with functions or constants neither with classes belonging to the global namespace.
//
// Fore more see https://github.com/humbug/php-scoper#whitelist
'whitelist' => [
// 'PHPUnit\Framework\TestCase', // A specific class
// 'PHPUnit\Framework\*', // The whole namespace
'SimpleSAML\\*',
'SimpleSAML*',
'SimpleSAML',
'SAML2\\*',
'SAML2',
'SimpleSamlPhp\\*',
'SimpleSamlPhp*',
'SimpleSamlPhp',
],
'files-whitelist' => [
'vendor/simplesamlphp/saml2/src/_autoload.php',
'scoper.inc.php',
'lib/_autoload.php',
'lib/_autoload_modules.php',
'tests/_autoload_modules.php',
'lib/SimpleSAML/Stats.php',
],
// If `true` then the user defined constants belonging to the global namespace will not be prefixed.
//
// For more see https://github.com/humbug/php-scoper#constants--constants--functions-from-the-global-namespace
'whitelist-global-constants' => \true,
// If `true` then the user defined classes belonging to the global namespace will not be prefixed.
//
// For more see https://github.com/humbug/php-scoper#constants--constants--functions-from-the-global-namespace
'whitelist-global-classes' => \true,
// If `true` then the user defined functions belonging to the global namespace will not be prefixed.
//
// For more see https://github.com/humbug/php-scoper#constants--constants--functions-from-the-global-namespace
'whitelist-global-functions' => \true,
];
...@@ -17,7 +17,7 @@ class SimpleSamlPhpSamlRepository implements SamlRepository ...@@ -17,7 +17,7 @@ class SimpleSamlPhpSamlRepository implements SamlRepository
protected string $logoutUrl; protected string $logoutUrl;
/** /**
* Found in simplesamlphp-1.18.5/lib/SimpleSAML/Auth/Simple.php * Found in simplesamlphp-1.18.7/lib/SimpleSAML/Auth/Simple.php
* *
* See https://simplesamlphp.org/docs/stable/simplesamlphp-sp-api for information on these methods * See https://simplesamlphp.org/docs/stable/simplesamlphp-sp-api for information on these methods
* *
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment