Skip to content

Commit

Permalink
Fixed CS
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Jun 11, 2012
1 parent 69fd155 commit a051a60
Show file tree
Hide file tree
Showing 11 changed files with 408 additions and 407 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ public function objectFilter(&$script, $builder)
{
$relationName = $this->getRelationName($builder);
$relatedClass = $this->getForeignTable()->getPhpName();
$search = "public function set{$relationName}({$relatedClass} \$v = null)
$search = "public function set{$relationName}({$relatedClass} \$v = null)
{";
$replace = $search . "
$replace = $search . "
// aggregate_column_relation behavior
if (null !== \$this->a{$relationName} && \$v !== \$this->a{$relationName}) {
\$this->old{$relationName} = \$this->a{$relationName};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
$deleteQuery->setArchiveOnDelete(false);
$this->archiveOnDelete = true;
}
<?php endif; ?>
<?php endif;
2 changes: 1 addition & 1 deletion generator/lib/builder/om/PHP5NodeBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public function getIterator(\$type = null, \$opts = null)
\$itclass = ucfirst(strtolower(\$type)) . 'OrderNodeIterator';
require_once('propel/om/' . \$itclass . '.php');
require_once 'propel/om/'. \$itclass . '.php');
return new \$itclass(\$this, \$opts);
}
Expand Down
4 changes: 2 additions & 2 deletions generator/lib/platform/DefaultPlatform.php
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function getAddTablesDDL(Database $database)
}
$ret .= $this->getEndDDL();

return $ret;
return $ret;
}

/**
Expand Down Expand Up @@ -673,7 +673,7 @@ public function getModifyDatabaseDDL(PropelDatabaseDiff $databaseDiff)

$ret .= $this->getEndDDL();

return $ret;
return $ret;
}

/**
Expand Down
9 changes: 4 additions & 5 deletions generator/lib/platform/OraclePlatform.php
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,9 @@ public function getForeignKeyDDL(ForeignKey $fk)
return $script;
}


/**
* Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
* @return boolean
* @return boolean
*/
public function hasStreamBlobImpl()
{
Expand Down Expand Up @@ -261,7 +260,7 @@ public function supportsSchemas()
* @param Table|Index $object object with vendor parameters
* @param bool $isPrimaryKey is a primary key vendor part
*
* @return string oracle vendor sql part
* @return string oracle vendor sql part
*/
public function generateBlockStorage($object, $isPrimaryKey = false)
{
Expand Down Expand Up @@ -317,8 +316,8 @@ public function generateBlockStorage($object, $isPrimaryKey = false)
/**
* Builds the DDL SQL to add an Index.
*
* @param Index $index
* @return string
* @param Index $index
* @return string
*/
public function getAddIndexDDL(Index $index)
{
Expand Down
Loading

0 comments on commit a051a60

Please sign in to comment.