Skip to content

Commit d0725af

Browse files
JanOppolzerJanOppolzer
committed
Rename xmlNameSpace.php to xmlNameSpaces.php
1 parent 2940697 commit d0725af

File tree

6 files changed

+25
-29
lines changed

6 files changed

+25
-29
lines changed

‎app/Services/CategoryTagService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class CategoryTagService extends TagService
1616

1717
public function create(Entity $entity): false|string
1818
{
19-
$mdURI = config('xmlNameSpace.md');
20-
$mdattrURI = config('xmlNameSpace.mdattr');
21-
$samlURI = config('xmlNameSpace.saml');
19+
$mdURI = config('xmlNameSpaces.md');
20+
$mdattrURI = config('xmlNameSpaces.mdattr');
21+
$samlURI = config('xmlNameSpaces.saml');
2222

2323
$category = self::hasCategoryInDatabase($entity);
2424
if (! $category) {

‎app/Services/HfdTagService.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ public function create(Entity $entity): false|string
2222

2323
public function createFromXml(string $xml_document): false|string
2424
{
25-
$mdURI = config('xmlNameSpace.md');
26-
$mdattrURI = config('xmlNameSpace.mdattr');
27-
$samlURI = config('xmlNameSpace.saml');
25+
$mdURI = config('xmlNameSpaces.md');
26+
$mdattrURI = config('xmlNameSpaces.mdattr');
27+
$samlURI = config('xmlNameSpaces.saml');
2828

2929
$dom = $this->createDOM($xml_document);
3030
$xPath = $this->createXPath($dom);
@@ -76,7 +76,6 @@ public function update(Entity $entity): false|string
7676
Log::critical("Exception occurred in {$entity->id}}: {$e->getMessage()}");
7777
throw $e;
7878
}
79-
8079
}
8180

8281
private function getOrCreateAttribute(DOMXPath $xPath, \DOMDocument $dom, \DOMNode $entityAttributes, string $samlURI): \DOMNode

‎app/Services/RsTagService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ class RsTagService extends TagService
1717

1818
public function create(Entity $entity): false|string
1919
{
20-
$mdURI = config('xmlNameSpace.md');
21-
$mdattrURI = config('xmlNameSpace.mdattr');
22-
$samlURI = config('xmlNameSpace.saml');
20+
$mdURI = config('xmlNameSpaces.md');
21+
$mdattrURI = config('xmlNameSpaces.mdattr');
22+
$samlURI = config('xmlNameSpaces.saml');
2323

2424
$xml_document = $entity->xml_file;
2525
$isIdp = $entity->type == 'idp';

‎app/Traits/DumpFromGit/EntitiesHelp/FixEntityTrait.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public function fixEntities(): void
2626
{
2727
foreach (Entity::select()->get() as $entity) {
2828

29-
$this->mdURI = config('xmlNameSpace.md');
30-
$this->mdattrURI = config('xmlNameSpace.mdattr');
31-
$this->samlURI = config('xmlNameSpace.saml');
32-
$this->mdrpiURI = config('xmlNameSpace.mdrpi');
33-
$this->mdui = config('xmlNameSpace.mdui');
29+
$this->mdURI = config('xmlNameSpaces.md');
30+
$this->mdattrURI = config('xmlNameSpaces.mdattr');
31+
$this->samlURI = config('xmlNameSpaces.saml');
32+
$this->mdrpiURI = config('xmlNameSpaces.mdrpi');
33+
$this->mdui = config('xmlNameSpaces.mdui');
3434

3535
$xml_document = $entity->xml_file;
3636

@@ -94,6 +94,5 @@ private function fixLogo(DOMNode $UIInfo, DOMDocument $dom, DOMXPath $xPath): vo
9494
$logo->setAttribute('width', 100);
9595
$logo->setAttribute('height', 100);
9696
$UIInfo->appendChild($logo);
97-
9897
}
9998
}

‎app/Traits/DumpFromGit/EntitiesHelp/UpdateEntity.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait UpdateEntity
2424

2525
private string $mdrpiURI = 'urn:oasis:names:tc:SAML:metadata:rpi';
2626

27-
use TagTrait,ValidatorTrait;
27+
use TagTrait, ValidatorTrait;
2828

2929
private function prepareXmlStructure(DOMDocument $dom): \DOMNode|bool|DOMElement|\DOMNameSpaceNode|null
3030
{
@@ -234,15 +234,14 @@ public function updateEntityXml($entity, array $timestampDocumentArray = []): vo
234234
$xml_document = $this->updateRegistrationInfo($xml_document, $entity->entityid, $timestampDocumentArray);
235235

236236
Entity::whereId($entity->id)->update(['xml_file' => $xml_document]);
237-
238237
}
239238

240239
public function updateEntitiesXml(): void
241240
{
242-
$this->mdURI = config('xmlNameSpace.md');
243-
$this->mdattrURI = config('xmlNameSpace.mdattr');
244-
$this->samlURI = config('xmlNameSpace.saml');
245-
$this->mdrpiURI = config('xmlNameSpace.mdrpi');
241+
$this->mdURI = config('xmlNameSpaces.md');
242+
$this->mdattrURI = config('xmlNameSpaces.mdattr');
243+
$this->samlURI = config('xmlNameSpaces.saml');
244+
$this->mdrpiURI = config('xmlNameSpaces.mdrpi');
246245

247246
$timestampDocumentArray = $this->splitDocument();
248247
// dump($timestampDocumentArray);

‎config/xmlNameSpace.php renamed to ‎config/xmlNameSpaces.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<?php
22

33
return [
4-
'md' => 'urn:oasis:names:tc:SAML:2.0:metadata',
54
'ds' => 'http://www.w3.org/2000/09/xmldsig#',
6-
'shibmd' => 'urn:mace:shibboleth:metadata:1.0',
7-
'mdui' => 'urn:oasis:names:tc:SAML:metadata:ui',
85
'eduidmd' => 'http://eduid.cz/schema/metadata/1.0',
9-
'init' => 'urn:oasis:names:tc:SAML:profiles:SSO:request-init',
106
'idpdisc' => 'urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol',
7+
'init' => 'urn:oasis:names:tc:SAML:profiles:SSO:request-init',
8+
'md' => 'urn:oasis:names:tc:SAML:2.0:metadata',
119
'mdattr' => 'urn:oasis:names:tc:SAML:metadata:attribute',
12-
'saml' => 'urn:oasis:names:tc:SAML:2.0:assertion',
13-
'remd' => 'http://refeds.org/metadata',
1410
'mdrpi' => 'urn:oasis:names:tc:SAML:metadata:rpi',
15-
11+
'mdui' => 'urn:oasis:names:tc:SAML:metadata:ui',
12+
'remd' => 'http://refeds.org/metadata',
13+
'saml' => 'urn:oasis:names:tc:SAML:2.0:assertion',
14+
'shibmd' => 'urn:mace:shibboleth:metadata:1.0',
1615
];

0 commit comments

Comments
 (0)