Skip to content

Commit

Permalink
Fixed some CS
Browse files Browse the repository at this point in the history
  • Loading branch information
robin850 committed Jun 14, 2012
1 parent d7e81f8 commit 3391db2
Show file tree
Hide file tree
Showing 91 changed files with 253 additions and 306 deletions.
2 changes: 1 addition & 1 deletion features/bootstrap/FeatureContext.php
Expand Up @@ -26,7 +26,7 @@ class FeatureContext extends BehatContext
* Initializes context.
* Every scenario gets it's own context object.
*
* @param array $parameters context parameters (set them up through behat.yml)
* @param array $parameters context parameters (set them up through behat.yml)
*/
public function __construct(array $parameters)
{
Expand Down
Expand Up @@ -118,7 +118,7 @@ protected function filter(&$script)
* @param string $code The input code
* @return string The input code, without comments
*/
static public function stripComments($code)
public static function stripComments($code)
{
$output = '';
$commentTokens = array(T_COMMENT, T_DOC_COMMENT);
Expand Down
Expand Up @@ -14,4 +14,4 @@
$deleteQuery->setArchiveOnDelete(false);
$this->archiveOnDelete = true;
}
<?php endif; ?>
<?php endif;
Expand Up @@ -535,7 +535,6 @@ public function setParent(\$parent = null)
";
}


protected function addGetParent(&$script)
{
$script .= "
Expand Down
3 changes: 1 addition & 2 deletions src/Propel/Generator/Builder/Om/AbstractPeerBuilder.php
Expand Up @@ -252,7 +252,6 @@ public function getRetrieveMethodName()
return $retrieveMethod;
}


/**
* COMPATIBILITY: Get the column constant name (e.g. PeerName::COLUMN_NAME).
*
Expand All @@ -266,7 +265,7 @@ public function getRetrieveMethodName()
* @return string If $phpName is provided, then will return {$phpName}Peer::COLUMN_NAME; if not, just COLUMN_NAME.
* @deprecated
*/
static public function getColumnName(Column $col, $phpName = null)
public static function getColumnName(Column $col, $phpName = null)
{
// was it overridden in schema.xml ?
if ($col->getPeerName()) {
Expand Down
14 changes: 7 additions & 7 deletions src/Propel/Generator/Builder/Om/ClassTools.php
Expand Up @@ -25,7 +25,7 @@ class ClassTools
* @param string $qualifiedName
* @return string
*/
static public function classname($qualifiedName)
public static function classname($qualifiedName)
{
if (false === $pos = strrpos($qualifiedName, '.')) {
return $qualifiedName; // there is no '.' in the qualifed name
Expand All @@ -48,7 +48,7 @@ static public function classname($qualifiedName)
* @param string $extension The extension to use on the file.
* @return string The constructed file path.
*/
static public function getFilePath($path, $classname = null, $extension = '.php')
public static function getFilePath($path, $classname = null, $extension = '.php')
{
$path = strtr(ltrim($path, '.'), '.', '/');

Expand All @@ -65,7 +65,7 @@ static public function getFilePath($path, $classname = null, $extension = '.php'
* @param string $extension The extension to use on the file.
* @return string The constructed file path.
*/
static public function createFilePath($path, $classname = null, $extension = '.php')
public static function createFilePath($path, $classname = null, $extension = '.php')
{
if (null === $classname) {
return $path . $extension;
Expand All @@ -83,7 +83,7 @@ static public function createFilePath($path, $classname = null, $extension = '.p
* If not, will return 'propel.util.BasePeer'
* @return string
*/
static public function getBasePeer(Table $table)
public static function getBasePeer(Table $table)
{
if (null === $class = $table->getBasePeer()) {
$class = 'propel.util.BasePeer';
Expand All @@ -97,7 +97,7 @@ static public function getBasePeer(Table $table)
* If not, will return 'propel.om.BaseObject'
* @return string
*/
static public function getBaseClass(Table $table)
public static function getBaseClass(Table $table)
{
if (null === $class = $table->getBaseClass()) {
$class = 'propel.om.BaseObject';
Expand All @@ -111,7 +111,7 @@ static public function getBaseClass(Table $table)
* If not, will return 'propel.om.Persistent'.
* @return string
*/
static public function getInterface(Table $table)
public static function getInterface(Table $table)
{
$interface = $table->getInterface();
if (null === $interface && !$table->isReadOnly()) {
Expand All @@ -126,7 +126,7 @@ static public function getInterface(Table $table)
*
* @return array string[]
*/
static public function getPhpReservedWords()
public static function getPhpReservedWords()
{
return array(
'and', 'or', 'xor', 'exception', '__FILE__', '__LINE__',
Expand Down
1 change: 0 additions & 1 deletion src/Propel/Generator/Builder/Om/ExtensionPeerBuilder.php
Expand Up @@ -92,5 +92,4 @@ protected function addClassClose(&$script)
$this->applyBehaviorModifier('extensionPeerFilter', $script, "");
}


} // ExtensionPeerBuilder
4 changes: 0 additions & 4 deletions src/Propel/Generator/Builder/Om/ObjectBuilder.php
Expand Up @@ -751,7 +751,6 @@ protected function addApplyDefaultValuesBody(&$script)
}
}


/**
* Adds the function close for the applyDefaults method.
*
Expand All @@ -778,7 +777,6 @@ protected function addTemporalAccessor(&$script, Column $column)
$this->addTemporalAccessorClose($script);
}


/**
* Adds the comment for a temporal accessor.
*
Expand Down Expand Up @@ -916,7 +914,6 @@ protected function addTemporalAccessorBody(&$script, Column $column)
}";
}


/**
* Adds the body of the temporal accessor.
*
Expand Down Expand Up @@ -4504,7 +4501,6 @@ protected function doUpdate(ConnectionInterface \$con)
";
}


/**
* Adds the $alreadyInSave attribute, which prevents attempting to re-save the same object.
* @param string &$script The script will be modified in this method.
Expand Down

0 comments on commit 3391db2

Please sign in to comment.