mirror of
https://github.com/netzbegruenung/user_saml.git
synced 2024-05-02 17:14:53 +02:00
Merge pull request #595 from nextcloud/dependabot/composer/nextcloud/coding-standard-1.0.0
Bump nextcloud/coding-standard from 0.5.0 to 1.0.0
This commit is contained in:
commit
988ef8f7da
|
@ -9,6 +9,7 @@ use Nextcloud\CodingStandard\Config;
|
|||
$config = new Config();
|
||||
$config
|
||||
->getFinder()
|
||||
->ignoreVCSIgnored(true)
|
||||
->notPath('build')
|
||||
->notPath('l10n')
|
||||
->notPath('src')
|
18
.php_cs-fixer.dist.php
Normal file
18
.php_cs-fixer.dist.php
Normal file
|
@ -0,0 +1,18 @@
|
|||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
require_once './vendor/autoload.php';
|
||||
|
||||
use Nextcloud\CodingStandard\Config;
|
||||
|
||||
$config = new Config();
|
||||
$config
|
||||
->getFinder()
|
||||
->ignoreVCSIgnored(true)
|
||||
->notPath('build')
|
||||
->notPath('l10n')
|
||||
->notPath('src')
|
||||
->notPath('vendor')
|
||||
->in(__DIR__);
|
||||
return $config;
|
|
@ -138,7 +138,7 @@ if (!$cli &&
|
|||
// SAML at the moment.
|
||||
$useSamlForDesktopClients = $config->getAppValue('user_saml', 'general-use_saml_auth_for_desktop', '0');
|
||||
if ($useSamlForDesktopClients === '1') {
|
||||
$currentUrl = substr(explode('?',$request->getRequestUri(), 2)[0], strlen(\OC::$WEBROOT));
|
||||
$currentUrl = substr(explode('?', $request->getRequestUri(), 2)[0], strlen(\OC::$WEBROOT));
|
||||
if (substr($currentUrl, 0, 12) === '/remote.php/' || substr($currentUrl, 0, 5) === '/ocs/') {
|
||||
if (!$userSession->isLoggedIn() && $request->isUserAgent([\OCP\IRequest::USER_AGENT_CLIENT_DESKTOP])) {
|
||||
$redirectSituation = true;
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"lint": "find . -name \\*.php -not -path '*/vendor/*' -print0 | xargs -0 -n1 php -l"
|
||||
},
|
||||
"require-dev": {
|
||||
"nextcloud/coding-standard": "^0.5.0",
|
||||
"nextcloud/coding-standard": "^1.0.0",
|
||||
"phpunit/phpunit": "^8"
|
||||
}
|
||||
}
|
||||
|
|
680
composer.lock
generated
680
composer.lock
generated
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue