Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed some CS

  • Loading branch information...
commit 3391db2d002221e7b76ef03616989075e3d7c742 1 parent d7e81f8
Robin Dupret robin850 authored
Showing with 253 additions and 306 deletions.
  1. +1 −1  features/bootstrap/FeatureContext.php
  2. +1 −1  src/Propel/Generator/Behavior/AlternativeCodingStandards/AlternativeCodingStandardsBehavior.php
  3. +1 −1  src/Propel/Generator/Behavior/Archivable/templates/objectPreDelete.php
  4. +0 −1  src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php
  5. +1 −2  src/Propel/Generator/Builder/Om/AbstractPeerBuilder.php
  6. +7 −7 src/Propel/Generator/Builder/Om/ClassTools.php
  7. +0 −1  src/Propel/Generator/Builder/Om/ExtensionPeerBuilder.php
  8. +0 −4 src/Propel/Generator/Builder/Om/ObjectBuilder.php
  9. +33 −33 src/Propel/Generator/Builder/Om/PeerBuilder.php
  10. +1 −1  src/Propel/Generator/Builder/Om/QueryBuilder.php
  11. +1 −1  src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
  12. +3 −3 src/Propel/Generator/Builder/Sql/DataSQLBuilder.php
  13. +1 −1  src/Propel/Generator/Builder/Sql/Pgsql/PgsqlDataSQLBuilder.php
  14. +5 −5 src/Propel/Generator/Config/GeneratorConfigInterface.php
  15. +3 −3 src/Propel/Generator/Manager/MigrationManager.php
  16. +2 −2 src/Propel/Generator/Model/Column.php
  17. +1 −2  src/Propel/Generator/Model/Database.php
  18. +2 −2 src/Propel/Generator/Model/Diff/ColumnComparator.php
  19. +1 −1  src/Propel/Generator/Model/Diff/DatabaseComparator.php
  20. +1 −1  src/Propel/Generator/Model/Diff/ForeignKeyComparator.php
  21. +1 −1  src/Propel/Generator/Model/Diff/IndexComparator.php
  22. +1 −1  src/Propel/Generator/Model/Diff/TableComparator.php
  23. +1 −1  src/Propel/Generator/Model/MappingModelInterface.php
  24. +1 −1  src/Propel/Generator/Model/NameFactory.php
  25. +1 −1  src/Propel/Generator/Model/NameGenerator.php
  26. +12 −12 src/Propel/Generator/Model/PropelTypes.php
  27. +0 −1  src/Propel/Generator/Model/Table.php
  28. +0 −1  src/Propel/Generator/Model/VendorInfo.php
  29. +4 −5 src/Propel/Generator/Platform/MysqlPlatform.php
  30. +0 −1  src/Propel/Generator/Platform/OraclePlatform.php
  31. +0 −1  src/Propel/Generator/Platform/PgsqlPlatform.php
  32. +0 −1  src/Propel/Generator/Reverse/AbstractSchemaParser.php
  33. +0 −1  src/Propel/Generator/Reverse/MssqlSchemaParser.php
  34. +0 −1  src/Propel/Generator/Reverse/MysqlSchemaParser.php
  35. +6 −6 src/Propel/Generator/Reverse/SchemaParserInterface.php
  36. +0 −1  src/Propel/Generator/Reverse/SqliteSchemaParser.php
  37. +2 −2 src/Propel/Generator/Util/QuickBuilder.php
  38. +4 −4 src/Propel/Generator/Util/SqlParser.php
  39. +1 −1  src/Propel/Runtime/Adapter/AdapterFactory.php
  40. +27 −27 src/Propel/Runtime/Adapter/AdapterInterface.php
  41. +1 −1  src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
  42. +1 −1  src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php
  43. +1 −1  src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
  44. +1 −1  src/Propel/Runtime/Connection/ConnectionFactory.php
  45. +12 −12 src/Propel/Runtime/Connection/ConnectionInterface.php
  46. +5 −5 src/Propel/Runtime/Connection/ConnectionManagerInterface.php
  47. +0 −2  src/Propel/Runtime/Connection/ProfilerStatementWrapper.php
  48. +9 −9 src/Propel/Runtime/Connection/StatementInterface.php
  49. +1 −1  src/Propel/Runtime/Map/ColumnMap.php
  50. +1 −1  src/Propel/Runtime/Map/DatabaseMap.php
  51. +0 −1  src/Propel/Runtime/Map/TableMap.php
  52. +0 −1  src/Propel/Runtime/Om/Persistent.php
  53. +1 −1  src/Propel/Runtime/Parser/AbstractParser.php
  54. +0 −1  src/Propel/Runtime/Parser/XmlParser.php
  55. +18 −18 src/Propel/Runtime/Propel.php
  56. +0 −1  src/Propel/Runtime/Query/Criteria.php
  57. +3 −3 src/Propel/Runtime/Query/ModelCriteria.php
  58. +1 −1  src/Propel/Runtime/Query/ModelCriterion.php
  59. +1 −1  src/Propel/Runtime/Query/PropelQuery.php
  60. +11 −11 src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php
  61. +18 −18 src/Propel/Runtime/Util/BasePeer.php
  62. +4 −4 src/Propel/Runtime/Util/Profiler.php
  63. +1 −1  src/Propel/Runtime/Util/PropelColumnTypes.php
  64. +3 −3 src/Propel/Runtime/Util/PropelDateTime.php
  65. +1 −1  src/Propel/Runtime/Util/PropelModelPager.php
  66. +0 −1  src/Propel/Runtime/Validator/Constraints/Unique.php
  67. +5 −8 tests/Propel/Tests/Generator/Behavior/AlternativeCodingStandards/AlternativeCodingStandardsBehaviorTest.php
  68. +0 −1  tests/Propel/Tests/Generator/Behavior/Sortable/SortableBehaviorPeerBuilderModifierTest.php
  69. +0 −2  tests/Propel/Tests/Generator/Behavior/Validate/ValidateBehaviorTest.php
  70. +0 −1  tests/Propel/Tests/Generator/Builder/Om/AbstractOMBuilderRelatedByTest.php
  71. +0 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
  72. +2 −4 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
  73. +0 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
  74. +0 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php
  75. +0 −2  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php
  76. +0 −1  tests/Propel/Tests/Generator/Platform/DefaultPlatformTest.php
  77. +0 −1  tests/Propel/Tests/Generator/Platform/OraclePlatformTest.php
  78. +0 −1  tests/Propel/Tests/Generator/Platform/PlatformTestProvider.php
  79. +0 −1  tests/Propel/Tests/Generator/Reverse/PgsqlSchemaParserTest.php
  80. +0 −1  tests/Propel/Tests/Runtime/Adapter/Pdo/OracleAdapterTest.php
  81. +0 −1  tests/Propel/Tests/Runtime/Connection/ConnectionManagerMasterSlaveTest.php
  82. +0 −1  tests/Propel/Tests/Runtime/Formatter/ArrayFormatterTest.php
  83. +0 −1  tests/Propel/Tests/Runtime/Formatter/SimpleArrayFormatterTest.php
  84. +0 −1  tests/Propel/Tests/Runtime/Map/ColumnMapTest.php
  85. +0 −1  tests/Propel/Tests/Runtime/Om/BaseObjectConvertTest.php
  86. +0 −2  tests/Propel/Tests/Runtime/Query/ModelCriteriaSelectTest.php
  87. +0 −3  tests/Propel/Tests/Runtime/Query/ModelCriteriaTest.php
  88. +0 −1  tests/Propel/Tests/Runtime/Util/PropelConditionalProxyTest.php
  89. +0 −1  tests/Propel/Tests/Runtime/Util/PropelDateTimeTest.php
  90. +13 −12 tools/generator/pear/BuildPropelGenPEARPackageTask.php
  91. +13 −12 tools/runtime/pear/BuildPropelPEARPackageTask.php
2  features/bootstrap/FeatureContext.php
View
@@ -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)
{
2  src/Propel/Generator/Behavior/AlternativeCodingStandards/AlternativeCodingStandardsBehavior.php
View
@@ -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);
2  src/Propel/Generator/Behavior/Archivable/templates/objectPreDelete.php
View
@@ -14,4 +14,4 @@
$deleteQuery->setArchiveOnDelete(false);
$this->archiveOnDelete = true;
}
-<?php endif; ?>
+<?php endif;
1  src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php
View
@@ -535,7 +535,6 @@ public function setParent(\$parent = null)
";
}
-
protected function addGetParent(&$script)
{
$script .= "
3  src/Propel/Generator/Builder/Om/AbstractPeerBuilder.php
View
@@ -252,7 +252,6 @@ public function getRetrieveMethodName()
return $retrieveMethod;
}
-
/**
* COMPATIBILITY: Get the column constant name (e.g. PeerName::COLUMN_NAME).
*
@@ -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()) {
14 src/Propel/Generator/Builder/Om/ClassTools.php
View
@@ -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
@@ -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, '.'), '.', '/');
@@ -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;
@@ -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';
@@ -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';
@@ -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()) {
@@ -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__',
1  src/Propel/Generator/Builder/Om/ExtensionPeerBuilder.php
View
@@ -92,5 +92,4 @@ protected function addClassClose(&$script)
$this->applyBehaviorModifier('extensionPeerFilter', $script, "");
}
-
} // ExtensionPeerBuilder
4 src/Propel/Generator/Builder/Om/ObjectBuilder.php
View
@@ -751,7 +751,6 @@ protected function addApplyDefaultValuesBody(&$script)
}
}
-
/**
* Adds the function close for the applyDefaults method.
*
@@ -778,7 +777,6 @@ protected function addTemporalAccessor(&$script, Column $column)
$this->addTemporalAccessorClose($script);
}
-
/**
* Adds the comment for a temporal accessor.
*
@@ -916,7 +914,6 @@ protected function addTemporalAccessorBody(&$script, Column $column)
}";
}
-
/**
* Adds the body of the temporal accessor.
*
@@ -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.
66 src/Propel/Generator/Builder/Om/PeerBuilder.php
View
@@ -424,7 +424,7 @@ protected function addGetFieldNames(&$script)
* @return array A list of field names
*/
- static public function getFieldNames(\$type = BasePeer::TYPE_PHPNAME)
+ public static function getFieldNames(\$type = BasePeer::TYPE_PHPNAME)
{
if (!array_key_exists(\$type, self::\$fieldNames)) {
throw new PropelException('Method getFieldNames() expects the parameter \$type to be one of the class constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. ' . \$type . ' was given.');
@@ -449,7 +449,7 @@ protected function addTranslateFieldName(&$script)
* @return string translated name of the field.
* @throws PropelException - if the specified name could not be found in the fieldname mappings.
*/
- static public function translateFieldName(\$name, \$fromType, \$toType)
+ public static function translateFieldName(\$name, \$fromType, \$toType)
{
\$toNames = self::getFieldNames(\$toType);
\$key = isset(self::\$fieldKeys[\$fromType][\$name]) ? self::\$fieldKeys[\$fromType][\$name] : null;
@@ -473,7 +473,7 @@ protected function addGetValueSets(&$script)
* Gets the list of values for all ENUM columns
* @return array
*/
- static public function getValueSets()
+ public static function getValueSets()
{
return static::\$enumValueSets;
}
@@ -491,7 +491,7 @@ protected function addGetValueSet(&$script)
* Gets the list of values for an ENUM column
* @return array list of possible values for the column
*/
- static public function getValueSet(\$colname)
+ public static function getValueSet(\$colname)
{
\$valueSets = self::getValueSets();
@@ -511,7 +511,7 @@ protected function addBuildTableMap(&$script)
/**
* Add a TableMap instance to the database for this peer class.
*/
- static public function buildTableMap()
+ public static function buildTableMap()
{
\$dbMap = Propel::getServiceContainer()->getDatabaseMap(static::DATABASE_NAME);
if (!\$dbMap->hasTable(static::TABLE_NAME)) {
@@ -578,7 +578,7 @@ protected function addAlias(&$script)
* @param string \$column The column name for current table. (i.e. ".$this->getPeerClassName(true)."::COLUMN_NAME).
* @return string
*/
- static public function alias(\$alias, \$column)
+ public static function alias(\$alias, \$column)
{
return str_replace(static::TABLE_NAME.'.', \$alias.'.', \$column);
}
@@ -604,7 +604,7 @@ protected function addAddSelectColumns(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function addSelectColumns(Criteria \$criteria, \$alias = null)
+ public static function addSelectColumns(Criteria \$criteria, \$alias = null)
{
if (null === \$alias) {";
foreach ($this->getTable()->getColumns() as $col) {
@@ -643,7 +643,7 @@ protected function addDoCount(&$script)
* @param ConnectionInterface \$con
* @return int Number of matching rows.
*/
- static public function doCount(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null)
+ public static function doCount(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null)
{
// we may modify criteria, so copy it first
\$criteria = clone \$criteria;
@@ -702,7 +702,7 @@ protected function addDoSelectOne(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doSelectOne(Criteria \$criteria, ConnectionInterface \$con = null)
+ public static function doSelectOne(Criteria \$criteria, ConnectionInterface \$con = null)
{
\$critcopy = clone \$criteria;
\$critcopy->setLimit(1);
@@ -731,7 +731,7 @@ protected function addDoSelect(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doSelect(Criteria \$criteria, ConnectionInterface \$con = null)
+ public static function doSelect(Criteria \$criteria, ConnectionInterface \$con = null)
{
return static::populateObjects(static::doSelectStmt(\$criteria, \$con));
}";
@@ -757,7 +757,7 @@ protected function addDoSelectStmt(&$script)
* @return StatementInterface The executed Statement object.
* @see ".$this->basePeerClassName."::doSelect()
*/
- static public function doSelectStmt(Criteria \$criteria, ConnectionInterface \$con = null)
+ public static function doSelectStmt(Criteria \$criteria, ConnectionInterface \$con = null)
{
if (null === \$con) {
\$con = Propel::getServiceContainer()->getReadConnection(static::DATABASE_NAME);
@@ -823,7 +823,7 @@ protected function addAddInstanceToPool(&$script)
* @param ".$this->getObjectClassName()." \$value A ".$this->getObjectClassName()." object.
* @param string \$key (optional) key to use for instance map (for performance boost if key was already calculated externally).
*/
- static public function addInstanceToPool(\$obj, \$key = null)
+ public static function addInstanceToPool(\$obj, \$key = null)
{
if (Propel::isInstancePoolingEnabled()) {
if (null === \$key) {";
@@ -862,7 +862,7 @@ protected function addRemoveInstanceFromPool(&$script)
*
* @param mixed \$value A ".$this->getObjectClassName()." object or a primary key value.
*/
- static public function removeInstanceFromPool(\$value)
+ public static function removeInstanceFromPool(\$value)
{";
$script .= "
if (Propel::isInstancePoolingEnabled() && null !== \$value) {";
@@ -916,7 +916,7 @@ protected function addClearInstancePool(&$script)
*
* @return void
*/
- static public function clearInstancePool()
+ public static function clearInstancePool()
{
self::\$instances = array();
}
@@ -935,7 +935,7 @@ protected function addClearRelatedInstancePool(&$script)
* Method to invalidate the instance pool of all tables related to " . $table->getName() . "
* by a foreign key with ON DELETE CASCADE
*/
- static public function clearRelatedInstancePool()
+ public static function clearRelatedInstancePool()
{";
// Handle ON DELETE CASCADE for updating instance pool
foreach ($table->getReferrers() as $fk) {
@@ -981,7 +981,7 @@ protected function addGetInstanceFromPool(&$script)
* @return ".$this->getObjectClassName()." Found object or NULL if 1) no instance exists for specified key or 2) instance pooling has been disabled.
* @see getPrimaryKeyHash()
*/
- static public function getInstanceFromPool(\$key)
+ public static function getInstanceFromPool(\$key)
{
if (Propel::isInstancePoolingEnabled()) {
if (isset(self::\$instances[\$key])) {
@@ -1011,7 +1011,7 @@ protected function addGetPrimaryKeyHash(&$script)
* @param int \$startcol The 0-based offset for reading from the resultset row.
* @return string A string version of PK or NULL if the components of primary key in result array are all null.
*/
- static public function getPrimaryKeyHashFromRow(\$row, \$startcol = 0)
+ public static function getPrimaryKeyHashFromRow(\$row, \$startcol = 0)
{";
// We have to iterate through all the columns so that we know the offset of the primary
@@ -1057,7 +1057,7 @@ protected function addGetPrimaryKeyFromRow(&$script)
* @param int \$startcol The 0-based offset for reading from the resultset row.
* @return mixed The primary key of the row
*/
- static public function getPrimaryKeyFromRow(\$row, \$startcol = 0)
+ public static function getPrimaryKeyFromRow(\$row, \$startcol = 0)
{";
// We have to iterate through all the columns so that we
@@ -1107,7 +1107,7 @@ protected function addPopulateObjects(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function populateObjects(StatementInterface \$stmt)
+ public static function populateObjects(StatementInterface \$stmt)
{
\$results = array();
";
@@ -1171,7 +1171,7 @@ protected function addPopulateObject(&$script)
* rethrown wrapped into a PropelException.
* @return array (" . $this->getObjectClassName(). " object, last column rank)
*/
- static public function populateObject(\$row, \$startcol = 0)
+ public static function populateObject(\$row, \$startcol = 0)
{
\$key = static::getPrimaryKeyHashFromRow(\$row, \$startcol);
if (null !== (\$obj = static::getInstanceFromPool(\$key))) {
@@ -1225,7 +1225,7 @@ protected function addGetOMClass_Inheritance(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function getOMClass(\$row, \$colnum, \$withPrefix = true)
+ public static function getOMClass(\$row, \$colnum, \$withPrefix = true)
{
try {
";
@@ -1287,7 +1287,7 @@ protected function addGetOMClass_NoInheritance(&$script)
* @param boolean \$withPrefix Whether or not to return the path with the class name
* @return string path.to.ClassName
*/
- static public function getOMClass(\$withPrefix = true)
+ public static function getOMClass(\$withPrefix = true)
{
return \$withPrefix ? static::CLASS_DEFAULT : static::OM_CLASS;
}
@@ -1307,7 +1307,7 @@ protected function addGetOMClass_NoInheritance_Abstract(&$script)
* This method must be overridden by the stub subclass, because
* ".$this->getObjectClassName()." is declared abstract in the schema.
*/
- abstract static public function getOMClass(\$withPrefix = true);
+ abstract public static function getOMClass(\$withPrefix = true);
";
}
@@ -1328,7 +1328,7 @@ protected function addDoInsert(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doInsert(\$values, ConnectionInterface \$con = null)
+ public static function doInsert(\$values, ConnectionInterface \$con = null)
{
if (null === \$con) {
\$con = Propel::getServiceContainer()->getWriteConnection(static::DATABASE_NAME);
@@ -1410,7 +1410,7 @@ protected function addDoUpdate(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doUpdate(\$values, ConnectionInterface \$con = null)
+ public static function doUpdate(\$values, ConnectionInterface \$con = null)
{
if (null === \$con) {
\$con = Propel::getServiceContainer()->getWriteConnection(static::DATABASE_NAME);
@@ -1463,7 +1463,7 @@ protected function addDoDeleteAll(&$script)
* @param ConnectionInterface \$con the connection to use
* @return int The number of affected rows (if supported by underlying database driver).
*/
- static public function doDeleteAll(ConnectionInterface \$con = null)
+ public static function doDeleteAll(ConnectionInterface \$con = null)
{
if (null === \$con) {
\$con = Propel::getServiceContainer()->getWriteConnection(static::DATABASE_NAME);
@@ -1963,7 +1963,7 @@ protected function addGetTableMap(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function getTableMap()
+ public static function getTableMap()
{
return Propel::getServiceContainer()->getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);
}
@@ -2103,7 +2103,7 @@ protected function addDoSelectJoin(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doSelectJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$con = null, \$joinBehavior = $joinBehavior)
+ public static function doSelectJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$con = null, \$joinBehavior = $joinBehavior)
{
\$criteria = clone \$criteria;
@@ -2233,7 +2233,7 @@ protected function addDoCountJoin(&$script)
* @param String \$joinBehavior the type of joins to use, defaults to $joinBehavior
* @return int Number of matching rows.
*/
- static public function doCountJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null, \$joinBehavior = $joinBehavior)
+ public static function doCountJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null, \$joinBehavior = $joinBehavior)
{
// we're going to modify criteria, so copy it first
\$criteria = clone \$criteria;
@@ -2306,7 +2306,7 @@ protected function addDoSelectJoinAll(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doSelectJoinAll(Criteria \$criteria, \$con = null, \$joinBehavior = $joinBehavior)
+ public static function doSelectJoinAll(Criteria \$criteria, \$con = null, \$joinBehavior = $joinBehavior)
{
\$criteria = clone \$criteria;
@@ -2472,7 +2472,7 @@ protected function addDoCountJoinAll(&$script)
* @param String \$joinBehavior the type of joins to use, defaults to $joinBehavior
* @return int Number of matching rows.
*/
- static public function doCountJoinAll(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null, \$joinBehavior = $joinBehavior)
+ public static function doCountJoinAll(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null, \$joinBehavior = $joinBehavior)
{
// we're going to modify criteria, so copy it first
\$criteria = clone \$criteria;
@@ -2564,7 +2564,7 @@ protected function addDoSelectJoinAllExcept(&$script)
* @throws PropelException Any exceptions caught during processing will be
* rethrown wrapped into a PropelException.
*/
- static public function doSelectJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$con = null, \$joinBehavior = $joinBehavior)
+ public static function doSelectJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$con = null, \$joinBehavior = $joinBehavior)
{
\$criteria = clone \$criteria;
@@ -2743,7 +2743,7 @@ protected function addDoCountJoinAllExcept(&$script)
* @param String \$joinBehavior the type of joins to use, defaults to $joinBehavior
* @return int Number of matching rows.
*/
- static public function doCountJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null, \$joinBehavior = $joinBehavior)
+ public static function doCountJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, false)."(Criteria \$criteria, \$distinct = false, ConnectionInterface \$con = null, \$joinBehavior = $joinBehavior)
{
// we're going to modify criteria, so copy it first
\$criteria = clone \$criteria;
2  src/Propel/Generator/Builder/Om/QueryBuilder.php
View
@@ -321,7 +321,7 @@ protected function addFactoryComment(&$script)
protected function addFactoryOpen(&$script)
{
$script .= "
- static public function create(\$modelAlias = null, \$criteria = null)
+ public static function create(\$modelAlias = null, \$criteria = null)
{";
}
2  src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
View
@@ -190,7 +190,7 @@ protected function addFactory(&$script)
*
* @return " . $classname . "
*/
- static public function create(\$modelAlias = null, \$criteria = null)
+ public static function create(\$modelAlias = null, \$criteria = null)
{
if (\$criteria instanceof " . $classname . ") {
return \$criteria;
6 src/Propel/Generator/Builder/Sql/DataSQLBuilder.php
View
@@ -26,7 +26,7 @@
*
* This can be used, for example, to clear any stored start/end SQL.
*/
- static public function reset()
+ public static function reset()
{
// does nothing by default
}
@@ -36,7 +36,7 @@ static public function reset()
*
* @return string
*/
- static public function getDatabaseStartSql()
+ public static function getDatabaseStartSql()
{
return '';
}
@@ -46,7 +46,7 @@ static public function getDatabaseStartSql()
*
* @return string
*/
- static public function getDatabaseEndSql()
+ public static function getDatabaseEndSql()
{
return '';
}
2  src/Propel/Generator/Builder/Sql/Pgsql/PgsqlDataSQLBuilder.php
View
@@ -59,7 +59,7 @@ public function getTableEndSql()
$sql = '';
if ($table->hasAutoIncrementPrimaryKey() && $table->getIdMethod() == IdMethod::NATIVE) {
$seqname = $this->getPlatform()->getSequenceName($table);
- $sql .= "SELECT pg_catalog.setval('$seqname', ".((int)$this->maxSeqVal).");
+ $sql .= "SELECT pg_catalog.setval('$seqname', ".((int) $this->maxSeqVal).");
";
}
10 src/Propel/Generator/Config/GeneratorConfigInterface.php
View
@@ -22,14 +22,14 @@
* @param string $type
* @return DataModelBuilder
*/
- function getConfiguredBuilder(Table $table, $type);
+ public function getConfiguredBuilder(Table $table, $type);
/**
* Returns a configured Pluralizer class.
*
* @return PluralizerInterface
*/
- function getConfiguredPluralizer();
+ public function getConfiguredPluralizer();
/**
* Returns a specific propel (renamed) property from the build.
@@ -37,7 +37,7 @@ function getConfiguredPluralizer();
* @param string $name
* @return mixed
*/
- function getBuildProperty($name);
+ public function getBuildProperty($name);
/**
* Sets a specific propel (renamed) property from the build.
@@ -45,7 +45,7 @@ function getBuildProperty($name);
* @param string $name
* @param mixed $value
*/
- function setBuildProperty($name, $value);
+ public function setBuildProperty($name, $value);
/**
* Creates and configures a new Platform class.
@@ -53,5 +53,5 @@ function setBuildProperty($name, $value);
* @param \PDO $con
* @return PlatformInterface
*/
- function getConfiguredPlatform(\PDO $con = null, $database = null);
+ public function getConfiguredPlatform(\PDO $con = null, $database = null);
}
6 src/Propel/Generator/Manager/MigrationManager.php
View
@@ -266,7 +266,7 @@ public function getFirstDownMigrationTimestamp()
return $this->getOldestDatabaseVersion();
}
- static public function getMigrationClassName($timestamp)
+ public static function getMigrationClassName($timestamp)
{
return sprintf('PropelMigration_%d', $timestamp);
}
@@ -348,12 +348,12 @@ public function getDownSQL()
return $migrationClassBody;
}
- static public function getMigrationFileName($timestamp)
+ public static function getMigrationFileName($timestamp)
{
return sprintf('%s.php', self::getMigrationClassName($timestamp));
}
- static public function getUser()
+ public static function getUser()
{
if (function_exists('posix_getuid')) {
$currentUser = posix_getpwuid(posix_getuid());
4 src/Propel/Generator/Model/Column.php
View
@@ -30,7 +30,7 @@ class Column extends MappingModel
const DEFAULT_TYPE = 'VARCHAR';
const DEFAULT_VISIBILITY = 'public';
- static public $validVisibilities = array('public', 'protected', 'private');
+ public static $validVisibilities = array('public', 'protected', 'private');
private $name;
private $description;
@@ -1420,7 +1420,7 @@ public function __clone()
* @param string $namePrefix
* @return string
*/
- static public function generatePhpName($name, $phpNamingMethod = PhpNameGenerator::CONV_METHOD_CLEAN, $namePrefix = null)
+ public static function generatePhpName($name, $phpNamingMethod = PhpNameGenerator::CONV_METHOD_CLEAN, $namePrefix = null)
{
return NameFactory::generateName(NameFactory::PHP_GENERATOR, array($name, $phpNamingMethod, $namePrefix));
}
3  src/Propel/Generator/Model/Database.php
View
@@ -221,7 +221,7 @@ public function setDefaultPhpNamingMethod($strategy)
*
* @return array
*/
- static public function getSupportedStringFormats()
+ public static function getSupportedStringFormats()
{
return array('XML', 'YAML', 'JSON', 'CSV');
}
@@ -646,7 +646,6 @@ public function getNextTableBehavior()
$nextBehavior = $behaviors[key($behaviors)][0];
}
-
return $nextBehavior;
}
4 src/Propel/Generator/Model/Diff/ColumnComparator.php
View
@@ -26,7 +26,7 @@ class ColumnComparator
* @param Column $toColumn
* @return ColumnDiff|boolean return false if the two columns are similar
*/
- static public function computeDiff(Column $fromColumn, Column $toColumn)
+ public static function computeDiff(Column $fromColumn, Column $toColumn)
{
if ($changedProperties = self::compareColumns($fromColumn, $toColumn)) {
if ($fromColumn->hasPlatform() || $toColumn->hasPlatform()) {
@@ -46,7 +46,7 @@ static public function computeDiff(Column $fromColumn, Column $toColumn)
return false;
}
- static function compareColumns(Column $fromColumn, Column $toColumn)
+ public static function compareColumns(Column $fromColumn, Column $toColumn)
{
$changedProperties = array();
2  src/Propel/Generator/Model/Diff/DatabaseComparator.php
View
@@ -81,7 +81,7 @@ public function getToDatabase()
* @param Boolean $caseInsensitive
* @return DatabaseDiff|Boolean
*/
- static public function computeDiff(Database $fromDatabase, Database $toDatabase, $caseInsensitive = false)
+ public static function computeDiff(Database $fromDatabase, Database $toDatabase, $caseInsensitive = false)
{
$dc = new self();
$dc->setFromDatabase($fromDatabase);
2  src/Propel/Generator/Model/Diff/ForeignKeyComparator.php
View
@@ -31,7 +31,7 @@ class ForeignKeyComparator
*
* @return Boolean false if the two fks are similar, true if they have differences
*/
- static public function computeDiff(ForeignKey $fromFk, ForeignKey $toFk, $caseInsensitive = false)
+ public static function computeDiff(ForeignKey $fromFk, ForeignKey $toFk, $caseInsensitive = false)
{
// Check for differences in local and remote table
$test = $caseInsensitive ?
2  src/Propel/Generator/Model/Diff/IndexComparator.php
View
@@ -27,7 +27,7 @@ class IndexComparator
* @param Boolean $caseInsensitive
* @return Boolean
*/
- static public function computeDiff(Index $fromIndex, Index $toIndex, $caseInsensitive = false)
+ public static function computeDiff(Index $fromIndex, Index $toIndex, $caseInsensitive = false)
{
// Check for removed index columns in $toIndex
$fromIndexColumns = $fromIndex->getColumns();
2  src/Propel/Generator/Model/Diff/TableComparator.php
View
@@ -79,7 +79,7 @@ public function getToTable()
* @param Boolean $caseInsensitive
* @return TableDiff|Boolean
*/
- static public function computeDiff(Table $fromTable, Table $toTable, $caseInsensitive = false)
+ public static function computeDiff(Table $fromTable, Table $toTable, $caseInsensitive = false)
{
$tc = new self();
$tc->setFromTable($fromTable);
2  src/Propel/Generator/Model/MappingModelInterface.php
View
@@ -22,5 +22,5 @@
*
* @param array $attributes
*/
- function loadMapping(array $attributes);
+ public function loadMapping(array $attributes);
}
2  src/Propel/Generator/Model/NameFactory.php
View
@@ -62,7 +62,7 @@ protected static function getAlgorithm($name)
* @return The generated name.
* @throws EngineException
*/
- static public function generateName($algorithmName, $inputs)
+ public static function generateName($algorithmName, $inputs)
{
$algorithm = self::getAlgorithm($algorithmName);
2  src/Propel/Generator/Model/NameGenerator.php
View
@@ -68,5 +68,5 @@
* @return The generated name.
* @throws EngineException
*/
- function generateName($inputs);
+ public function generateName($inputs);
}
24 src/Propel/Generator/Model/PropelTypes.php
View
@@ -209,7 +209,7 @@ class PropelTypes
* @param string $mappingType
* @return string
*/
- static public function getPhpNative($mappingType)
+ public static function getPhpNative($mappingType)
{
return self::$mappingToPHPNativeMap[$mappingType];
}
@@ -219,7 +219,7 @@ static public function getPhpNative($mappingType)
*
* @return integer
*/
- static public function getPDOType($type)
+ public static function getPDOType($type)
{
return self::$mappingTypeToPDOTypeMap[$type];
}
@@ -229,7 +229,7 @@ static public function getPDOType($type)
*
* @return string
*/
- static public function getPdoTypeString($type)
+ public static function getPdoTypeString($type)
{
return self::$pdoTypeNames[self::$mappingTypeToPDOTypeMap[$type]];
}
@@ -239,7 +239,7 @@ static public function getPdoTypeString($type)
*
* @return array
*/
- static public function getPropelTypes()
+ public static function getPropelTypes()
{
return self::$mappingTypes;
}
@@ -250,7 +250,7 @@ static public function getPropelTypes()
* @param string $mappingType
* @return Boolean
*/
- static public function isTemporalType($type)
+ public static function isTemporalType($type)
{
return in_array($type, array(
self::DATE,
@@ -267,7 +267,7 @@ static public function isTemporalType($type)
* @param string $mappingType
* @return Boolean
*/
- static public function isTextType($mappingType)
+ public static function isTextType($mappingType)
{
return in_array($mappingType, array(
self::CHAR,
@@ -288,7 +288,7 @@ static public function isTextType($mappingType)
* @param string $mappingType
* @return Boolean
*/
- static public function isNumericType($mappingType)
+ public static function isNumericType($mappingType)
{
return in_array($mappingType, array(
self::SMALLINT,
@@ -309,7 +309,7 @@ static public function isNumericType($mappingType)
* @param string $mappingType
* @return Boolean
*/
- static public function isBooleanType($mappingType)
+ public static function isBooleanType($mappingType)
{
return in_array($mappingType, array(
self::BOOLEAN,
@@ -323,7 +323,7 @@ static public function isBooleanType($mappingType)
* @param string $mappingType
* @return Boolean
*/
- static public function isLobType($mappingType)
+ public static function isLobType($mappingType)
{
return in_array($mappingType, array(
self::VARBINARY,
@@ -338,7 +338,7 @@ static public function isLobType($mappingType)
* @param string $phpType
* @return Boolean
*/
- static public function isPhpPrimitiveType($phpType)
+ public static function isPhpPrimitiveType($phpType)
{
return in_array($phpType, array('boolean', 'int', 'double', 'float', 'string'));
}
@@ -349,7 +349,7 @@ static public function isPhpPrimitiveType($phpType)
* @param string $phpType
* @return Boolean
*/
- static public function isPhpPrimitiveNumericType($phpType)
+ public static function isPhpPrimitiveNumericType($phpType)
{
return in_array($phpType, array('boolean', 'int', 'double', 'float'));
}
@@ -360,7 +360,7 @@ static public function isPhpPrimitiveNumericType($phpType)
* @param string $phpType
* @return Boolean
*/
- static public function isPhpObjectType($phpType)
+ public static function isPhpObjectType($phpType)
{
return !self::isPhpPrimitiveType($phpType) && !in_array($phpType, array('resource', 'array'));
}
1  src/Propel/Generator/Model/Table.php
View
@@ -130,7 +130,6 @@ public function setupObject()
$this->idMethod = $this->getAttribute('idMethod', $this->database->getDefaultIdMethod());
$this->allowPkInsert = $this->booleanValue($this->getAttribute('allowPkInsert'));
-
$this->skipSql = $this->booleanValue($this->getAttribute('skipSql'));
$this->readOnly = $this->booleanValue($this->getAttribute('readOnly'));
1  src/Propel/Generator/Model/VendorInfo.php
View
@@ -10,7 +10,6 @@
namespace Propel\Generator\Model;
-
/**
* Object to hold vendor specific information.
*
9 src/Propel/Generator/Platform/MysqlPlatform.php
View
@@ -75,7 +75,7 @@ public function setGeneratorConfig(GeneratorConfigInterface $generatorConfig)
*
* @param string $tableEngineKeyword
*/
- function setTableEngineKeyword($tableEngineKeyword)
+ public function setTableEngineKeyword($tableEngineKeyword)
{
$this->tableEngineKeyword = $tableEngineKeyword;
}
@@ -85,7 +85,7 @@ function setTableEngineKeyword($tableEngineKeyword)
*
* @return string
*/
- function getTableEngineKeyword()
+ public function getTableEngineKeyword()
{
return $this->tableEngineKeyword;
}
@@ -95,7 +95,7 @@ function getTableEngineKeyword()
*
* @param string $defaultTableEngine
*/
- function setDefaultTableEngine($defaultTableEngine)
+ public function setDefaultTableEngine($defaultTableEngine)
{
$this->defaultTableEngine = $defaultTableEngine;
}
@@ -105,7 +105,7 @@ function setDefaultTableEngine($defaultTableEngine)
*
* @return string
*/
- function getDefaultTableEngine()
+ public function getDefaultTableEngine()
{
return $this->defaultTableEngine;
}
@@ -594,7 +594,6 @@ public function getModifyColumnsDDL($columnDiffs)
return $ret;
}
-
/**
* @see Platform::supportsSchemas()
*/
1  src/Propel/Generator/Platform/OraclePlatform.php
View
@@ -231,7 +231,6 @@ 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
1  src/Propel/Generator/Platform/PgsqlPlatform.php
View
@@ -183,7 +183,6 @@ public function getAddSchemaDDL(Table $table)
};
}
-
public function getUseSchemaDDL(Table $table)
{
$vi = $table->getVendorInfoForType('pgsql');
1  src/Propel/Generator/Reverse/AbstractSchemaParser.php
View
@@ -112,7 +112,6 @@ public function getMigrationTable()
return $this->migrationTable;
}
-
/**
* Pushes a message onto the stack of warnings.
*
1  src/Propel/Generator/Reverse/MssqlSchemaParser.php
View
@@ -236,7 +236,6 @@ protected function addPrimaryKey(Table $table)
}
}
-
/**
* according to the identifier definition, we have to clean simple quote (') around the identifier name
* returns by mssql
1  src/Propel/Generator/Reverse/MysqlSchemaParser.php
View
@@ -130,7 +130,6 @@ public function parse(Database $database)
return count($tables);
}
-
/**
* Adds Columns to the specified table.
*
12 src/Propel/Generator/Reverse/SchemaParserInterface.php
View
@@ -25,21 +25,21 @@
* Gets the database connection.
* @return ConnectionInterface
*/
- function getConnection();
+ public function getConnection();
/**
* Sets the database connection.
*
* @param ConnectionInterface $dbh
*/
- function setConnection(ConnectionInterface $dbh);
+ public function setConnection(ConnectionInterface $dbh);
/**
* Sets the GeneratorConfig to use in the parsing.
*
* @param GeneratorConfigInterface $config
*/
- function setGeneratorConfig(GeneratorConfigInterface $config);
+ public function setGeneratorConfig(GeneratorConfigInterface $config);
/**
* Gets a specific propel (renamed) property from the build.
@@ -47,13 +47,13 @@ function setGeneratorConfig(GeneratorConfigInterface $config);
* @param string $name
* @return mixed
*/
- function getBuildProperty($name);
+ public function getBuildProperty($name);
/**
* Gets array of warning messages.
* @return array string[]
*/
- function getWarnings();
+ public function getWarnings();
/**
* Parse the schema and populate passed-in Database model object.
@@ -61,5 +61,5 @@ function getWarnings();
* @param Database $database
* @return int number of generated tables
*/
- function parse(Database $database);
+ public function parse(Database $database);
}
1  src/Propel/Generator/Reverse/SqliteSchemaParser.php
View
@@ -107,7 +107,6 @@ public function parse(Database $database)
return count($tables);
}
-
/**
* Adds Columns to the specified table.
*
4 src/Propel/Generator/Util/QuickBuilder.php
View
@@ -81,7 +81,7 @@ public function getConfig()
return $this->config;
}
- static public function buildSchema($schema, $dsn = null, $user = null, $pass = null, $adapter = null)
+ public static function buildSchema($schema, $dsn = null, $user = null, $pass = null, $adapter = null)
{
$builder = new self;
$builder->setSchema($schema);
@@ -213,7 +213,7 @@ public function getClassesForTable(Table $table, array $classTargets = null)
return $script;
}
- static public function debugClassesForTable($schema, $tableName)
+ public static function debugClassesForTable($schema, $tableName)
{
$builder = new self;
$builder->setSchema($schema);
8 src/Propel/Generator/Util/SqlParser.php
View
@@ -55,7 +55,7 @@ public function getSQL()
*
* @return integer the number of executed statements
*/
- static public function executeString($input, $connection)
+ public static function executeString($input, $connection)
{
return self::executeStatements(self::parseString($input), $connection);
}
@@ -69,7 +69,7 @@ static public function executeString($input, $connection)
*
* @return integer the number of executed statements
*/
- static public function executeFile($file, $connection)
+ public static function executeFile($file, $connection)
{
return self::executeStatements(self::parseFile($file), $connection);
}
@@ -121,7 +121,7 @@ protected static function executeStatements($statements, $connection)
*
* @return array A list of SQL statement strings
*/
- static public function parseString($input)
+ public static function parseString($input)
{
$parser = new self();
$parser->setSQL($input);
@@ -150,7 +150,7 @@ static public function parseString($input)
*
* @return array A list of SQL statement strings
*/
- static public function parseFile($file)
+ public static function parseFile($file)
{
if (!file_exists($file)) {
return array();
2  src/Propel/Runtime/Adapter/AdapterFactory.php
View
@@ -27,7 +27,7 @@ class AdapterFactory
* @throws \Propel\Runtime\Exception\InvalidArgumentException If the adapter could not be instantiated.
* @return \Propel\Runtime\Adapter\AdapterInterface An instance of a Propel database adapter.
*/
- static public function create($driver)
+ public static function create($driver)
{
if (!$driver) {
$adapterClass = '\Propel\Runtime\Adapter\NoneAdapter';
54 src/Propel/Runtime/Adapter/AdapterInterface.php
View
@@ -33,7 +33,7 @@
*
* @return Propel\Runtime\Connection\ConnectionInterface
*/
- function getConnection($conparams);
+ public function getConnection($conparams);
/**
* Sets the character encoding using SQL standard SET NAMES statement.
@@ -46,7 +46,7 @@ function getConnection($conparams);
* @param Propel\Runtime\Connection\ConnectionInterface $con
* @param string $charset The $string charset encoding.
*/
- function setCharset(ConnectionInterface $con, $charset);
+ public function setCharset(ConnectionInterface $con, $charset);
/**
* This method is used to ignore case.
@@ -54,7 +54,7 @@ function setCharset(ConnectionInterface $con, $charset);
* @param string $in The string to transform to upper case.
* @return string The upper case string.
*/
- function toUpperCase($in);
+ public function toUpperCase($in);
/**
* This method is used to ignore case.
@@ -62,7 +62,7 @@ function toUpperCase($in);
* @param string $in The string whose case to ignore.
* @return string The string in a case that can be ignored.
*/
- function ignoreCase($in);
+ public function ignoreCase($in);
/**
* This method is used to ignore case in an ORDER BY clause.
@@ -73,7 +73,7 @@ function ignoreCase($in);
* @param string $in The string whose case to ignore.
* @return string The string in a case that can be ignored.
*/
- function ignoreCaseInOrderBy($in);
+ public function ignoreCaseInOrderBy($in);
/**
* Returns the character used to indicate the beginning and end of
@@ -82,7 +82,7 @@ function ignoreCaseInOrderBy($in);
*
* @return string The text delimeter.
*/
- function getStringDelimiter();
+ public function getStringDelimiter();
/**
* Returns SQL which concatenates the second string to the first.
@@ -92,7 +92,7 @@ function getStringDelimiter();
*
* @return string
*/
- function concatString($s1, $s2);
+ public function concatString($s1, $s2);
/**
* Returns SQL which extracts a substring.
@@ -103,7 +103,7 @@ function concatString($s1, $s2);
*
* @return string
*/
- function subString($s, $pos, $len);
+ public function subString($s, $pos, $len);
/**
* Returns SQL which calculates the length (in chars) of a string.
@@ -111,14 +111,14 @@ function subString($s, $pos, $len);
* @param string $s String to calculate length of.
* @return string
*/
- function strLength($s);
+ public function strLength($s);
/**
* Quotes database objec identifiers (table names, col names, sequences, etc.).
* @param string $text The identifier to quote.
* @return string The quoted identifier.
*/
- function quoteIdentifier($text);
+ public function quoteIdentifier($text);
/**
* Quotes a database table which could have space seperating it from an alias,
@@ -129,21 +129,21 @@ function quoteIdentifier($text);
* @param string $table The table name to quo
* @return string The quoted table name
**/
- function quoteIdentifierTable($table);
+ public function quoteIdentifierTable($table);
/**
* Whether this adapter uses an ID generation system that requires getting ID _before_ performing INSERT.
*
* @return Boolean
*/
- function isGetIdBeforeInsert();
+ public function isGetIdBeforeInsert();
/**
* Whether this adapter uses an ID generation system that requires getting ID _before_ performing INSERT.
*
* @return Boolean
*/
- function isGetIdAfterInsert();
+ public function isGetIdAfterInsert();
/**
* Gets the generated ID (either last ID for autoincrement or next sequence ID).
@@ -153,7 +153,7 @@ function isGetIdAfterInsert();
*
* @return mixed
*/
- function getId(ConnectionInterface $con, $name = null);
+ public function getId(ConnectionInterface $con, $name = null);
/**
* Formats a temporal value before binding, given a ColumnMap object
@@ -163,28 +163,28 @@ function getId(ConnectionInterface $con, $name = null);
*
* @return string The formatted temporal value
*/
- function formatTemporalValue($value, ColumnMap $cMap);
+ public function formatTemporalValue($value, ColumnMap $cMap);
/**
* Returns timestamp formatter string for use in date() function.
*
* @return string
*/
- function getTimestampFormatter();
+ public function getTimestampFormatter();
/**
* Returns date formatter string for use in date() function.
*
* @return string
*/
- function getDateFormatter();
+ public function getDateFormatter();
/**
* Returns time formatter string for use in date() function.
*
* @return string
*/
- function getTimeFormatter();
+ public function getTimeFormatter();
/**
* Should Column-Names get identifiers for inserts or updates.
@@ -197,7 +197,7 @@ function getTimeFormatter();
*
* @return Boolean
*/
- function useQuoteIdentifier();
+ public function useQuoteIdentifier();
/**
* Allows manipulation of the query string before StatementPdo is instantiated.
@@ -207,7 +207,7 @@ function useQuoteIdentifier();
* @param Propel\Runtime\Map\Criteria $values
* @param Propel\Runtime\Map\DatabaseMap $dbMap
*/
- function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap $dbMap);
+ public function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap $dbMap);
/**
* Modifies the passed-in SQL to add LIMIT and/or OFFSET.
@@ -216,14 +216,14 @@ function cleanupSQL(&$sql, array &$params, Criteria $values, DatabaseMap $dbMap)
* @param integer $offset
* @param integer $limit
*/
- function applyLimit(&$sql, $offset, $limit);
+ public function applyLimit(&$sql, $offset, $limit);
/**
* Gets the SQL string that this adapter uses for getting a random number.
*
* @param mixed $seed (optional) seed value for databases that support this
*/
- function random($seed = null);
+ public function random($seed = null);
/**
* Returns the "DELETE FROM <table> [AS <alias>]" part of DELETE query.
@@ -233,7 +233,7 @@ function random($seed = null);
*
* @return string
*/
- function getDeleteFromClause(Criteria $criteria, $tableName);
+ public function getDeleteFromClause(Criteria $criteria, $tableName);
/**
* Builds the SELECT part of a SQL statement based on a Criteria
@@ -246,7 +246,7 @@ function getDeleteFromClause(Criteria $criteria, $tableName);
*
* @return string
*/
- function createSelectSqlPart(Criteria $criteria, &$fromClause, $aliasAll = false);
+ public function createSelectSqlPart(Criteria $criteria, &$fromClause, $aliasAll = false);
/**
* Ensures uniqueness of select column names by turning them all into aliases
@@ -258,7 +258,7 @@ function createSelectSqlPart(Criteria $criteria, &$fromClause, $aliasAll = false
* @param Propel\Runtime\Map\Criteria $criteria
* @return Propel\Runtime\Map\Criteria The input, with Select columns replaced by aliases
*/
- function turnSelectColumnsToAliases(Criteria $criteria);
+ public function turnSelectColumnsToAliases(Criteria $criteria);
/**
* Binds values in a prepared statement.
@@ -280,7 +280,7 @@ function turnSelectColumnsToAliases(Criteria $criteria);
* @param array $params array('column' => ..., 'table' => ..., 'value' => ...)
* @param Propel\Runtime\Map\DatabaseMap $dbMap
*/
- function bindValues(StatementInterface $stmt, array $params, DatabaseMap $dbMap);
+ public function bindValues(StatementInterface $stmt, array $params, DatabaseMap $dbMap);
/**
* Binds a value to a positioned parameted in a statement,
@@ -294,5 +294,5 @@ function bindValues(StatementInterface $stmt, array $params, DatabaseMap $dbMap)
*
* @return Boolean
*/
- function bindValue(StatementInterface $stmt, $parameter, $value, ColumnMap $cMap, $position = null);
+ public function bindValue(StatementInterface $stmt, $parameter, $value, ColumnMap $cMap, $position = null);
}
2  src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
View
@@ -106,7 +106,7 @@ public function quoteIdentifierTable($table)
*/
public function random($seed = null)
{
- return 'RAND(' . ((int)$seed) . ')';
+ return 'RAND(' . ((int) $seed) . ')';
}
/**
2  src/Propel/Runtime/Adapter/Pdo/OracleAdapter.php
View
@@ -46,7 +46,7 @@ public function initConnection(ConnectionInterface $con, array $settings)
$con->exec("ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS'");
if (isset($settings['queries']) && is_array($settings['queries'])) {
foreach ($settings['queries'] as $queries) {
- foreach ((array)$queries as $query) {
+ foreach ((array) $queries as $query) {
$con->exec($query);
}
}
2  src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
View
@@ -106,7 +106,7 @@ public function initConnection(ConnectionInterface $con, array $settings)
if (isset($settings['queries']) && is_array($settings['queries'])) {
foreach ($settings['queries'] as $queries) {
- foreach ((array)$queries as $query) {
+ foreach ((array) $queries as $query) {
$con->exec($query);
}
}
2  src/Propel/Runtime/Connection/ConnectionFactory.php
View
@@ -28,7 +28,7 @@ class ConnectionFactory
*
* @return \Propel\Runtime\Connection\ConnectionInterface
*/
- static public function create($configuration, AdapterInterface $adapter, $defaultConnectionClass = self::DEFAULT_CONNECTION_CLASS)
+ public static function create($configuration, AdapterInterface $adapter, $defaultConnectionClass = self::DEFAULT_CONNECTION_CLASS)
{
if (isset($configuration['classname'])) {
$connectionClass = $configuration['classname'];
24 src/Propel/Runtime/Connection/ConnectionInterface.php
View
@@ -22,12 +22,12 @@
/**
* @param string $name The datasource name associated to this connection
*/
- function setName($name);
+ public function setName($name);
/**
* @return string The datasource name associated to this connection
*/
- function getName();
+ public function getName();
/**
* Turns off autocommit mode.
@@ -40,7 +40,7 @@ function getName();
*
* @return Boolean TRUE on success or FALSE on failure.
*/
- function beginTransaction();
+ public function beginTransaction();
/**
* Commits a transaction.
@@ -50,7 +50,7 @@ function beginTransaction();
*
* @return Boolean TRUE on success or FALSE on failure.
*/
- function commit();
+ public function commit();
/**
* Rolls back a transaction.
@@ -62,7 +62,7 @@ function commit();
*
* @return Boolean TRUE on success or FALSE on failure.
*/
- function rollBack();
+ public function rollBack();
/**
* Retrieve a database connection attribute.
@@ -73,7 +73,7 @@ function rollBack();
* @return mixed A successful call returns the value of the requested attribute.
* An unsuccessful call returns null.
*/
- function getAttribute($attribute);
+ public function getAttribute($attribute);
/**
* Set an attribute.
@@ -83,7 +83,7 @@ function getAttribute($attribute);
*
* @return Boolean TRUE on success or FALSE on failure.
*/
- function setAttribute($attribute, $value);
+ public function setAttribute($attribute, $value);
/**
* Execute an SQL statement and return the number of affected rows.
@@ -94,7 +94,7 @@ function setAttribute($attribute, $value);
* @return int The number of rows that were modified or deleted by the SQL
* statement you issued. If no rows were affected, returns 0.
*/
- function exec($statement);
+ public function exec($statement);
/**
* Prepares a statement for execution and returns a statement object.
@@ -115,7 +115,7 @@ function exec($statement);
* successfully prepares, FALSE otherwise.
* @throws \Propel\Runtime\Connection\ConnectionException depending on error handling.
*/
- function prepare($statement, $driver_options = array());
+ public function prepare($statement, $driver_options = array());
/**
* Executes an SQL statement, returning a result set as a Statement object.
@@ -127,7 +127,7 @@ function prepare($statement, $driver_options = array());
* successfully prepares, FALSE otherwise.
* @throws \Propel\Runtime\Connection\ConnectionException depending on error handling.
*/
- function query();
+ public function query();
/**
* Quotes a string for use in a query.
@@ -144,7 +144,7 @@ function query();
* SQL statement. Returns FALSE if the driver does not support
* quoting in this way.
*/
- function quote($string, $parameter_type = 2);
+ public function quote($string, $parameter_type = 2);
/**
* Returns the ID of the last inserted row or sequence value.
@@ -163,5 +163,5 @@ function quote($string, $parameter_type = 2);
* a string representing the last value retrieved from the specified
* sequence object.
*/
- function lastInsertId($name = null);
+ public function lastInsertId($name = null);
}
10 src/Propel/Runtime/Connection/ConnectionManagerInterface.php
View
@@ -17,26 +17,26 @@
/**
* @param string $name The datasource name associated to this connection
*/
- function setName($name);
+ public function setName($name);
/**
* @return string The datasource name associated to this connection
*/
- function getName();
+ public function getName();
/**
* @param \Propel\Runtime\Adapter\AdapterInterface $adapter
*
* @return \Propel\Runtime\Connection\ConnectionInterface
*/
- function getWriteConnection(AdapterInterface $adapter = null);
+ public function getWriteConnection(AdapterInterface $adapter = null);
/**
* @param \Propel\Runtime\Adapter\AdapterInterface $adapter
*
* @return \Propel\Runtime\Connection\ConnectionInterface
*/
- function getReadConnection(AdapterInterface $adapter = null);
+ public function getReadConnection(AdapterInterface $adapter = null);
- function closeConnections();
+ public function closeConnections();
}
2  src/Propel/Runtime/Connection/ProfilerStatementWrapper.php
View
@@ -10,7 +10,6 @@
namespace Propel\Runtime\Connection;
-
/**
* Statement class with profiling abilities.
*/
@@ -54,7 +53,6 @@ public function bindValue($pos, $value, $type = \PDO::PARAM_STR)
return parent::bindValue($pos, $value, $type);
}
-
/**
* Executes a prepared statement. Returns a boolean value indicating success.
* Overridden for query counting and logging.
18 src/Propel/Runtime/Connection/StatementInterface.php
View
@@ -43,7 +43,7 @@
* PDO::PARAM_INPUT_OUTPUT bits for the data_type parameter.
* @return Boolean Returns TRUE on success or FALSE on failure.
*/
- function bindParam($column, &$variable, $type = null);
+ public function bindParam($column, &$variable, $type = null);
/**
* Binds a value to a parameter.
@@ -60,7 +60,7 @@ function bindParam($column, &$variable, $type = null);
*
* @return Boolean Returns TRUE on success or FALSE on failure.
*/
- function bindValue($param, $value, $type = null);
+ public function bindValue($param, $value, $type = null);
/**
* Closes the cursor, enabling the statement to be executed again.
@@ -76,7 +76,7 @@ function bindValue($param, $value, $type = null);
*
* @return Boolean Returns TRUE on success or FALSE on failure.
*/
- function closeCursor();
+ public function closeCursor();
/**
* Returns the number of columns in the result set.
@@ -95,7 +95,7 @@ function closeCursor();
* by the PDOStatement object. If there is no result set,
* this method should return 0.
*/
- function columnCount();
+ public function columnCount();
/**
* Executes a prepared statement.
@@ -111,7 +111,7 @@ function columnCount();
* bound parameters in the SQL statement being executed.
* @return Boolean Returns TRUE on success or FALSE on failure.
*/
- function execute($params = null);
+ public function execute($params = null);
/**
* Fetches the next row from a result set.
@@ -136,7 +136,7 @@ function execute($params = null);
*
* @return mixed
*/
- function fetch($fetchStyle = 4);
+ public function fetch($fetchStyle = 4);
/**
* Returns an array containing all of the result set rows.
@@ -146,7 +146,7 @@ function fetch($fetchStyle = 4);
* on the value of the fetch_style parameter.
* @return array
*/
- function fetchAll($fetchStyle = 4);
+ public function fetchAll($fetchStyle = 4);
/**
* Returns a single column from the next row of a result set.
@@ -157,7 +157,7 @@ function fetchAll($fetchStyle = 4);
*
* @return string A single column in the next row of a result set.
*/
- function fetchColumn($columnIndex = 0);
+ public function fetchColumn($columnIndex = 0);
/**
* Returns the number of rows affected by the last SQL statement
@@ -172,5 +172,5 @@ function fetchColumn($columnIndex = 0);
*
* @return integer The number of rows.
*/
- function rowCount();
+ public function rowCount();
}
2  src/Propel/Runtime/Map/ColumnMap.php
View
@@ -498,7 +498,7 @@ public function ignoreCase($str, AdapterInterface $db)
* @param string $name
* @return string Normalized column name.
*/
- static public function normalizeName($name)
+ public static function normalizeName($name)
{
if (false !== ($pos = strrpos($name, '.'))) {
$name = substr($name, $pos + 1);
2  src/Propel/Runtime/Map/DatabaseMap.php
View
@@ -200,7 +200,7 @@ public function getTableByPhpName($phpName)
/**
* Convenience method to get the AdapterInterface registered with Propel for this database.
- * @see Propel::getServiceContainer()->getAdapter(string).
+ * @see Propel::getServiceContainer()->getAdapter(string) .
*
* @return \Propel\Runtime\Adapter\AdapterInterface
*/
1  src/Propel/Runtime/Map/TableMap.php
View
@@ -488,7 +488,6 @@ public function addForeignPrimaryKey($columnName, $phpName, $type, $fkTable, $fk
return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, true, $fkTable, $fkColumn);
}
-
/**
* @return Boolean true if the table is a many to many
*/
1  src/Propel/Runtime/Om/Persistent.php
View
@@ -37,7 +37,6 @@ public function getPrimaryKey();
*/
public function setPrimaryKey($primaryKey);
-
/**
* Returns whether the object has been modified, since it was
* last retrieved from storage.
2  src/Propel/Runtime/Parser/AbstractParser.php
View
@@ -92,7 +92,7 @@ public function dump($data, $path = null)
*
* @return AbstractParser A PropelParser subclass instance
*/
- static public function getParser($type = 'XML')
+ public static function getParser($type = 'XML')
{
$class = sprintf('\Propel\Runtime\Parser\%sParser', ucfirst(strtolower($type)));
1  src/Propel/Runtime/Parser/XmlParser.php
View
@@ -88,7 +88,6 @@ public function listToXML($array, $rootElementName = 'data', $charset = null)
return $this->listFromArray($array, $rootElementName, $charset);
}
-
/**
* @param array $array
* @param DOMElement $rootElement
36 src/Propel/Runtime/Propel.php
View
@@ -101,7 +101,7 @@ class Propel
* @param string $configFile Path (absolute or relative to include_path) to config file.
* @deprecated Why don't you just include the configuration file?
*/
- static public function init($configFile)
+ public static function init($configFile)
{
$serviceContainer = self::getServiceContainer();
$serviceContainer->closeConnections();
@@ -113,7 +113,7 @@ static public function init($configFile)
*
* @return \Propel\Runtime\ServiceContainer\ServiceContainerInterface
*/
- static public function getServiceContainer()