coding style: trailing comma

tvdijen · tvdijen · commit ad8833326527 · 2024-07-10T18:40:19.000+02:00
diff --git a/public/login.php b/public/login.php
@@ -233,6 +233,6 @@
     }
 } else {
     $httpUtils->redirectTrustedURL(
-        $httpUtils->addURLParameters(Module::getModuleURL('casserver/loggedIn.php'), $parameters)
+        $httpUtils->addURLParameters(Module::getModuleURL('casserver/loggedIn.php'), $parameters),
     );
 }
diff --git a/public/logout.php b/public/logout.php
@@ -71,8 +71,8 @@
         $as->logout(
             $httpUtils->addURLParameters(
                 \SimpleSAML\Module::getModuleURL('casserver/loggedOut.php'),
-                array_key_exists('url', $_GET) ? ['url' => $_GET['url']] : []
-            )
+                array_key_exists('url', $_GET) ? ['url' => $_GET['url']] : [],
+            ),
         );
     }
 } else {
@@ -84,8 +84,8 @@
         $httpUtils->redirectTrustedURL(
             $httpUtils->addURLParameters(
                 \SimpleSAML\Module::getModuleURL('casserver/loggedOut.php'),
-                array_key_exists('url', $_GET) ? ['url' => $_GET['url']] : []
-            )
+                array_key_exists('url', $_GET) ? ['url' => $_GET['url']] : [],
+            ),
         );
     }
 }
diff --git a/public/proxy.php b/public/proxy.php
@@ -67,7 +67,7 @@
                     'attributes' => $proxyGrantingTicket['attributes'],
                     'proxies' => $proxyGrantingTicket['proxies'],
                     'sessionId' => $proxyGrantingTicket['sessionId'],
-                ]
+                ],
             );
 
             $ticketStore->addTicket($proxyTicket);
diff --git a/public/utility/validateTicket.php b/public/utility/validateTicket.php
@@ -54,7 +54,7 @@
     try {
         $ticketStoreConfig = $casconfig->getOptionalValue(
             'ticketstore',
-            ['class' => 'casserver:FileSystemTicketStore']
+            ['class' => 'casserver:FileSystemTicketStore'],
         );
         $ticketStoreClass = Module::resolveClass($ticketStoreConfig['class'], 'Cas\Ticket');
         /** @var TicketStore $ticketStore */
@@ -180,7 +180,7 @@
         }
     } catch (Exception $e) {
         Logger::error(
-            'casserver:serviceValidate: internal server error. ' . var_export($e->getMessage(), true)
+            'casserver:serviceValidate: internal server error. ' . var_export($e->getMessage(), true),
         );
 
         echo $protocol->getValidateFailureResponse(C::ERR_INTERNAL_ERROR, $e->getMessage());
diff --git a/public/validate.php b/public/validate.php
@@ -45,7 +45,7 @@
         /* Instantiate ticket store */
         $ticketStoreConfig = $casconfig->getOptionalValue(
             'ticketstore',
-            ['class' => 'casserver:FileSystemTicketStore']
+            ['class' => 'casserver:FileSystemTicketStore'],
         );
         $ticketStoreClass = \SimpleSAML\Module::resolveClass($ticketStoreConfig['class'], 'Cas\Ticket');
         /** @psalm-suppress InvalidStringClass */
@@ -73,7 +73,7 @@
                 if (!array_key_exists($usernameField, $serviceTicket['attributes'])) {
                     \SimpleSAML\Logger::error(sprintf(
                         'casserver:validate: internal server error. Missing user name attribute: %s',
-                        var_export($usernameField, true)
+                        var_export($usernameField, true),
                     ));
 
                     echo $protocol->getValidateFailureResponse();
diff --git a/src/Cas/AttributeExtractor.php b/src/Cas/AttributeExtractor.php
@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\Module\casserver\Cas;
 
+use SimpleSAML\Auth;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module;
 
@@ -85,7 +86,7 @@ private function invokeAuthProc(array $attributes, Configuration $casconfig): ar
             $className = Module::resolveClass(
                 $config['class'],
                 'Auth\Process',
-                \SimpleSAML\Auth\ProcessingFilter::class
+                Auth\ProcessingFilter::class,
             );
             // Unset 'class' to prevent the filter from interpreting it as an option
             unset($config['class']);
diff --git a/src/Cas/Protocol/Cas20.php b/src/Cas/Protocol/Cas20.php
@@ -145,7 +145,7 @@ public function getValidateSuccessResponse(string $username): AuthenticationSucc
             if (!is_null($this->base64IndicatorAttribute)) {
                 $attr[] = $this->generateCas20Attribute(
                     $this->base64IndicatorAttribute,
-                    $this->base64EncodeAttributes ? "true" : "false"
+                    $this->base64EncodeAttributes ? "true" : "false",
                 );
             }
         }
@@ -212,7 +212,7 @@ public function getProxyFailureResponse(string $errorCode, string $explanation):
      */
     private function generateCas20Attribute(
         string $attributeName,
-        string $attributeValue
+        string $attributeValue,
     ): Chunk {
         $xmlDocument = DOMDocumentFactory::create();
 
@@ -241,7 +241,7 @@ private function isValidXmlName(string $name): bool
         return filter_var(
             $name,
             FILTER_VALIDATE_REGEXP,
-            ['options' => ['regexp' => '/^[a-zA-Z_][\w.-]*$/']]
+            ['options' => ['regexp' => '/^[a-zA-Z_][\w.-]*$/']],
         ) === true;
     }
 }
diff --git a/src/Cas/Protocol/SamlValidateResponder.php b/src/Cas/Protocol/SamlValidateResponder.php
@@ -39,22 +39,22 @@ public function convertToSaml(array $ticket): Chunk
             Configuration::loadFromArray($idpMetadata),
             Configuration::loadFromArray($spMetadata),
             $shire,
-            $attributes
+            $attributes,
         );
 
         // replace NameIdentifier with actually username
         $ret = preg_replace(
             '|<NameIdentifier(.*)>.*</NameIdentifier>|',
             '<NameIdentifier$1>' . htmlspecialchars($user) . '</NameIdentifier>',
-            $authnResponseXML
+            $authnResponseXML,
         );
         // CAS seems to prefer this type of assertiond
         $ret = str_replace('urn:oasis:names:tc:SAML:1.0:cm:bearer', 'urn:oasis:names:tc:SAML:1.0:cm:artifact', $ret);
         // CAS uses a different namespace for attributes
         $ret = str_replace(
             'urn:mace:shibboleth:1.0:attributeNamespace:uri',
             'http://www.ja-sig.org/products/cas/',
-            $ret
+            $ret,
         );
 
         $doc = DOMDocumentFactory::fromString($ret);
diff --git a/src/Cas/TicketValidator.php b/src/Cas/TicketValidator.php
@@ -34,7 +34,7 @@ public function __construct(Configuration $casconfig)
         $this->casconfig = $casconfig;
         $ticketStoreConfig = $casconfig->getOptionalValue(
             'ticketstore',
-            ['class' => 'casserver:FileSystemTicketStore']
+            ['class' => 'casserver:FileSystemTicketStore'],
         );
         $ticketStoreClass = Module::resolveClass($ticketStoreConfig['class'], 'Cas\Ticket');
         /**
@@ -108,7 +108,7 @@ public static function sanitize(string $parameter): string
         return preg_replace(
             '/;jsessionid=.*[^?].*$/U',
             '',
-            preg_replace('/;jsessionid=.*[?]/U', '?', urldecode($parameter))
+            preg_replace('/;jsessionid=.*[?]/U', '?', urldecode($parameter)),
         );
     }
 }
diff --git a/src/Shib13/AuthnResponse.php b/src/Shib13/AuthnResponse.php
@@ -141,7 +141,7 @@ public function validate(): bool
             $this->validator->validateCA($configUtils->getCertPath($md->getString('caFile')));
         } else {
             throw new Error\Exception(
-                'Missing certificate in Shibboleth 1.3 IdP Remote metadata for identity provider [' . $issuer . '].'
+                'Missing certificate in Shibboleth 1.3 IdP Remote metadata for identity provider [' . $issuer . '].',
             );
         }
 
@@ -261,7 +261,7 @@ public function getAttributes(): array
 
             $attribute_nodes = $this->doXPathQuery(
                 'shib:AttributeStatement/shib:Attribute/shib:AttributeValue',
-                $assertion
+                $assertion,
             );
 
             foreach ($attribute_nodes as $attribute) {
diff --git a/tests/public/LoginIntegrationTest.php b/tests/public/LoginIntegrationTest.php
@@ -66,7 +66,7 @@ protected function setup(): void
     {
         $this->server = new BuiltInServer(
             'configLoader',
-            dirname(__FILE__, 3) . '/vendor/simplesamlphp/simplesamlphp/public'
+            dirname(__FILE__, 3) . '/vendor/simplesamlphp/simplesamlphp/public',
         );
         $this->server_addr = $this->server->start();
         $this->server_pid = $this->server->getPid();
@@ -132,7 +132,7 @@ public function testNoQueryParameters(): void
         $this->assertStringContainsString(
             'You are logged in.',
             $resp['body'],
-            'Login with no query parameters should make you authenticate and then take you to the login page.'
+            'Login with no query parameters should make you authenticate and then take you to the login page.',
         );
     }
 
@@ -206,7 +206,7 @@ public function testValidServiceUrl(string $serviceParam, string $ticketParam):
         );
 
         $expectedResponse = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 2) . '/resources/xml/testValidServiceUrl.xml'
+            dirname(__FILE__, 2) . '/resources/xml/testValidServiceUrl.xml',
         )->saveXML();
 
         $this->assertEquals(200, $resp['code']);
diff --git a/tests/src/Cas/Protocol/Cas20Test.php b/tests/src/Cas/Protocol/Cas20Test.php
@@ -21,7 +21,7 @@ final class Cas20Test extends TestCase
     protected function setUp(): void
     {
         $this->document = DOMDocumentFactory::fromFile(
-            dirname(__FILE__, 4) . '/resources/xml/testAttributeToXmlConversion.xml'
+            dirname(__FILE__, 4) . '/resources/xml/testAttributeToXmlConversion.xml',
         );
     }
 
diff --git a/tests/src/Cas/Protocol/SamlValidateTest.php b/tests/src/Cas/Protocol/SamlValidateTest.php
@@ -37,7 +37,7 @@ public function testSamlValidatXmlGeneration(): void
         $this->assertEquals('saisusr', $attributeStatement->Subject->NameIdentifier);
         $this->assertEquals(
             'urn:oasis:names:tc:SAML:1.0:cm:artifact',
-            $attributeStatement->Subject->SubjectConfirmation->ConfirmationMethod
+            $attributeStatement->Subject->SubjectConfirmation->ConfirmationMethod,
         );
 
         $attribute = $attributeStatement->Attribute;
diff --git a/tests/src/Ticket/DelegatingTicketStoreTest.php b/tests/src/Ticket/DelegatingTicketStoreTest.php
@@ -60,7 +60,7 @@ public function setup(): void
                 'logging.handler' => 'errorlog',
             ],
             '[ARRAY]',
-            'simplesaml'
+            'simplesaml',
         );
         Configuration::setPreLoadedConfig($this->config, 'config.php');
 
@@ -86,10 +86,10 @@ public function setup(): void
         ];
 
         $this->fileStore1 = new FileSystemTicketStore(
-            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig['ticketStores']['name1']])
+            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig['ticketStores']['name1']]),
         );
         $this->fileStore2 = new FileSystemTicketStore(
-            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig['ticketStores']['name2']])
+            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig['ticketStores']['name2']]),
         );
     }
 
@@ -101,7 +101,7 @@ public function testAll(): void
     {
         $this->ticketstoreConfig['delegateTo'] = 'all';
         $ticketStore = new DelegatingTicketStore(
-            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig])
+            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig]),
         );
 
         $ticket = ['a' => 'b', 'id' => '1'];
@@ -130,7 +130,7 @@ public function testFirst(): void
     {
         $this->ticketstoreConfig['delegateTo'] = 'first';
         $ticketStore = new DelegatingTicketStore(
-            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig])
+            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig]),
         );
 
         $ticket = ['a' => 'b', 'id' => '1'];
@@ -153,7 +153,7 @@ public function testNamed(): void
     {
         $this->ticketstoreConfig['delegateTo'] = 'name2';
         $ticketStore = new DelegatingTicketStore(
-            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig])
+            Configuration::loadFromArray(['ticketstore' => $this->ticketstoreConfig]),
         );
 
         $ticket = ['a' => 'b', 'id' => '1'];
diff --git a/tests/src/TicketValidatorTest.php b/tests/src/TicketValidatorTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\CAS\Constants as C;
 use SimpleSAML\Configuration;
 use SimpleSAML\Module\casserver\Cas\CasException;
 use SimpleSAML\Module\casserver\Cas\Ticket\FileSystemTicketStore;
@@ -98,7 +99,7 @@ public function testWrongServiceUrlTicket(): void
             $this->assertEquals(C::ERR_INVALID_SERVICE, $e->getCasCode());
             $this->assertEquals(
                 "Mismatching service parameters: expected 'http://otherurl.com' but was: 'http://efh.com?a=b&'",
-                $e->getMessage()
+                $e->getMessage(),
             );
         }
         // ensure ticket deleted after validation

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,6 @@`
`233`	`233`	`}`
`234`	`234`	`} else {`
`235`	`235`	`$httpUtils->redirectTrustedURL(`
`236`		`- $httpUtils->addURLParameters(Module::getModuleURL('casserver/loggedIn.php'), $parameters)`
	`236`	`+ $httpUtils->addURLParameters(Module::getModuleURL('casserver/loggedIn.php'), $parameters),`
`237`	`237`	`);`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ public function getValidateSuccessResponse(string $username): AuthenticationSucc`
`145`	`145`	`if (!is_null($this->base64IndicatorAttribute)) {`
`146`	`146`	`$attr[] = $this->generateCas20Attribute(`
`147`	`147`	`$this->base64IndicatorAttribute,`
`148`		`- $this->base64EncodeAttributes ? "true" : "false"`
	`148`	`+ $this->base64EncodeAttributes ? "true" : "false",`
`149`	`149`	`);`
`150`	`150`	`}`
`151`	`151`	`}`
`@@ -212,7 +212,7 @@ public function getProxyFailureResponse(string $errorCode, string $explanation):`
`212`	`212`	`*/`
`213`	`213`	`private function generateCas20Attribute(`
`214`	`214`	`string $attributeName,`
`215`		`- string $attributeValue`
	`215`	`+ string $attributeValue,`
`216`	`216`	`): Chunk {`
`217`	`217`	`$xmlDocument = DOMDocumentFactory::create();`
`218`	`218`
`@@ -241,7 +241,7 @@ private function isValidXmlName(string $name): bool`
`241`	`241`	`return filter_var(`
`242`	`242`	`$name,`
`243`	`243`	`FILTER_VALIDATE_REGEXP,`
`244`		`- ['options' => ['regexp' => '/^[a-zA-Z_][\w.-]*$/']]`
	`244`	`+ ['options' => ['regexp' => '/^[a-zA-Z_][\w.-]*$/']],`
`245`	`245`	`) === true;`
`246`	`246`	`}`
`247`	`247`	`}`