diff --git a/composer.json b/composer.json index 11c2ef3d64..014c52d76a 100644 --- a/composer.json +++ b/composer.json @@ -39,13 +39,12 @@ }, "require-dev": { "ext-bcmath": "*", - "doctrine/coding-standard": "^11.0", + "doctrine/coding-standard": "^12.0", "jmikola/geojson": "^1.0", "phpbench/phpbench": "^1.0.0@dev", "phpstan/phpstan": "^1.10.11", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^9.5.5 || ^10.0.15", - "squizlabs/php_codesniffer": "^3.5", "symfony/cache": "^4.4 || ^5.0 || ^6.0", "vimeo/psalm": "^5.9.0" }, diff --git a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php index 3ca151f412..600554b393 100644 --- a/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ODM/MongoDB/Mapping/Driver/XmlDriver.php @@ -184,8 +184,8 @@ public function loadMetadataForClass($className, \Doctrine\Persistence\Mapping\C $metadata->setDefaultDiscriminatorValue((string) $xmlRoot->{'default-discriminator-value'}['value']); } - if (isset($xmlRoot->{'indexes'})) { - foreach ($xmlRoot->{'indexes'}->{'index'} as $index) { + if (isset($xmlRoot->indexes)) { + foreach ($xmlRoot->indexes->index as $index) { $this->addIndex($metadata, $index); } } @@ -474,15 +474,15 @@ private function addReferenceMapping(ClassMetadata $class, ?SimpleXMLElement $re $mapping['defaultDiscriminatorValue'] = (string) $reference->{'default-discriminator-value'}['value']; } - if (isset($reference->{'sort'})) { - foreach ($reference->{'sort'}->{'sort'} as $sort) { + if (isset($reference->sort)) { + foreach ($reference->sort->sort as $sort) { $attr = $sort->attributes(); $mapping['sort'][(string) $attr['field']] = (string) ($attr['order'] ?? 'asc'); } } - if (isset($reference->{'criteria'})) { - foreach ($reference->{'criteria'}->{'criteria'} as $criteria) { + if (isset($reference->criteria)) { + foreach ($reference->criteria->criteria as $criteria) { $attr = $criteria->attributes(); $mapping['criteria'][(string) $attr['field']] = (string) $attr['value']; } @@ -496,8 +496,8 @@ private function addReferenceMapping(ClassMetadata $class, ?SimpleXMLElement $re $mapping['alsoLoadFields'] = explode(',', (string) $attributes['also-load']); } - if (isset($reference->{'prime'})) { - foreach ($reference->{'prime'}->{'field'} as $field) { + if (isset($reference->prime)) { + foreach ($reference->prime->field as $field) { $attr = $field->attributes(); $mapping['prime'][] = (string) $attr['name']; } @@ -513,7 +513,7 @@ private function addIndex(ClassMetadata $class, SimpleXMLElement $xmlIndex): voi $keys = []; - foreach ($xmlIndex->{'key'} as $key) { + foreach ($xmlIndex->key as $key) { $keys[(string) $key['name']] = (string) ($key['order'] ?? 'asc'); } @@ -535,8 +535,8 @@ private function addIndex(ClassMetadata $class, SimpleXMLElement $xmlIndex): voi $options['unique'] = ((string) $attributes['unique'] === 'true'); } - if (isset($xmlIndex->{'option'})) { - foreach ($xmlIndex->{'option'} as $option) { + if (isset($xmlIndex->option)) { + foreach ($xmlIndex->option as $option) { $options[(string) $option['name']] = $this->convertXMLElementValue((string) $option['value']); } } @@ -635,7 +635,7 @@ private function setShardKey(ClassMetadata $class, SimpleXMLElement $xmlShardkey $keys = []; $options = []; - foreach ($xmlShardkey->{'key'} as $key) { + foreach ($xmlShardkey->key as $key) { $keys[(string) $key['name']] = (string) ($key['order'] ?? 'asc'); } @@ -647,8 +647,8 @@ private function setShardKey(ClassMetadata $class, SimpleXMLElement $xmlShardkey $options['numInitialChunks'] = (int) $attributes['numInitialChunks']; } - if (isset($xmlShardkey->{'option'})) { - foreach ($xmlShardkey->{'option'} as $option) { + if (isset($xmlShardkey->option)) { + foreach ($xmlShardkey->option as $option) { $options[(string) $option['name']] = $this->convertXMLElementValue((string) $option['value']); } } diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 941b851bc2..b2cc0a72c4 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -85,13 +85,13 @@ field]]> id]]> + indexes]]> {'also-load-methods'}]]> {'default-discriminator-value'}]]> {'discriminator-field'}]]> {'discriminator-map'}]]> {'embed-many'}]]> {'embed-one'}]]> - {'indexes'}]]> {'lifecycle-callbacks'}]]> {'read-preference'}]]> {'reference-many'}]]> @@ -102,13 +102,13 @@ field]]> id]]> + indexes]]> {'also-load-methods'}]]> {'default-discriminator-value'}]]> {'discriminator-field'}]]> {'discriminator-map'}]]> {'embed-many'}]]> {'embed-one'}]]> - {'indexes'}]]> {'lifecycle-callbacks'}]]> {'read-preference'}]]> {'reference-many'}]]> @@ -130,30 +130,30 @@ {'generator-option'})]]> and)]]> field)]]> - {'criteria'})]]> + criteria)]]> + prime)]]> + sort)]]> {'default-discriminator-value'})]]> {'discriminator-field'})]]> {'discriminator-map'})]]> - {'prime'})]]> - {'sort'})]]> - {'option'})]]> + option)]]> {'partial-filter-expression'})]]> {'tag-set'})]]> field)]]> id)]]> + indexes)]]> {'default-discriminator-value'})]]> {'discriminator-field'})]]> {'discriminator-map'})]]> {'embed-many'})]]> {'embed-one'})]]> - {'indexes'})]]> {'lifecycle-callbacks'})]]> {'read-preference'})]]> {'reference-many'})]]> {'reference-one'})]]> {'schema-validation'})]]> {'shard-key'})]]> - {'option'})]]> + option)]]> getName() === 'document']]>