Skip to content

Commit

Permalink
Fix CS
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Sep 30, 2013
1 parent fb9a109 commit b81fbd9
Show file tree
Hide file tree
Showing 21 changed files with 68 additions and 71 deletions.
42 changes: 21 additions & 21 deletions src/Propel/Generator/Builder/Om/ObjectBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected function getTemporalFormatter(Column $column)
* Returns the type-casted and stringified default value for the specified
* Column. This only works for scalar default values currently.
*
* @param Column $column
* @param Column $column
* @throws EngineException
* @return string
*/
Expand Down Expand Up @@ -834,7 +834,7 @@ public function addTemporalAccessorOpen(&$script, Column $column)
/**
* Gets accessor lazy loaded snippets.
*
* @param Column $column
* @param Column $column
* @return string
*/
protected function getAccessorLazyLoadSnippet(Column $column)
Expand Down Expand Up @@ -3007,7 +3007,7 @@ protected function addFKMethods(&$script)

/**
* Adds the class attributes that are needed to store fkey related objects.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $fk
*/
protected function addFKAttributes(&$script, ForeignKey $fk)
Expand All @@ -3025,7 +3025,7 @@ protected function addFKAttributes(&$script, ForeignKey $fk)

/**
* Adds the mutator (setter) method for setting an fkey related object.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $fk
*/
protected function addFKMutator(&$script, ForeignKey $fk)
Expand Down Expand Up @@ -3097,7 +3097,7 @@ public function set".$this->getFKPhpNameAffix($fk, false)."($className \$v = nul

/**
* Adds the accessor (getter) method for getting an fkey related object.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $fk
*/
protected function addFKAccessor(&$script, ForeignKey $fk)
Expand Down Expand Up @@ -3195,7 +3195,7 @@ public function get".$this->getFKPhpNameAffix($fk, false)."(ConnectionInterface
* Adds a convenience method for setting a related object by specifying the primary key.
* This can be used in conjunction with the getPrimaryKey() for systems where nothing is known
* about the actual objects being related.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $fk
*/
protected function addFKByKeyMutator(&$script, ForeignKey $fk)
Expand Down Expand Up @@ -3253,7 +3253,7 @@ public function set".$methodAffix."Key(\$key)

/**
* Adds the method that fetches fkey-related (referencing) objects but also joins in data from another table.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKGetJoinMethods(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3324,7 +3324,7 @@ public function get".$relCol."Join".$relCol2."(\$criteria = null, \$con = null,
* Adds the attributes used to store objects that have referrer fkey relationships to this object.
* <code>protected collVarName;</code>
* <code>private lastVarNameCriteria = null;</code>
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKAttributes(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3412,7 +3412,7 @@ public function initRelation(\$relationName)

/**
* Adds the method that clears the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKClear(&$script, ForeignKey $refFK)
Expand All @@ -3439,7 +3439,7 @@ public function clear$relCol()

/**
* Adds the method that initializes the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKInit(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3473,7 +3473,7 @@ public function init$relCol(\$overrideExisting = true)

/**
* Adds the method that adds an object into the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKAdd(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3515,7 +3515,7 @@ public function add".$this->getRefFKPhpNameAffix($refFK, false)."($className \$l

/**
* Adds the method that returns the size of the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKCount(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3566,7 +3566,7 @@ public function count{$relCol}(Criteria \$criteria = null, \$distinct = false, C

/**
* Adds the method that returns the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKGet(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3701,7 +3701,7 @@ public function set{$relatedName}(Collection \${$inputCollection}, ConnectionInt
}

/**
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKDoAdd(&$script, $refFK)
Expand All @@ -3723,7 +3723,7 @@ protected function doAdd{$relatedObjectClassName}(\${$lowerRelatedObjectClassNam
}

/**
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKRemove(&$script, $refFK)
Expand Down Expand Up @@ -3771,7 +3771,7 @@ public function remove{$relatedObjectClassName}(\${$lowerRelatedObjectClassName}
/**
* Adds the method that gets a one-to-one related referrer fkey.
* This is for one-to-one relationship special case.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addPKRefFKGet(&$script, ForeignKey $refFK)
Expand Down Expand Up @@ -3969,7 +3969,7 @@ protected function addCrossFKMethods(&$script)

/**
* Adds the method that clears the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $crossFK
*/
protected function addCrossFKClear(&$script, ForeignKey $crossFK)
Expand Down Expand Up @@ -3998,7 +3998,7 @@ public function clear{$relCol}()
/**
* Adds the method that clears the referrer fkey collection.
*
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
*/
protected function addRefFKPartial(&$script, ForeignKey $refFK)
Expand All @@ -4019,7 +4019,7 @@ public function resetPartial{$relCol}(\$v = true)

/**
* Adds the method that initializes the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $crossFK
*/
protected function addCrossFKInit(&$script, ForeignKey $crossFK)
Expand Down Expand Up @@ -4178,7 +4178,7 @@ public function count{$relatedName}(\$criteria = null, \$distinct = false, Conne

/**
* Adds the method that adds an object into the referrer fkey collection.
* @param string &$script The script will be modified in this method.
* @param string &$script The script will be modified in this method.
* @param ForeignKey $refFK
* @param ForeignKey $crossFK
*/
Expand Down Expand Up @@ -4258,7 +4258,7 @@ protected function doAdd{$relatedObjectClassName}(\${$lowerRelatedObjectClassNam

/**
* Adds the method that remove an object from the referrer fkey collection.
* @param string $script The script will be modified in this method.
* @param string $script The script will be modified in this method.
* @param ForeignKey $refFK
* @param ForeignKey $crossFK
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Propel/Generator/Builder/Om/TableMapBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -727,8 +727,8 @@ public function addClearRelatedInstancePool()

/**
* Checks whether any registered behavior on that table has a modifier for a hook
* @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
* @param null $modifier
* @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
* @param null $modifier
* @return boolean
*/
public function hasBehaviorModifier($hookName, $modifier = null)
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Command/DatabaseReverseCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$manager->setWorkingDirectory($input->getOption('output-dir'));

list(, $dsn, $infos) = $this->parseConnection('connection=' . $input->getArgument('connection'));

$manager->setConnection(array_merge(array('dsn' => $dsn), $infos));

$manager->setDatabaseName($input->getOption('database-name'));
Expand Down
1 change: 0 additions & 1 deletion src/Propel/Generator/Command/SqlInsertCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\Output;
use Propel\Generator\Manager\SqlManager;
use Propel\Generator\Exception\InvalidArgumentException;

/**
* @author William Durand <william.durand1@gmail.com>
Expand Down
6 changes: 3 additions & 3 deletions src/Propel/Generator/Model/Column.php
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ public function addInheritance($inheritance)

/**
* Returns the inheritance type.
*
*
* @return string
*/
public function getInheritanceType()
Expand All @@ -636,7 +636,7 @@ public function getInheritanceType()

/**
* Returns the inheritance list.
*
*
* @return Inheritance[]
*/
public function getInheritanceList()
Expand Down Expand Up @@ -1210,7 +1210,7 @@ public function getDefaultValueString()
/**
* Sets a string that will give this column a default value.
*
* @param ColumnDefaultValue|scalar $defaultValue The column's default value
* @param ColumnDefaultValue|scalar $defaultValue The column's default value
* @return Column
*/
public function setDefaultValue($defaultValue)
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/ConstraintNameGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class ConstraintNameGenerator implements NameGeneratorInterface
* of this constraint.
*
* @see NameGenerator
* @param array $inputs An array of input parameters
* @param array $inputs An array of input parameters
* @throws EngineException
*/
public function generateName($inputs)
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/Database.php
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function setPlatform(PlatformInterface $platform = null)

/**
* Returns the max column name's length.
*
*
* @return integer
*/
public function getMaxColumnNameLength()
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/Diff/TableDiff.php
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public function getAddedColumns()
/**
* Returns an added column by its name.
*
* @param string $columnName
* @param string $columnName
* @return Column|null
*/
public function getAddedColumn($columnName)
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Index extends MappingModel

/**
* The Table instance.
*
*
* @var Table
*/
protected $table;
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/MappingModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public function getVendorInfoForType($type)

/**
* Returns the list of all vendor information.
*
*
* @return VendorInfo[]
*/
public function getVendorInformation()
Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public function countTables()
public function toString()
{
$dumper = new XmlDumper();

return $dumper->dumpSchema($this);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Propel/Generator/Model/ScopedMappingModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct()

/**
* Returns whether or not the package has been overriden.
*
*
* @return boolean
*/
public function isPackageOverriden()
Expand Down
Loading

0 comments on commit b81fbd9

Please sign in to comment.