Add trailing commas

public/login.php

@@ -197,7 +197,7 @@
  'userName' => $mappedAttributes['user'],
  'attributes' => $mappedAttributes['attributes'],
  'proxies' => [],
- 'sessionId' => $sessionTicket['id']
+ 'sessionId' => $sessionTicket['id'],
  ]);
 
  $ticketStore->addTicket($serviceTicket);

public/proxy.php

@@ -66,7 +66,7 @@
  'forceAuthn' => $proxyGrantingTicket['forceAuthn'],
  'attributes' => $proxyGrantingTicket['attributes'],
  'proxies' => $proxyGrantingTicket['proxies'],
- 'sessionId' => $proxyGrantingTicket['sessionId']
+ 'sessionId' => $proxyGrantingTicket['sessionId'],
  ]
  );
 

public/utility/validateTicket.php

@@ -101,7 +101,7 @@
  'attributes' => $attributes,
  'forceAuthn' => false,
  'proxies' => array_merge([$serviceUrl], $serviceTicket['proxies']),
- 'sessionId' => $serviceTicket['sessionId']
+ 'sessionId' => $serviceTicket['sessionId'],
  ]);
  $httpUtils = new Utils\HTTP();
  try {

src/Cas/AttributeExtractor.php

@@ -61,7 +61,7 @@ public function extractUserAndAttributes(array $attributes, Configuration $casco
 
  return [
  'user' => $userName,
- 'attributes' => $casAttributes
+ 'attributes' => $casAttributes,
  ];
  }
 
@@ -79,7 +79,7 @@ private function invokeAuthProc(array $attributes, Configuration $casconfig): ar
  $filters = $casconfig->getOptionalArray('authproc', []);
 
  $state = [
- 'Attributes' => $attributes
+ 'Attributes' => $attributes,
  ];
  foreach ($filters as $config) {
  $className = Module::resolveClass(

src/Cas/Protocol/SamlValidateResponder.php

@@ -29,7 +29,7 @@ public function convertToSaml(array $ticket): Chunk
  $ar = new AuthnResponse();
  $idpMetadata = [
  // CAS doesn't seem to care what this is, however SSP code requires it to be set
- 'entityid' => 'localhost'
+ 'entityid' => 'localhost',
  ];
  $spMetadata = [
  'entityid' => $serviceUrl,

src/Cas/Ticket/SQLTicketStore.php

@@ -185,8 +185,8 @@ private function setTableVersion(string $name, int $version): void
  ['_name'],
  [
  '_name' => $name,
- '_version' => $version
- ]
+ '_version' => $version,
+ ],
  );
  $this->tableVersions[$name] = $version;
  }

src/Cas/Ticket/TicketFactory.php

@@ -62,7 +62,7 @@ public function createSessionTicket(string $sessionId, int $expiresAt): array
  return [
  'id' => $sessionId,
  'validBefore' => $expiresAt,
- 'renewId' => $randomUtils->generateID()
+ 'renewId' => $randomUtils->generateID(),
  ];
  }
 

tests/config/module_casserver.php

@@ -15,12 +15,12 @@
  'scopes' => [
  'mobile' => [
  'https://idp1.domain:1234/saml2/idp/metadata.php',
- 'https://idp2.domain:5678/saml2/idp/metadata.php'
+ 'https://idp2.domain:5678/saml2/idp/metadata.php',
  ],
  'desktop' => [
  'https://idp3.domain:1234/saml2/idp/metadata.php',
- 'https://idp4.domain:5678/saml2/idp/metadata.php'
- ]
+ 'https://idp4.domain:5678/saml2/idp/metadata.php',
+ ],
  ],
 
  'legal_service_urls' => [
@@ -33,7 +33,7 @@
  ],
  'http:https://changeTicketParam' => [
  'ticketName' => 'myTicket',
- ]
+ ],
  ],
 
  'legal_target_service_urls' => [

tests/public/LoginIntegrationTest.php

@@ -83,7 +83,7 @@ protected function setup(): void
 
  'module.enable' => [
  'casserver' => true,
- ]
+ ],
  ]);
  }
 
@@ -124,8 +124,8 @@ public function testNoQueryParameters(): void
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
  CURLOPT_COOKIEFILE => $this->cookies_file,
- CURLOPT_FOLLOWLOCATION => true
- ]
+ CURLOPT_FOLLOWLOCATION => true,
+ ],
  );
  $this->assertEquals(200, $resp['code']);
 
@@ -148,15 +148,15 @@ public function testWrongServiceUrl(): void
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
  CURLOPT_COOKIEFILE => $this->cookies_file,
- CURLOPT_FOLLOWLOCATION => true
- ]
+ CURLOPT_FOLLOWLOCATION => true,
+ ],
  );
  $this->assertEquals(500, $resp['code']);
 
  $this->assertStringContainsString(
  'CAS server is not listed as a legal service',
  $resp['body'],
- 'Illegal cas service urls should be rejected'
+ 'Illegal cas service urls should be rejected',
  );
  }
 
@@ -178,15 +178,15 @@ public function testValidServiceUrl(string $serviceParam, string $ticketParam):
  [$serviceParam => $service_url],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
  $this->assertEquals(303, $resp['code']);
 
  $this->assertStringStartsWith(
  $service_url . '?' . $ticketParam . '=ST-',
  $resp['headers']['Location'],
- 'Ticket should be part of the redirect.'
+ 'Ticket should be part of the redirect.',
  );
 
  // Config ticket can be validated
@@ -198,11 +198,11 @@ public function testValidServiceUrl(string $serviceParam, string $ticketParam):
  [
  $serviceParam => $service_url,
  'ticket' => $ticket,
-  ],
+ ],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
 
  $expectedResponse = DOMDocumentFactory::fromFile(
@@ -217,7 +217,7 @@ public function validServiceUrlProvider(): array
  {
  return [
  ['service', 'ticket'],
- ['TARGET', 'SAMLart']
+ ['TARGET', 'SAMLart'],
  ];
  }
 
@@ -235,15 +235,15 @@ public function testValidTicketNameOverride(): void
  ['TARGET' => $service_url],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
  $this->assertEquals(303, $resp['code']);
 
  $this->assertStringStartsWith(
  $service_url . '?myTicket=ST-',
  $resp['headers']['Location'],
- 'Ticket should be part of the redirect.'
+ 'Ticket should be part of the redirect.',
  );
  }
 
@@ -260,15 +260,15 @@ public function testDebugOutput(): void
  ['service' => $service_url, 'debugMode' => 'true'],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
  $this->assertEquals(200, $resp['code']);
 
  $this->assertStringContainsString(
  '<cas:eduPersonPrincipalName>[email protected]</cas:eduPersonPrincipalName>',
  $resp['body'],
- 'Attributes should have been printed.'
+ 'Attributes should have been printed.',
  );
  }
 
@@ -285,16 +285,16 @@ public function testDebugOutputSamlValidate(): void
  ['service' => $service_url, 'debugMode' => 'samlValidate'],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
  $this->assertEquals(200, $resp['code']);
 
 
  $this->assertStringContainsString(
  '[email protected]</NameIdentifier',
  $resp['body'],
- 'Attributes should have been printed.'
+ 'Attributes should have been printed.',
  );
  }
 
@@ -311,19 +311,19 @@ public function testAlternateServiceConfigUsed(): void
  ['service' => $service_url, 'debugMode' => 'true'],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
  $this->assertEquals(200, $resp['code']);
  $this->assertStringContainsString(
  '<cas:user>testuser</cas:user>',
  $resp['body'],
- 'cas:user attribute should have been overridden'
+ 'cas:user attribute should have been overridden',
  );
  $this->assertStringContainsString(
  '<cas:cn>Test User</cas:cn>',
  $resp['body'],
- 'Attributes should have been printed with alternate attribute release'
+ 'Attributes should have been printed with alternate attribute release',
  );
  }
 
@@ -344,8 +344,8 @@ public function testValidServiceUrlWithPost(): void
  ],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
 
  // POST responds with a form that is uses JavaScript to submit
@@ -372,12 +372,12 @@ public function testValidServiceUrlWithPost(): void
  }
  $this->assertEquals(
  'ticket',
- $item->getAttribute('name')
+ $item->getAttribute('name'),
  );
  $this->assertStringStartsWith(
  'ST-',
  $item->getAttribute('value'),
- ''
+ '',
  );
  }
 
@@ -394,15 +394,15 @@ public function testSamlValidate(): void
  ['service' => $service_url],
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
- CURLOPT_COOKIEFILE => $this->cookies_file
- ]
+ CURLOPT_COOKIEFILE => $this->cookies_file,
+ ],
  );
  $this->assertEquals(303, $resp['code']);
 
  $this->assertStringStartsWith(
  $service_url . '?ticket=ST-',
  $resp['headers']['Location'],
- 'Ticket should be part of the redirect.'
+ 'Ticket should be part of the redirect.',
  );
 
  $location = $resp['headers']['Location'];
@@ -425,7 +425,7 @@ public function testSamlValidate(): void
  $soapRequest,
  [
  'TARGET' => $service_url,
- ]
+ ],
  );
 
  $this->assertEquals(200, $resp['code']);
@@ -445,8 +445,8 @@ private function authenticate(): void
  [
  CURLOPT_COOKIEJAR => $this->cookies_file,
  CURLOPT_COOKIEFILE => $this->cookies_file,
- CURLOPT_FOLLOWLOCATION => true
- ]
+ CURLOPT_FOLLOWLOCATION => true,
+ ],
  );
  $this->assertEquals(200, $resp['code'], $resp['body']);
  }