Skip to content

Commit

Permalink
Fix CS
Browse files Browse the repository at this point in the history
  • Loading branch information
@FabioBatSilva
FabioBatSilva committed Jun 23, 2012
1 parent 7800a7e commit ca4862a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 20 deletions.
22 changes: 14 additions & 8 deletions lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,12 @@ protected function validateRuntimeMetadata($class, $parent)
$class->validateLifecycleCallbacks($this->getReflectionService());

// verify inheritance
if (!$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
if (!$parent) {
if ( ! $class->isMappedSuperclass && !$class->isInheritanceTypeNone()) {
if ( ! $parent) {
if (count($class->discriminatorMap) == 0) {
throw MappingException::missingDiscriminatorMap($class->name);
}
if (!$class->discriminatorColumn) {
if ( ! $class->discriminatorColumn) {
throw MappingException::missingDiscriminatorColumn($class->name);
}
} else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) {
Expand Down Expand Up @@ -562,7 +562,7 @@ private function addInheritedRelations(ClassMetadata $subClass, ClassMetadata $p
private function addInheritedNamedQueries(ClassMetadata $subClass, ClassMetadata $parentClass)
{
foreach ($parentClass->namedQueries as $name => $query) {
if (!isset ($subClass->namedQueries[$name])) {
if ( ! isset ($subClass->namedQueries[$name])) {
$subClass->addNamedQuery(array(
'name' => $query['name'],
'query' => $query['query']
Expand All @@ -581,7 +581,7 @@ private function addInheritedNamedQueries(ClassMetadata $subClass, ClassMetadata
private function addInheritedNamedNativeQueries(ClassMetadata $subClass, ClassMetadata $parentClass)
{
foreach ($parentClass->namedNativeQueries as $name => $query) {
if (!isset ($subClass->namedNativeQueries[$name])) {
if ( ! isset ($subClass->namedNativeQueries[$name])) {
$subClass->addNamedNativeQuery(array(
'name' => $query['name'],
'query' => $query['query'],
Expand All @@ -603,7 +603,7 @@ private function addInheritedNamedNativeQueries(ClassMetadata $subClass, ClassMe
private function addInheritedSqlResultSetMappings(ClassMetadata $subClass, ClassMetadata $parentClass)
{
foreach ($parentClass->sqlResultSetMappings as $name => $mapping) {
if (!isset ($subClass->sqlResultSetMappings[$name])) {
if ( ! isset ($subClass->sqlResultSetMappings[$name])) {
$entities = array();
foreach ($mapping['entities'] as $entity) {
$entities[] = array(
Expand Down Expand Up @@ -650,7 +650,7 @@ private function completeIdGeneratorMapping(ClassMetadataInfo $class)
// Not pretty but necessary and the simplest solution that currently works.
$sequenceName = null;

if($this->targetPlatform instanceof Platforms\PostgreSQLPlatform) {
if ($this->targetPlatform instanceof Platforms\PostgreSQLPlatform) {
$fieldName = $class->getSingleIdentifierFieldName();
$columnName = $class->getSingleIdentifierColumnName();
$quoted = isset($class->fieldMappings[$fieldName]['quoted']) || isset($class->table['quoted']);
Expand All @@ -668,6 +668,7 @@ private function completeIdGeneratorMapping(ClassMetadataInfo $class)

$class->setIdGenerator(new \Doctrine\ORM\Id\IdentityGenerator($sequenceName));
break;

case ClassMetadata::GENERATOR_TYPE_SEQUENCE:
// If there is no sequence definition yet, create a default definition
$definition = $class->sequenceGeneratorDefinition;
Expand Down Expand Up @@ -696,23 +697,28 @@ private function completeIdGeneratorMapping(ClassMetadataInfo $class)
);
$class->setIdGenerator($sequenceGenerator);
break;

case ClassMetadata::GENERATOR_TYPE_NONE:
$class->setIdGenerator(new \Doctrine\ORM\Id\AssignedGenerator());
break;

case ClassMetadata::GENERATOR_TYPE_UUID:
$class->setIdGenerator(new \Doctrine\ORM\Id\UuidGenerator());
break;

case ClassMetadata::GENERATOR_TYPE_TABLE:
throw new ORMException("TableGenerator not yet implemented.");
break;

case ClassMetadata::GENERATOR_TYPE_CUSTOM:
$definition = $class->customGeneratorDefinition;
if (!class_exists($definition['class'])) {
if ( ! class_exists($definition['class'])) {
throw new ORMException("Can't instantiate custom generator : " .
$definition['class']);
}
$class->setIdGenerator(new $definition['class']);
break;

default:
throw new ORMException("Unknown generator type: " . $class->generatorType);
}
Expand Down
15 changes: 7 additions & 8 deletions lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ protected final function _updateTable($entity, $quotedTableName, array $updateDa
$type = Type::getType($this->_columnTypes[$columnName]);
$placeholder = $type->convertToDatabaseValueSQL('?', $this->_platform);
}
} else if(isset($this->quotedColumns[$columnName])) {
} else if (isset($this->quotedColumns[$columnName])) {
$column = $this->quotedColumns[$columnName];
}

Expand Down Expand Up @@ -467,7 +467,7 @@ protected function deleteJoinTableRecords($identifier)
$this->_conn->delete($joinTableName, array_combine($keys, $identifier));

if ($selfReferential) {
$this->_conn->delete($joinTableName,array_combine($otherKeys, $identifier));
$this->_conn->delete($joinTableName, array_combine($otherKeys, $identifier));
}
}
}
Expand Down Expand Up @@ -1105,23 +1105,22 @@ protected function _getSelectColumnListSQL()
*/
protected function _getSelectColumnAssociationSQL($field, $assoc, ClassMetadata $class, $alias = 'r')
{
$columnList = '';
$columnList = array();

if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) {
foreach ($assoc['joinColumns'] as $joinColumn) {

if ($columnList) $columnList .= ', ';
foreach ($assoc['joinColumns'] as $joinColumn) {

$quotedColumn = $this->quoteStrategy->getJoinColumnName($joinColumn, $this->_class, $this->_platform);
$resultColumnName = $this->getSQLColumnAlias($joinColumn['name']);
$columnList .= $this->_getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) )
$columnList[] = $this->_getSQLTableAlias($class->name, ($alias == 'r' ? '' : $alias) )
. '.' . $quotedColumn . ' AS ' . $resultColumnName;

$this->_rsm->addMetaResult($alias, $resultColumnName, $quotedColumn, isset($assoc['id']) && $assoc['id'] === true);
}
}

return $columnList;
return implode(', ', $columnList);
}

/**
Expand Down Expand Up @@ -1598,7 +1597,7 @@ protected function getJoinSQLForJoinColumns($joinColumns)
{
// if one of the join columns is nullable, return left join
foreach ($joinColumns as $joinColumn) {
if (!isset($joinColumn['nullable']) || $joinColumn['nullable']) {
if ( ! isset($joinColumn['nullable']) || $joinColumn['nullable']) {
return 'LEFT JOIN';
}
}
Expand Down
8 changes: 4 additions & 4 deletions lib/Doctrine/ORM/Tools/SchemaTool.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function getSchemaFromMetadata(array $classes)
}
}

if (!$table->hasIndex('primary')) {
if ( ! $table->hasIndex('primary')) {
$table->setPrimaryKey($pkColumns);
}

Expand Down Expand Up @@ -290,7 +290,7 @@ private function addDiscriminatorColumnDefinition($class, $table)
{
$discrColumn = $class->discriminatorColumn;

if (!isset($discrColumn['type']) || (strtolower($discrColumn['type']) == 'string' && $discrColumn['length'] === null)) {
if ( ! isset($discrColumn['type']) || (strtolower($discrColumn['type']) == 'string' && $discrColumn['length'] === null)) {
$discrColumn['type'] = 'string';
$discrColumn['length'] = 255;
}
Expand Down Expand Up @@ -515,7 +515,7 @@ private function _gatherRelationJoinColumns($joinColumns, $theJoinTable, $class,

list($definingClass, $referencedFieldName) = $this->getDefiningClass($class, $joinColumn['referencedColumnName']);

if (!$definingClass) {
if ( ! $definingClass) {
throw new \Doctrine\ORM\ORMException(
"Column name `".$joinColumn['referencedColumnName']."` referenced for relation from ".
$mapping['sourceEntity'] . " towards ". $mapping['targetEntity'] . " does not exist."
Expand Down Expand Up @@ -638,7 +638,7 @@ public function getDropSchemaSQL(array $classes)
$sm = $this->em->getConnection()->getSchemaManager();
$fullSchema = $sm->createSchema();
foreach ($fullSchema->getTables() as $table) {
if (!$schema->hasTable($table->getName())) {
if ( ! $schema->hasTable($table->getName())) {
foreach ($table->getForeignKeys() as $foreignKey) {
/* @var $foreignKey \Doctrine\DBAL\Schema\ForeignKeyConstraint */
if ($schema->hasTable($foreignKey->getForeignTableName())) {
Expand Down

0 comments on commit ca4862a

Please sign in to comment.