readonly properties

tvdijen · tvdijen · commit 75b8b5e9733e · 2025-12-16T20:50:24.000+01:00
diff --git a/src/XML/ExtendableAttributesTrait.php b/src/XML/ExtendableAttributesTrait.php
@@ -34,7 +34,7 @@ trait ExtendableAttributesTrait
      *
      * @var array<int, \SimpleSAML\XML\Attribute>
      */
-    protected array $namespacedAttributes = [];
+    protected readonly array $namespacedAttributes;
 
 
     /**
diff --git a/src/XML/ExtendableElementTrait.php b/src/XML/ExtendableElementTrait.php
@@ -29,7 +29,7 @@
 trait ExtendableElementTrait
 {
     /** @var \SimpleSAML\XML\SerializableElementInterface[] */
-    protected array $elements = [];
+    protected readonly array $elements;
 
 
     /**
diff --git a/src/XMLSchema/XML/AbstractAnnotated.php b/src/XMLSchema/XML/AbstractAnnotated.php
@@ -24,8 +24,8 @@ abstract class AbstractAnnotated extends AbstractOpenAttrs
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ?Annotation $annotation = null,
-        protected ?IDValue $id = null,
+        protected readonly ?Annotation $annotation = null,
+        protected readonly ?IDValue $id = null,
         array $namespacedAttributes = [],
     ) {
         parent::__construct($namespacedAttributes);
diff --git a/src/XMLSchema/XML/AbstractAttribute.php b/src/XMLSchema/XML/AbstractAttribute.php
@@ -45,14 +45,14 @@ abstract class AbstractAttribute extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ?QNameValue $type = null,
+        protected readonly ?QNameValue $type = null,
         ?NCNameValue $name = null,
         ?QNameValue $reference = null,
-        protected ?UseValue $use = null,
-        protected ?StringValue $default = null,
-        protected ?StringValue $fixed = null,
+        protected readonly ?UseValue $use = null,
+        protected readonly ?StringValue $default = null,
+        protected readonly ?StringValue $fixed = null,
         ?FormChoiceValue $formChoice = null,
-        protected ?LocalSimpleType $simpleType = null,
+        protected readonly ?LocalSimpleType $simpleType = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/AbstractAttributeGroup.php b/src/XMLSchema/XML/AbstractAttributeGroup.php
@@ -43,8 +43,8 @@ public function __construct(
         ?AnyAttribute $anyAttribute = null,
         ?NCNameValue $name = null,
         ?QNameValue $reference = null,
-        protected ?Annotation $annotation = null,
-        protected ?IDValue $id = null,
+        ?Annotation $annotation = null,
+        ?IDValue $id = null,
         array $namespacedAttributes = [],
     ) {
         parent::__construct($annotation, $id, $namespacedAttributes);
diff --git a/src/XMLSchema/XML/AbstractComplexType.php b/src/XMLSchema/XML/AbstractComplexType.php
@@ -47,11 +47,11 @@ abstract class AbstractComplexType extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ?NCNameValue $name = null,
-        protected ?BooleanValue $mixed = null,
-        protected ?BooleanValue $abstract = null,
-        protected ?DerivationSetValue $final = null,
-        protected ?DerivationSetValue $block = null,
+        protected readonly ?NCNameValue $name = null,
+        protected readonly ?BooleanValue $mixed = null,
+        protected readonly ?BooleanValue $abstract = null,
+        protected readonly ?DerivationSetValue $final = null,
+        protected readonly ?DerivationSetValue $block = null,
         SimpleContent|ComplexContent|null $content = null,
         ?TypeDefParticleInterface $particle = null,
         array $attributes = [],
@@ -73,6 +73,7 @@ public function __construct(
         } else {
             Assert::null($content, SchemaViolationException::class);
 
+            $this->setContent(null);
             $this->setParticle($particle);
             $this->setAttributes($attributes);
             $this->setAnyAttribute($anyAttribute);
diff --git a/src/XMLSchema/XML/AbstractElement.php b/src/XMLSchema/XML/AbstractElement.php
@@ -61,19 +61,19 @@ abstract class AbstractElement extends AbstractAnnotated
     public function __construct(
         ?NCNameValue $name = null,
         ?QNameValue $reference = null,
-        protected LocalSimpleType|LocalComplexType|null $localType = null,
-        protected array $identityConstraint = [],
-        protected ?QNameValue $type = null,
-        protected ?QNameValue $substitutionGroup = null,
+        protected readonly LocalSimpleType|LocalComplexType|null $localType = null,
+        protected readonly array $identityConstraint = [],
+        protected readonly ?QNameValue $type = null,
+        protected readonly ?QNameValue $substitutionGroup = null,
         ?MinOccursValue $minOccurs = null,
         ?MaxOccursValue $maxOccurs = null,
-        protected ?StringValue $default = null,
-        protected ?StringValue $fixed = null,
-        protected ?BooleanValue $nillable = null,
-        protected ?BooleanValue $abstract = null,
-        protected ?DerivationSetValue $final = null,
-        protected ?BlockSetValue $block = null,
-        protected ?FormChoiceValue $form = null,
+        protected readonly ?StringValue $default = null,
+        protected readonly ?StringValue $fixed = null,
+        protected readonly ?BooleanValue $nillable = null,
+        protected readonly ?BooleanValue $abstract = null,
+        protected readonly ?DerivationSetValue $final = null,
+        protected readonly ?BlockSetValue $block = null,
+        protected readonly ?FormChoiceValue $form = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/AbstractExtensionType.php b/src/XMLSchema/XML/AbstractExtensionType.php
@@ -39,7 +39,7 @@ abstract class AbstractExtensionType extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected QNameValue $base,
+        protected readonly QNameValue $base,
         // xs:typeDefParticle
         ?TypeDefParticleInterface $particle = null,
         // xs:attrDecls
diff --git a/src/XMLSchema/XML/AbstractFacet.php b/src/XMLSchema/XML/AbstractFacet.php
@@ -28,8 +28,8 @@ abstract class AbstractFacet extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ValueTypeInterface $value,
-        protected ?BooleanValue $fixed = null,
+        protected readonly ValueTypeInterface $value,
+        protected readonly ?BooleanValue $fixed = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/AbstractGroup.php b/src/XMLSchema/XML/AbstractGroup.php
@@ -45,7 +45,7 @@ public function __construct(
         ?QNameValue $reference = null,
         ?MinOccursValue $minOccurs = null,
         ?MaxOccursValue $maxOccurs = null,
-        protected array $particles = [],
+        protected readonly array $particles = [],
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/AbstractKeybase.php b/src/XMLSchema/XML/AbstractKeybase.php
@@ -31,11 +31,11 @@ abstract class AbstractKeybase extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected NCNameValue $name,
-        protected Selector $selector,
-        protected array $field = [],
-        protected ?Annotation $annotation = null,
-        protected ?IDValue $id = null,
+        protected readonly NCNameValue $name,
+        protected readonly Selector $selector,
+        protected readonly array $field = [],
+        ?Annotation $annotation = null,
+        ?IDValue $id = null,
         array $namespacedAttributes = [],
     ) {
         Assert::maxCount($field, C::UNBOUNDED_LIMIT);
diff --git a/src/XMLSchema/XML/AbstractNumFacet.php b/src/XMLSchema/XML/AbstractNumFacet.php
@@ -30,7 +30,7 @@ abstract class AbstractNumFacet extends AbstractFacet
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
-        protected ValueTypeInterface $value,
+        ValueTypeInterface $value,
         ?BooleanValue $fixed = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
diff --git a/src/XMLSchema/XML/AbstractRestrictionType.php b/src/XMLSchema/XML/AbstractRestrictionType.php
@@ -45,11 +45,11 @@ abstract class AbstractRestrictionType extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected QNameValue $base,
+        protected readonly QNameValue $base,
         // xs:typeDefParticle
         ?TypeDefParticleInterface $particle = null,
         // xs:simpleRestrictionModel
-        protected ?LocalSimpleType $localSimpleType = null,
+        protected readonly ?LocalSimpleType $localSimpleType = null,
         array $facets = [],
         // xs:attrDecls
         array $attributes = [],
diff --git a/src/XMLSchema/XML/AbstractSimpleType.php b/src/XMLSchema/XML/AbstractSimpleType.php
@@ -35,8 +35,8 @@ abstract class AbstractSimpleType extends AbstractAnnotated
      */
     public function __construct(
         SimpleDerivationInterface $derivation,
-        protected ?NCNameValue $name = null,
-        protected ?SimpleDerivationSetValue $final = null,
+        protected readonly ?NCNameValue $name = null,
+        protected readonly ?SimpleDerivationSetValue $final = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/AbstractWildcard.php b/src/XMLSchema/XML/AbstractWildcard.php
@@ -28,8 +28,8 @@ abstract class AbstractWildcard extends AbstractAnnotated
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ?NamespaceListValue $namespace = null,
-        protected ?ProcessContentsValue $processContents = null,
+        protected readonly ?NamespaceListValue $namespace = null,
+        protected readonly ?ProcessContentsValue $processContents = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Annotation.php b/src/XMLSchema/XML/Annotation.php
@@ -36,9 +36,9 @@ final class Annotation extends AbstractOpenAttrs implements SchemaValidatableEle
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected array $appinfo,
-        protected array $documentation,
-        protected ?IDValue $id,
+        protected readonly array $appinfo,
+        protected readonly array $documentation,
+        protected readonly ?IDValue $id,
         array $namespacedAttributes = [],
     ) {
         Assert::allIsInstanceOf($appinfo, Appinfo::class, SchemaViolationException::class);
diff --git a/src/XMLSchema/XML/Any.php b/src/XMLSchema/XML/Any.php
@@ -49,8 +49,8 @@ final class Any extends AbstractWildcard implements
      * @param \SimpleSAML\XMLSchema\Type\Schema\MaxOccursValue|null $maxOccurs
      */
     public function __construct(
-        protected ?NamespaceListValue $namespace = null,
-        protected ?ProcessContentsValue $processContents = null,
+        ?NamespaceListValue $namespace = null,
+        ?ProcessContentsValue $processContents = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Appinfo.php b/src/XMLSchema/XML/Appinfo.php
@@ -41,8 +41,8 @@ final class Appinfo extends AbstractXsElement implements SchemaValidatableElemen
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
-        protected DOMNodeList $content,
-        protected ?AnyURIValue $source = null,
+        protected readonly DOMNodeList $content,
+        protected readonly ?AnyURIValue $source = null,
         array $namespacedAttributes = [],
     ) {
         $this->setAttributesNS($namespacedAttributes);
diff --git a/src/XMLSchema/XML/ComplexContent.php b/src/XMLSchema/XML/ComplexContent.php
@@ -39,8 +39,8 @@ final class ComplexContent extends AbstractAnnotated implements SchemaValidatabl
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ComplexRestriction|Extension $content,
-        protected ?BooleanValue $mixed = null,
+        protected readonly ComplexRestriction|Extension $content,
+        protected readonly ?BooleanValue $mixed = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Documentation.php b/src/XMLSchema/XML/Documentation.php
@@ -49,9 +49,9 @@ final class Documentation extends AbstractXsElement implements SchemaValidatable
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     final public function __construct(
-        protected DOMNodeList $content,
-        protected ?LangValue $lang = null,
-        protected ?AnyURIValue $source = null,
+        protected readonly DOMNodeList $content,
+        protected readonly ?LangValue $lang = null,
+        protected readonly ?AnyURIValue $source = null,
         array $namespacedAttributes = [],
     ) {
         Assert::lessThanEq($content->count(), C::UNBOUNDED_LIMIT);
diff --git a/src/XMLSchema/XML/Field.php b/src/XMLSchema/XML/Field.php
@@ -50,7 +50,7 @@ final class Field extends AbstractAnnotated implements SchemaValidatableElementI
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected StringValue $xpath,
+        protected readonly StringValue $xpath,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Import.php b/src/XMLSchema/XML/Import.php
@@ -38,8 +38,8 @@ final class Import extends AbstractAnnotated implements SchemaValidatableElement
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected ?AnyURIValue $namespace = null,
-        protected ?AnyURIValue $schemaLocation = null,
+        protected readonly ?AnyURIValue $namespace = null,
+        protected readonly ?AnyURIValue $schemaLocation = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Keyref.php b/src/XMLSchema/XML/Keyref.php
@@ -42,7 +42,7 @@ final class Keyref extends AbstractKeybase implements IdentityConstraintInterfac
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected QNameValue $refer,
+        protected readonly QNameValue $refer,
         NCNameValue $name,
         Selector $selector,
         array $field = [],
diff --git a/src/XMLSchema/XML/Notation.php b/src/XMLSchema/XML/Notation.php
@@ -44,9 +44,9 @@ final class Notation extends AbstractAnnotated implements
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected NCNameValue $name,
-        protected ?PublicValue $public = null,
-        protected ?AnyURIValue $system = null,
+        protected readonly NCNameValue $name,
+        protected readonly ?PublicValue $public = null,
+        protected readonly ?AnyURIValue $system = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Redefine.php b/src/XMLSchema/XML/Redefine.php
@@ -43,9 +43,9 @@ final class Redefine extends AbstractOpenAttrs implements SchemaValidatableEleme
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected AnyURIValue $schemaLocation,
-        protected ?IDValue $id = null,
-        protected array $redefineElements = [],
+        protected readonly AnyURIValue $schemaLocation,
+        protected readonly ?IDValue $id = null,
+        protected readonly array $redefineElements = [],
         array $namespacedAttributes = [],
     ) {
         Assert::maxCount($redefineElements, C_XML::UNBOUNDED_LIMIT);
diff --git a/src/XMLSchema/XML/Restriction.php b/src/XMLSchema/XML/Restriction.php
@@ -48,7 +48,7 @@ final class Restriction extends AbstractAnnotated implements
     public function __construct(
         ?LocalSimpleType $simpleType = null,
         array $facets = [],
-        protected ?QNameValue $base = null,
+        protected readonly ?QNameValue $base = null,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Schema.php b/src/XMLSchema/XML/Schema.php
@@ -70,16 +70,16 @@ final class Schema extends AbstractOpenAttrs implements SchemaValidatableElement
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected array $topLevelElements = [],
-        protected array $schemaTopElements = [],
-        protected ?AnyURIValue $targetNamespace = null,
-        protected ?TokenValue $version = null,
-        protected ?FullDerivationSetValue $finalDefault = null,
-        protected ?BlockSetValue $blockDefault = null,
-        protected ?FormChoiceValue $attributeFormDefault = null,
-        protected ?FormChoiceValue $elementFormDefault = null,
-        protected ?IDValue $id = null,
-        protected ?LangValue $lang = null,
+        protected readonly array $topLevelElements = [],
+        protected readonly array $schemaTopElements = [],
+        protected readonly ?AnyURIValue $targetNamespace = null,
+        protected readonly ?TokenValue $version = null,
+        protected readonly ?FullDerivationSetValue $finalDefault = null,
+        protected readonly ?BlockSetValue $blockDefault = null,
+        protected readonly ?FormChoiceValue $attributeFormDefault = null,
+        protected readonly ?FormChoiceValue $elementFormDefault = null,
+        protected readonly ?IDValue $id = null,
+        protected readonly ?LangValue $lang = null,
         array $namespacedAttributes = [],
     ) {
         Assert::maxCount($topLevelElements, C_XML::UNBOUNDED_LIMIT);
diff --git a/src/XMLSchema/XML/Selector.php b/src/XMLSchema/XML/Selector.php
@@ -48,7 +48,7 @@ final class Selector extends AbstractAnnotated implements SchemaValidatableEleme
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected StringValue $xpath,
+        protected readonly StringValue $xpath,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/SimpleContent.php b/src/XMLSchema/XML/SimpleContent.php
@@ -36,7 +36,7 @@ final class SimpleContent extends AbstractAnnotated implements SchemaValidatable
      * @param array<\SimpleSAML\XML\Attribute> $namespacedAttributes
      */
     public function __construct(
-        protected SimpleRestriction|SimpleExtension $content,
+        protected readonly SimpleRestriction|SimpleExtension $content,
         ?Annotation $annotation = null,
         ?IDValue $id = null,
         array $namespacedAttributes = [],
diff --git a/src/XMLSchema/XML/Trait/AttrDeclsTrait.php b/src/XMLSchema/XML/Trait/AttrDeclsTrait.php
@@ -26,14 +26,14 @@ trait AttrDeclsTrait
      *     \SimpleSAML\XMLSchema\XML\ReferencedAttributeGroup
      * )[] $attributes
      */
-    protected array $attributes = [];
+    protected readonly array $attributes;
 
     /**
      * The AnyAttribute
      *
      * @var \SimpleSAML\XMLSchema\XML\AnyAttribute|null $anyAttribute
      */
-    protected ?AnyAttribute $anyAttribute = null;
+    protected readonly ?AnyAttribute $anyAttribute;
 
 
     /**
diff --git a/src/XMLSchema/XML/Trait/ComplexTypeModelTrait.php b/src/XMLSchema/XML/Trait/ComplexTypeModelTrait.php
diff --git a/src/XMLSchema/XML/Trait/DefRefTrait.php b/src/XMLSchema/XML/Trait/DefRefTrait.php
diff --git a/src/XMLSchema/XML/Trait/FacetsTrait.php b/src/XMLSchema/XML/Trait/FacetsTrait.php
diff --git a/src/XMLSchema/XML/Trait/FormChoiceTrait.php b/src/XMLSchema/XML/Trait/FormChoiceTrait.php
diff --git a/src/XMLSchema/XML/Trait/MaxOccursTrait.php b/src/XMLSchema/XML/Trait/MaxOccursTrait.php
diff --git a/src/XMLSchema/XML/Trait/MinOccursTrait.php b/src/XMLSchema/XML/Trait/MinOccursTrait.php
diff --git a/src/XMLSchema/XML/Trait/SimpleDerivationTrait.php b/src/XMLSchema/XML/Trait/SimpleDerivationTrait.php
diff --git a/src/XMLSchema/XML/Trait/SimpleRestrictionModelTrait.php b/src/XMLSchema/XML/Trait/SimpleRestrictionModelTrait.php
diff --git a/src/XMLSchema/XML/Trait/TypeDefParticleTrait.php b/src/XMLSchema/XML/Trait/TypeDefParticleTrait.php
diff --git a/src/XMLSchema/XML/Union.php b/src/XMLSchema/XML/Union.php
diff --git a/src/XMLSchema/XML/XsInclude.php b/src/XMLSchema/XML/XsInclude.php
diff --git a/src/XMLSchema/XML/XsList.php b/src/XMLSchema/XML/XsList.php

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ trait ExtendableAttributesTrait`
`34`	`34`	`*`
`35`	`35`	`* @var array<int, \SimpleSAML\XML\Attribute>`
`36`	`36`	`*/`
`37`		`- protected array $namespacedAttributes = [];`
	`37`	`+ protected readonly array $namespacedAttributes;`
`38`	`38`
`39`	`39`
`40`	`40`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`trait ExtendableElementTrait`
`30`	`30`	`{`
`31`	`31`	`/** @var \SimpleSAML\XML\SerializableElementInterface[] */`
`32`		`- protected array $elements = [];`
	`32`	`+ protected readonly array $elements;`
`33`	`33`
`34`	`34`
`35`	`35`	`/**`