From c7d6d6239320394d6d3d3c4fc98d67a0b0aeef9b Mon Sep 17 00:00:00 2001 From: Dariusz Ruminski Date: Wed, 6 Sep 2017 01:22:41 +0200 Subject: [PATCH] Use newer PHP syntax --- .../ORM/Mapping/ClassMetadataInfo.php | 18 ++++++----------- .../ORM/Mapping/Driver/YamlDriver.php | 20 +++++++++---------- .../Entity/BasicEntityPersister.php | 2 +- .../Entity/JoinedSubclassPersister.php | 4 +--- .../Query/Exec/MultiTableUpdateExecutor.php | 2 +- .../ORM/Query/ResultSetMappingBuilder.php | 6 ++---- lib/Doctrine/ORM/QueryBuilder.php | 6 +++--- .../ORM/Tools/ConvertDoctrine1Schema.php | 8 ++++---- .../ORM/Tools/Export/Driver/YamlExporter.php | 6 +++--- lib/Doctrine/ORM/Tools/SchemaTool.php | 12 +++++------ lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- .../Doctrine/Tests/ORM/EntityManagerTest.php | 2 +- .../Functional/Locking/GearmanLockTest.php | 4 ++-- .../Functional/Locking/LockAgentWorker.php | 4 ++-- .../ORM/Functional/Ticket/DDC1454Test.php | 2 +- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 4 ++-- 16 files changed, 47 insertions(+), 57 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index b5eebcdde..7794c8c4d 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -942,7 +942,7 @@ class ClassMetadataInfo implements ClassMetadata } $fieldRefl = $reflService->getAccessibleProperty( - isset($embeddedClass['declared']) ? $embeddedClass['declared'] : $this->name, + $embeddedClass['declared'] ?? $this->name, $property ); @@ -1617,9 +1617,7 @@ class ClassMetadataInfo implements ClassMetadata } $mapping['sourceToTargetKeyColumns'][$joinColumn['name']] = $joinColumn['referencedColumnName']; - $mapping['joinColumnFieldNames'][$joinColumn['name']] = isset($joinColumn['fieldName']) - ? $joinColumn['fieldName'] - : $joinColumn['name']; + $mapping['joinColumnFieldNames'][$joinColumn['name']] = $joinColumn['fieldName'] ?? $joinColumn['name']; } if ($uniqueConstraintColumns) { @@ -3288,8 +3286,8 @@ class ClassMetadataInfo implements ClassMetadata $this->embeddedClasses[$mapping['fieldName']] = [ 'class' => $this->fullyQualifiedClassName($mapping['class']), 'columnPrefix' => $mapping['columnPrefix'], - 'declaredField' => isset($mapping['declaredField']) ? $mapping['declaredField'] : null, - 'originalField' => isset($mapping['originalField']) ? $mapping['originalField'] : null, + 'declaredField' => $mapping['declaredField'] ?? null, + 'originalField' => $mapping['originalField'] ?? null, ]; } @@ -3302,15 +3300,11 @@ class ClassMetadataInfo implements ClassMetadata public function inlineEmbeddable($property, ClassMetadataInfo $embeddable) { foreach ($embeddable->fieldMappings as $fieldMapping) { - $fieldMapping['originalClass'] = isset($fieldMapping['originalClass']) - ? $fieldMapping['originalClass'] - : $embeddable->name; + $fieldMapping['originalClass'] = $fieldMapping['originalClass'] ?? $embeddable->name; $fieldMapping['declaredField'] = isset($fieldMapping['declaredField']) ? $property . '.' . $fieldMapping['declaredField'] : $property; - $fieldMapping['originalField'] = isset($fieldMapping['originalField']) - ? $fieldMapping['originalField'] - : $fieldMapping['fieldName']; + $fieldMapping['originalField'] = $fieldMapping['originalField'] ?? $fieldMapping['fieldName']; $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName']; if (! empty($this->embeddedClasses[$property]['columnPrefix'])) { diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index fa5201393..efd5accbc 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -64,7 +64,7 @@ class YamlDriver extends FileDriver } } else if ($element['type'] == 'mappedSuperclass') { $metadata->setCustomRepositoryClass( - isset($element['repositoryClass']) ? $element['repositoryClass'] : null + $element['repositoryClass'] ?? null ); $metadata->isMappedSuperclass = true; } else if ($element['type'] == 'embeddable') { @@ -115,9 +115,9 @@ class YamlDriver extends FileDriver $metadata->addNamedNativeQuery( [ 'name' => $mappingElement['name'], - 'query' => isset($mappingElement['query']) ? $mappingElement['query'] : null, - 'resultClass' => isset($mappingElement['resultClass']) ? $mappingElement['resultClass'] : null, - 'resultSetMapping' => isset($mappingElement['resultSetMapping']) ? $mappingElement['resultSetMapping'] : null, + 'query' => $mappingElement['query'] ?? null, + 'resultClass' => $mappingElement['resultClass'] ?? null, + 'resultSetMapping' => $mappingElement['resultSetMapping'] ?? null, ] ); } @@ -136,15 +136,15 @@ class YamlDriver extends FileDriver foreach ($resultSetMapping['entityResult'] as $entityResultElement) { $entityResult = [ 'fields' => [], - 'entityClass' => isset($entityResultElement['entityClass']) ? $entityResultElement['entityClass'] : null, - 'discriminatorColumn' => isset($entityResultElement['discriminatorColumn']) ? $entityResultElement['discriminatorColumn'] : null, + 'entityClass' => $entityResultElement['entityClass'] ?? null, + 'discriminatorColumn' => $entityResultElement['discriminatorColumn'] ?? null, ]; if (isset($entityResultElement['fieldResult'])) { foreach ($entityResultElement['fieldResult'] as $fieldResultElement) { $entityResult['fields'][] = [ - 'name' => isset($fieldResultElement['name']) ? $fieldResultElement['name'] : null, - 'column' => isset($fieldResultElement['column']) ? $fieldResultElement['column'] : null, + 'name' => $fieldResultElement['name'] ?? null, + 'column' => $fieldResultElement['column'] ?? null, ]; } } @@ -157,7 +157,7 @@ class YamlDriver extends FileDriver if (isset($resultSetMapping['columnResult'])) { foreach ($resultSetMapping['columnResult'] as $columnResultAnnot) { $columns[] = [ - 'name' => isset($columnResultAnnot['name']) ? $columnResultAnnot['name'] : null, + 'name' => $columnResultAnnot['name'] ?? null, ]; } } @@ -343,7 +343,7 @@ class YamlDriver extends FileDriver $mapping = [ 'fieldName' => $name, 'class' => $embeddedMapping['class'], - 'columnPrefix' => isset($embeddedMapping['columnPrefix']) ? $embeddedMapping['columnPrefix'] : null, + 'columnPrefix' => $embeddedMapping['columnPrefix'] ?? null, ]; $metadata->mapEmbedded($mapping); } diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index 972199c5e..b9fb045e9 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -1795,7 +1795,7 @@ class BasicEntityPersister implements EntityPersister $parameters = []; $owningAssoc = $this->class->associationMappings[$assoc['mappedBy']]; $sourceClass = $this->em->getClassMetadata($assoc['sourceEntity']); - $tableAlias = $this->getSQLTableAlias(isset($owningAssoc['inherited']) ? $owningAssoc['inherited'] : $this->class->name); + $tableAlias = $this->getSQLTableAlias($owningAssoc['inherited'] ?? $this->class->name); foreach ($owningAssoc['targetToSourceKeyColumns'] as $sourceKeyColumn => $targetKeyColumn) { if ($sourceClass->containsForeignIdentifier) { diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index 0be150689..2693f3fab 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -196,9 +196,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister foreach ($subTableStmts as $tableName => $stmt) { /** @var \Doctrine\DBAL\Statement $stmt */ $paramIndex = 1; - $data = isset($insertData[$tableName]) - ? $insertData[$tableName] - : []; + $data = $insertData[$tableName] ?? []; foreach ((array) $id as $idName => $idVal) { $type = isset($this->columnTypes[$idName]) ? $this->columnTypes[$idName] : Type::STRING; diff --git a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php index 7f13ed5f6..47db03421 100644 --- a/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php +++ b/lib/Doctrine/ORM/Query/Exec/MultiTableUpdateExecutor.php @@ -183,7 +183,7 @@ class MultiTableUpdateExecutor extends AbstractSqlExecutor if (isset($this->_sqlParameters[$key])) { foreach ($this->_sqlParameters[$key] as $parameterKey => $parameterName) { $paramValues[] = $params[$parameterKey]; - $paramTypes[] = isset($types[$parameterKey]) ? $types[$parameterKey] : ParameterTypeInferer::inferType($params[$parameterKey]); + $paramTypes[] = $types[$parameterKey] ?? ParameterTypeInferer::inferType($params[$parameterKey]); } } diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php index 887d02c6f..0bf11814b 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php +++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php @@ -206,8 +206,7 @@ class ResultSetMappingBuilder extends ResultSetMapping return $columnName . $this->sqlCounter++; case self::COLUMN_RENAMING_CUSTOM: - return isset($customRenameColumns[$columnName]) - ? $customRenameColumns[$columnName] : $columnName; + return $customRenameColumns[$columnName] ?? $columnName; case self::COLUMN_RENAMING_NONE: return $columnName; @@ -441,8 +440,7 @@ class ResultSetMappingBuilder extends ResultSetMapping $sql = ""; foreach ($this->columnOwnerMap as $columnName => $dqlAlias) { - $tableAlias = isset($tableAliases[$dqlAlias]) - ? $tableAliases[$dqlAlias] : $dqlAlias; + $tableAlias = $tableAliases[$dqlAlias] ?? $dqlAlias; if ($sql) { $sql .= ", "; diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 51f7580dd..976be4ddf 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -1441,12 +1441,12 @@ class QueryBuilder $queryPart = $this->getDQLPart($queryPartName); if (empty($queryPart)) { - return (isset($options['empty']) ? $options['empty'] : ''); + return ($options['empty'] ?? ''); } - return (isset($options['pre']) ? $options['pre'] : '') + return ($options['pre'] ?? '') . (is_array($queryPart) ? implode($options['separator'], $queryPart) : $queryPart) - . (isset($options['post']) ? $options['post'] : ''); + . ($options['post'] ?? ''); } /** diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php index 408cb52d2..5356520c0 100644 --- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php +++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php @@ -214,7 +214,7 @@ class ConvertDoctrine1Schema $fieldMapping['id'] = true; } - $fieldMapping['fieldName'] = isset($column['alias']) ? $column['alias'] : $name; + $fieldMapping['fieldName'] = $column['alias'] ?? $name; $fieldMapping['columnName'] = $column['name']; $fieldMapping['type'] = $column['type']; @@ -313,13 +313,13 @@ class ConvertDoctrine1Schema $foreignType = 'many'; $joinColumns = []; } else { - $type = isset($relation['type']) ? $relation['type'] : 'one'; - $foreignType = isset($relation['foreignType']) ? $relation['foreignType'] : 'many'; + $type = $relation['type'] ?? 'one'; + $foreignType = $relation['foreignType'] ?? 'many'; $joinColumns = [ [ 'name' => $relation['local'], 'referencedColumnName' => $relation['foreign'], - 'onDelete' => isset($relation['onDelete']) ? $relation['onDelete'] : null, + 'onDelete' => $relation['onDelete'] ?? null, ] ]; } diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 5da790954..8fa1a7ffc 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -193,7 +193,7 @@ class YamlExporter extends AbstractExporter 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'orphanRemoval' => $associationMapping['orphanRemoval'], - 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null + 'orderBy' => $associationMapping['orderBy'] ?? null ]; $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); @@ -202,8 +202,8 @@ class YamlExporter extends AbstractExporter $manyToManyMappingArray = [ 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], - 'joinTable' => isset($associationMapping['joinTable']) ? $associationMapping['joinTable'] : null, - 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null + 'joinTable' => $associationMapping['joinTable'] ?? null, + 'orderBy' => $associationMapping['orderBy'] ?? null ]; $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 6609b5ea0..5a3eb32ab 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -283,13 +283,13 @@ class SchemaTool $indexData['flags'] = []; } - $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags'], isset($indexData['options']) ? $indexData['options'] : []); + $table->addIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, (array) $indexData['flags'], $indexData['options'] ?? []); } } if (isset($class->table['uniqueConstraints'])) { foreach ($class->table['uniqueConstraints'] as $indexName => $indexData) { - $uniqIndex = new Index($indexName, $indexData['columns'], true, false, [], isset($indexData['options']) ? $indexData['options'] : []); + $uniqIndex = new Index($indexName, $indexData['columns'], true, false, [], $indexData['options'] ?? []); foreach ($table->getIndexes() as $tableIndexName => $tableIndex) { if ($tableIndex->isFullfilledBy($uniqIndex)) { @@ -298,7 +298,7 @@ class SchemaTool } } - $table->addUniqueIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, isset($indexData['options']) ? $indexData['options'] : []); + $table->addUniqueIndex($indexData['columns'], is_numeric($indexName) ? null : $indexName, $indexData['options'] ?? []); } } @@ -365,7 +365,7 @@ class SchemaTool } $options = [ - 'length' => isset($discrColumn['length']) ? $discrColumn['length'] : null, + 'length' => $discrColumn['length'] ?? null, 'notnull' => true ]; @@ -417,7 +417,7 @@ class SchemaTool $columnType = $mapping['type']; $options = []; - $options['length'] = isset($mapping['length']) ? $mapping['length'] : null; + $options['length'] = $mapping['length'] ?? null; $options['notnull'] = isset($mapping['nullable']) ? ! $mapping['nullable'] : true; if ($class->isInheritanceTypeSingleTable() && $class->parentClasses) { $options['notnull'] = false; @@ -474,7 +474,7 @@ class SchemaTool $table->addColumn($columnName, $columnType, $options); } - $isUnique = isset($mapping['unique']) ? $mapping['unique'] : false; + $isUnique = $mapping['unique'] ?? false; if ($isUnique) { $table->addUniqueIndex([$columnName]); } diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 05ad599a4..7ec28064d 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1001,7 +1001,7 @@ class UnitOfWork implements PropertyChangedListener $changeSet = []; foreach ($actualData as $propName => $actualValue) { - $orgValue = isset($originalData[$propName]) ? $originalData[$propName] : null; + $orgValue = $originalData[$propName] ?? null; if ($orgValue !== $actualValue) { $changeSet[$propName] = [$orgValue, $actualValue]; @@ -2681,7 +2681,7 @@ class UnitOfWork implements PropertyChangedListener // TODO: Is this even computed right in all cases of composite keys? foreach ($assoc['targetToSourceKeyColumns'] as $targetColumn => $srcColumn) { - $joinColumnValue = isset($data[$srcColumn]) ? $data[$srcColumn] : null; + $joinColumnValue = $data[$srcColumn] ?? null; if ($joinColumnValue !== null) { if ($targetClass->containsForeignIdentifier) { diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index 0191ba158..a05e86109 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -277,7 +277,7 @@ class EntityManagerTest extends OrmTestCase */ public function testClearManagerWithProxyClassName() { - $proxy = $this->_em->getReference(Country::class, ['id' => rand(457, 100000)]); + $proxy = $this->_em->getReference(Country::class, ['id' => random_int(457, 100000)]); $entity = new Country(456, 'United Kingdom'); diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php index 9c8d4b7ea..e804a5c33 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php @@ -27,8 +27,8 @@ class GearmanLockTest extends OrmFunctionalTestCase $this->gearman = new \GearmanClient(); $this->gearman->addServer( - isset($_SERVER['GEARMAN_HOST']) ? $_SERVER['GEARMAN_HOST'] : null, - isset($_SERVER['GEARMAN_PORT']) ? $_SERVER['GEARMAN_PORT'] : 4730 + $_SERVER['GEARMAN_HOST'] ?? null, + $_SERVER['GEARMAN_PORT'] ?? 4730 ); $this->gearman->setCompleteCallback([$this, "gearmanTaskCompleted"]); diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php index c7b82f7a8..4271b12b4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php @@ -17,8 +17,8 @@ class LockAgentWorker $worker = new \GearmanWorker(); $worker->addServer( - isset($_SERVER['GEARMAN_HOST']) ? $_SERVER['GEARMAN_HOST'] : null, - isset($_SERVER['GEARMAN_PORT']) ? $_SERVER['GEARMAN_PORT'] : 4730 + $_SERVER['GEARMAN_HOST'] ?? null, + $_SERVER['GEARMAN_PORT'] ?? 4730 ); $worker->addFunction("findWithLock", [$lockAgent, "findWithLock"]); $worker->addFunction("dqlWithLock", [$lockAgent, "dqlWithLock"]); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php index 86aba5113..f10065cd8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php @@ -55,7 +55,7 @@ class DDC1454File public function __construct() { - $this->fileId = rand(); + $this->fileId = random_int(0, getrandmax()); } /** diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 12eadbdaa..fb95ba8ba 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -599,7 +599,7 @@ class UnitOfWorkTest extends OrmTestCase $mergedEntity = new EntityWithRandomlyGeneratedField(); $mergedEntity->id = $persistedEntity->id; - $mergedEntity->generatedField = mt_rand( + $mergedEntity->generatedField = random_int( $persistedEntity->generatedField + 1, $persistedEntity->generatedField + 1000 ); @@ -915,7 +915,7 @@ class EntityWithRandomlyGeneratedField public function __construct() { $this->id = uniqid('id', true); - $this->generatedField = mt_rand(0, 100000); + $this->generatedField = random_int(0, 100000); } }