Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed typos

  • Loading branch information...
commit e39b741b66ba3a495a200b34580d55961b5741db 1 parent 56d0be9
Pascal Borreli pborreli authored
Showing with 228 additions and 228 deletions.
  1. +1 −1  documentation/behaviors/nested-set.markdown
  2. +1 −1  documentation/behaviors/validate.markdown
  3. +1 −1  documentation/behaviors/versionable.markdown
  4. +1 −1  documentation/cookbook/multi-component-data-model.markdown
  5. +1 −1  documentation/cookbook/working-with-advanced-column-types.markdown
  6. +2 −2 documentation/documentation/07-behaviors.markdown
  7. +1 −1  documentation/documentation/09-inheritance.markdown
  8. +2 −2 documentation/documentation/whats-new.markdown
  9. +2 −2 documentation/reference/active-record.markdown
  10. +1 −1  documentation/reference/buildtime-configuration.markdown
  11. +2 −2 documentation/reference/model-criteria.markdown
  12. +1 −1  documentation/reference/schema.markdown
  13. +1 −1  src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php
  14. +2 −2 src/Propel/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifier.php
  15. +1 −1  src/Propel/Generator/Behavior/Versionable/VersionableBehaviorQueryBuilderModifier.php
  16. +4 −4 src/Propel/Generator/Builder/Om/AbstractOMBuilder.php
  17. +2 −2 src/Propel/Generator/Builder/Om/AbstractObjectBuilder.php
  18. +1 −1  src/Propel/Generator/Builder/Om/ExtensionObjectBuilder.php
  19. +1 −1  src/Propel/Generator/Builder/Om/ExtensionPeerBuilder.php
  20. +1 −1  src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php
  21. +2 −2 src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php
  22. +1 −1  src/Propel/Generator/Builder/Om/InterfaceBuilder.php
  23. +2 −2 src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php
  24. +11 −11 src/Propel/Generator/Builder/Om/ObjectBuilder.php
  25. +7 −7 src/Propel/Generator/Builder/Om/PeerBuilder.php
  26. +7 −7 src/Propel/Generator/Builder/Om/QueryBuilder.php
  27. +2 −2 src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
  28. +1 −1  src/Propel/Generator/Builder/Om/TableMapBuilder.php
  29. +1 −1  src/Propel/Generator/Builder/Sql/DataSQLBuilder.php
  30. +1 −1  src/Propel/Generator/Builder/Util/PropelTemplate.php
  31. +1 −1  src/Propel/Generator/Config/XmlToArrayConverter.php
  32. +1 −1  src/Propel/Generator/Manager/AbstractManager.php
  33. +2 −2 src/Propel/Generator/Model/Column.php
  34. +1 −1  src/Propel/Generator/Model/ColumnDefaultValue.php
  35. +1 −1  src/Propel/Generator/Model/ConstraintNameGenerator.php
  36. +9 −9 src/Propel/Generator/Model/Database.php
  37. +1 −1  src/Propel/Generator/Model/ForeignKey.php
  38. +3 −3 src/Propel/Generator/Model/PhpNameGenerator.php
  39. +2 −2 src/Propel/Generator/Model/PropelTypes.php
  40. +2 −2 src/Propel/Generator/Model/VendorInfo.php
  41. +1 −1  src/Propel/Generator/Platform/DefaultPlatform.php
  42. +1 −1  src/Propel/Generator/Platform/PgsqlPlatform.php
  43. +1 −1  src/Propel/Generator/Platform/PlatformInterface.php
  44. +1 −1  src/Propel/Generator/Reverse/OracleSchemaParser.php
  45. +6 −6 src/Propel/Runtime/Adapter/AdapterInterface.php
  46. +1 −1  src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
  47. +5 −5 src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
  48. +1 −1  src/Propel/Runtime/Adapter/Pdo/PdoConnection.php
  49. +2 −2 src/Propel/Runtime/Collection/ArrayCollection.php
  50. +1 −1  src/Propel/Runtime/Collection/Collection.php
  51. +1 −1  src/Propel/Runtime/Collection/ObjectCollection.php
  52. +4 −4 src/Propel/Runtime/Collection/OnDemandCollection.php
  53. +1 −1  src/Propel/Runtime/Collection/OnDemandIterator.php
  54. +1 −1  src/Propel/Runtime/Connection/ConnectionInterface.php
  55. +2 −2 src/Propel/Runtime/Map/TableMap.php
  56. +1 −1  src/Propel/Runtime/Om/BaseObject.php
  57. +1 −1  src/Propel/Runtime/Om/NodeObject.php
  58. +2 −2 src/Propel/Runtime/Propel.php
  59. +9 −9 src/Propel/Runtime/Query/Criteria.php
  60. +2 −2 src/Propel/Runtime/Query/Criterion.php
  61. +14 −14 src/Propel/Runtime/Query/ModelCriteria.php
  62. +2 −2 src/Propel/Runtime/Query/ModelCriterion.php
  63. +1 −1  src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php
  64. +1 −1  src/Propel/Runtime/ServiceContainer/StandardServiceContainer.php
  65. +1 −1  src/Propel/Runtime/Util/PropelColumnTypes.php
  66. +1 −1  src/Propel/Runtime/Util/PropelConditionalProxy.php
  67. +1 −1  src/Propel/Runtime/Util/PropelDateTime.php
  68. +1 −1  src/Propel/Runtime/Util/PropelModelPager.php
  69. +1 −1  tests/Fixtures/bookstore-packaged/build.properties.dist
  70. +1 −1  tests/Fixtures/bookstore/build.properties.dist
  71. +1 −1  tests/Fixtures/namespaced/build.properties.dist
  72. +1 −1  tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
  73. +1 −1  tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithSchemaTest.php
  74. +1 −1  tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php
  75. +2 −2 tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
  76. +1 −1  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorPeerBuilderModifierWithScopeTest.php
  77. +2 −2 tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierTest.php
  78. +1 −1  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierWithScopeTest.php
  79. +2 −2 tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php
  80. +2 −2 tests/Propel/Tests/Generator/Builder/NamespaceTest.php
  81. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
  82. +5 −5 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
  83. +8 −8 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
  84. +2 −2 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectWithFixturesTest.php
  85. +2 −2 tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoDeleteTest.php
  86. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerDoSelectTest.php
  87. +1 −1  tests/Propel/Tests/Generator/Builder/Om/GeneratedPeerTest.php
  88. +1 −1  tests/Propel/Tests/Generator/Builder/Om/TableMapBuilderTest.php
  89. +1 −1  tests/Propel/Tests/Generator/Model/IndexTest.php
  90. +1 −1  tests/Propel/Tests/Generator/Util/SchemaValidatorTest.php
  91. +1 −1  tests/Propel/Tests/Runtime/Collection/ArrayCollectionTest.php
  92. +2 −2 tests/Propel/Tests/Runtime/Collection/ObjectCollectionWithFixturesTest.php
  93. +8 −8 tests/Propel/Tests/Runtime/Connection/PropelPDOTest.php
  94. +2 −2 tests/Propel/Tests/Runtime/Map/TableMapTest.php
  95. +1 −1  tests/Propel/Tests/Runtime/Query/CriteriaTest.php
  96. +1 −1  tests/Propel/Tests/Runtime/Query/JoinTest.php
  97. +9 −9 tests/Propel/Tests/Runtime/Query/ModelCriteriaTest.php
  98. +3 −3 tests/Propel/Tests/Runtime/Query/SubQueryTest.php
  99. +4 −4 tests/Propel/Tests/Runtime/ServiceContainer/StandardServiceContainerTest.php
  100. +5 −5 tests/Propel/Tests/Runtime/Util/BasePeerTest.php
2  documentation/behaviors/nested-set.markdown
View
@@ -7,7 +7,7 @@ title: NestedSet Behavior
The `nested_set` behavior allows a model to become a tree structure, and provides numerous methods to traverse the tree in an efficient way.
-Many applications need to store hierarchical data in the model. For instance, a forum stores a tree of messages for each discussion. A CMS sees sections and subsections as a navigation tree. In a business organization chart, each person is a leaf of the organization tree. [Nested sets](http://en.wikipedia.org/wiki/Nested_set_model) are the best way to store such hierachical data in a relational database and manipulate it. The name "nested sets" describes the algorithm used to store the position of a model in the tree ; it is also known as "modified preorder tree traversal".
+Many applications need to store hierarchical data in the model. For instance, a forum stores a tree of messages for each discussion. A CMS sees sections and subsections as a navigation tree. In a business organization chart, each person is a leaf of the organization tree. [Nested sets](http://en.wikipedia.org/wiki/Nested_set_model) are the best way to store such hierarchical data in a relational database and manipulate it. The name "nested sets" describes the algorithm used to store the position of a model in the tree ; it is also known as "modified preorder tree traversal".
## Basic Usage ##
2  documentation/behaviors/validate.markdown
View
@@ -34,7 +34,7 @@ Then add validation rules via `<parameter>` tag.
Let's now see the properties of `<parameter>` tag:
* The `name` of each parameter is arbitrary.
-* The `value` of the parameters is an array in YAML format, in wich we need to specify 3 values:
+* The `value` of the parameters is an array in YAML format, in which we need to specify 3 values:
`column`: the column to validate
`validator`: the name of [Validator Constraint](http://symfony.com/doc/current/reference/constraints.html)
`options`: (optional)an array of optional values to pass to the validator constraint class, according to its reference documentation
2  documentation/behaviors/versionable.markdown
View
@@ -254,7 +254,7 @@ The audit log abilities need to be enabled in the schema as well:
* `string getVersionCreatedBy()`: Gets the author name for the revision
* `mixed getVersionCreatedAt()`: Gets the creation date for the revision (the behavior takes care of setting it)
* `BaseObject setVersionComment(string $comment)`: Defines the comment for the revision
-* `string getVersioneComment()`: Gets the comment for the revision
+* `string getVersionComment()`: Gets the comment for the revision
### Peer class ###
2  documentation/cookbook/multi-component-data-model.markdown
View
@@ -13,7 +13,7 @@ You can use as many `schema.xml` files as you want. Schema files have to be name
Each schema file has to contain a `<database>` element with a `name` attribute. This name references the connection settings to be used for this database (and configured in the `runtime-conf.xml`), so separated schemas can share a common database name.
-Whenever you call a propel build taks, Propel will consider all these schema files and build the classes (or the SQL) for all the tables.
+Whenever you call a propel build tasks, Propel will consider all these schema files and build the classes (or the SQL) for all the tables.
## Understanding Packages ##
2  documentation/cookbook/working-with-advanced-column-types.markdown
View
@@ -89,7 +89,7 @@ echo $book->getStyle(); // novel
// Trying to set a value not in the valueSet throws an exception
// ENUM columns are also searchable, using the generated filterByXXX() method
-// or other ModelCritera methods (like where(), condition())
+// or other ModelCriteria methods (like where(), condition())
$books = BookQuery::create()
->filterByStyle('novel')
->find();
4 documentation/documentation/07-behaviors.markdown
View
@@ -114,7 +114,7 @@ Propel offers three ways to achieve the refactoring of the common behavior. The
Behaviors are special objects that use events called during the build process to enhance the generated model classes. Behaviors can add attributes and methods to both the Peer and model classes, they can modify the course of some of the generated methods, and they can even modify the structure of a database by adding columns or tables.
-For instance, Propel bundles a behavior called `timestampable`, which does exatcly the same thing as described above. But instead of adding columns and methods by hand, all you have to do is to declare it in a `<behavior>` tag in your `schema.xml`, as follows:
+For instance, Propel bundles a behavior called `timestampable`, which does exactly the same thing as described above. But instead of adding columns and methods by hand, all you have to do is to declare it in a `<behavior>` tag in your `schema.xml`, as follows:
{% highlight xml %}
<table name="book">
@@ -189,7 +189,7 @@ As a Propel behavior can be packaged into a single class, behaviors are quite ea
# ----------------------------------
propel.behavior.timestampable.class = propel.engine.behavior.timestampable.TimestampableBehavior
-# Add your custom behavior pathes here
+# Add your custom behavior paths here
propel.behavior.formidable.class = path.to.FormidableBehavior
{% endhighlight %}
2  documentation/documentation/09-inheritance.markdown
View
@@ -120,7 +120,7 @@ If you wish to enforce using subclasses of an entity, you may declare a table "a
...
{% endhighlight %}
-That way users will only be able to instanciate `Essay` or `Comic` books, but not `Book`.
+That way users will only be able to instantiate `Essay` or `Comic` books, but not `Book`.
## Class Table Inheritance ##
4 documentation/documentation/whats-new.markdown
View
@@ -35,7 +35,7 @@ Starting with Propel 1.6, the `sql`-`insert-sql` sequence is replaced by the `di
Migrations are a fantastic way to work on complex projects with always evolving models ; they are also a great tool for team work, since migration classes can be shared among all developers. That way, when a developer adds a table to the model, a second developer just needs to run the related migration to have the table added to the table.
-Propel migrations can also be executed incrementally - the new `up` and `down` tasks are there for that. And when you're lost in migration, call the `status` task to chack which migrations were already executed, and which ones should be executed to update the database structure.
+Propel migrations can also be executed incrementally - the new `up` and `down` tasks are there for that. And when you're lost in migration, call the `status` task to check which migrations were already executed, and which ones should be executed to update the database structure.
The Propel documentation offers [an entire chapter on Migrations](10-migrations.html) to explain how to use them and how they work.
@@ -556,7 +556,7 @@ echo BookPeer::STYLE_POETRY; // 'poetry'
print_r(BookPeer::getValueSet(BookPeer::STYLE)); // array('novel', 'essay', 'poetry')
// ENUM columns are also searchable, using the generated filterByXXX() method
-// or other ModelCritera methods (like where(), orWhere(), condition())
+// or other ModelCriteria methods (like where(), orWhere(), condition())
$books = BookQuery::create()
->filterByStyle('novel')
->find();
4 documentation/reference/active-record.markdown
View
@@ -82,8 +82,8 @@ abstract class BaseBook extends BaseObject implements Persistent
// BaseObject and Persistent are classes bundled by Propel
-// Do not alter the code of the Base- classes, as your modifications will be overriden
-// each time you rebuild the model. Instead, add your cutom code to the stub slass
+// Do not alter the code of the Base- classes, as your modifications will be overridden
+// each time you rebuild the model. Instead, add your custom code to the stub class
class Book extends BaseBook
{
public function getCapitalTitle()
2  documentation/reference/buildtime-configuration.markdown
View
@@ -90,7 +90,7 @@ propel.schema.transform = true|{false}
# the SQL DDL, the PHP classes, etc.
propel.database = pgsql|mysql|sqlite|mssql|oracle
-# The database PDO connection settings at builtime.
+# The database PDO connection settings at buildtime.
# This setting is required for the sql, reverse, and datasql tasks.
# Note that some drivers (e.g. mysql, oracle) require that you specify the
# username and password separately from the DSN, which is why they are
4 documentation/reference/model-criteria.markdown
View
@@ -43,7 +43,7 @@ $stmt->bind(':p1', time() - 30 * 24 * 60 * 60, PDO::PARAM_INT);
$res = $stmt->execute();
{% endhighlight %}
-The final `find()` doesn't just execute the SQL query above, it also instanciates `Book` objects and populates them with the results of the query. Eventually, it returns a `PropelCollection` object with these `Book` objects inside. For the sake of clarity, you can consider this collection object as an array. In fact, you can use it as if it were a true PHP array and iterate over the result list the usual way:
+The final `find()` doesn't just execute the SQL query above, it also instantiates `Book` objects and populates them with the results of the query. Eventually, it returns a `PropelCollection` object with these `Book` objects inside. For the sake of clarity, you can consider this collection object as an array. In fact, you can use it as if it were a true PHP array and iterate over the result list the usual way:
{% highlight php %}
<?php
@@ -778,7 +778,7 @@ $author = $book->getAuthor(); // No additional query needed
$publisher = $book->getPublisher(); // No additional query needed
{% endhighlight %}
-So `joinWith()` is very useful to minimize the number of database queries. As soon as you see that the number of queries necessary to perform an action is proportional to the number of results, adding `With` after `join()` calls is the trick to get down to a more reasonnable query count.
+So `joinWith()` is very useful to minimize the number of database queries. As soon as you see that the number of queries necessary to perform an action is proportional to the number of results, adding `With` after `join()` calls is the trick to get down to a more reasonable query count.
### Adding Columns ###
2  documentation/reference/schema.markdown
View
@@ -354,7 +354,7 @@ For example:
### Adding Vendor Info ###
-Propel supports database-specific elements in the schema (currently only for MySQL). This "vendor" parameters affect the generated SQL. To add vendor data, add a `<vendor>` tag with a `type` attribute specifying the target database vendor. In the `<vendor>` tag, add `<parameter>` tags with a `name` and a `value` attribue. For instance:
+Propel supports database-specific elements in the schema (currently only for MySQL). This "vendor" parameters affect the generated SQL. To add vendor data, add a `<vendor>` tag with a `type` attribute specifying the target database vendor. In the `<vendor>` tag, add `<parameter>` tags with a `name` and a `value` attribute. For instance:
{% highlight xml %}
<table name="book">
2  src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php
View
@@ -415,7 +415,7 @@ protected function addIsInTree(&$script)
{
$script .= "
/**
- * Tests if onbject is a node, i.e. if it is inserted in the tree
+ * Tests if object is a node, i.e. if it is inserted in the tree
*
* @return bool
*/
4 src/Propel/Generator/Behavior/Versionable/VersionableBehaviorObjectBuilderModifier.php
View
@@ -325,7 +325,7 @@ protected function addToVersion(&$script)
$ARclassName = $this->getActiveRecordClassName();
$script .= "
/**
- * Sets the properties of the curent object to the value they had at a specific version
+ * Sets the properties of the current object to the value they had at a specific version
*
* @param integer \$versionNumber The version number to read
* @param ConnectionInterface \$con the connection to use
@@ -355,7 +355,7 @@ protected function addPopulateFromVersion(&$script)
$primaryKeyName = $tablePKs[0]->getPhpName();
$script .= "
/**
- * Sets the properties of the curent object to the value they had at a specific version
+ * Sets the properties of the current object to the value they had at a specific version
*
* @param {$versionARClassName} \$version The version object to use
* @param ConnectionInterface \$con the connection to use
2  src/Propel/Generator/Behavior/Versionable/VersionableBehaviorQueryBuilderModifier.php
View
@@ -110,7 +110,7 @@ protected function addOrderByVersion(&$script)
{
$script .= "
/**
- * Wrap the order on the version volumn
+ * Wrap the order on the version column
*
* @param string \$order The sorting order. Criteria::ASC by default, also accepts Criteria::DESC
* @return " . $this->builder->getQueryClassName() . " The current query, for fluid interface
8 src/Propel/Generator/Builder/Om/AbstractOMBuilder.php
View
@@ -229,7 +229,7 @@ public function getNamespace()
}
/**
- * This decare the class use and get the correct name to use (short classname, Alias, or FQCN)
+ * This declare the class use and get the correct name to use (short classname, Alias, or FQCN)
*
* @param AbstractOMBuilder $builder
* @param boolean $fqcn true to return the $fqcn classname
@@ -257,7 +257,7 @@ public function getClassNameFromBuilder($builder, $fqcn = false)
*
* @param string $class the class name
* @param string $namespace the namespace
- * @param string|boolean $alias the alias wanted, if set to True, it automaticaly add an alias when needed
+ * @param string|boolean $alias the alias wanted, if set to True, it automatically adds an alias when needed
* @return string the class name or it's alias
*/
public function declareClassNamespace($class, $namespace = '', $alias = false)
@@ -346,7 +346,7 @@ protected function needAliasForClassName($class, $namespace)
*
* @param string $class the class
* @param string $namespace the namespace
- * @param mixed $aliasPrefix optionaly an alias or True to force an automatic alias prefix (Base or Child)
+ * @param mixed $aliasPrefix optionally an alias or True to force an automatic alias prefix (Base or Child)
* @return string the short ClassName or an alias
*/
public function declareClassNamespacePrefix($class, $namespace = '', $aliasPrefix = false)
@@ -365,7 +365,7 @@ public function declareClassNamespacePrefix($class, $namespace = '', $aliasPrefi
* This return the short ClassName to use or an alias
*
* @param string $fullyQualifiedClassName the fully qualified classname
- * @param mixed $aliasPrefix optionaly an alias or True to force an automatic alias prefix (Base or Child)
+ * @param mixed $aliasPrefix optionally an alias or True to force an automatic alias prefix (Base or Child)
* @return string the short ClassName or an alias
*/
public function declareClass($fullyQualifiedClassName, $aliasPrefix = false)
4 src/Propel/Generator/Builder/Om/AbstractObjectBuilder.php
View
@@ -38,7 +38,7 @@
/**
* Adds the getter methods for the column values.
* This is here because it is probably generic enough to apply to templates being generated
- * in different langauges (e.g. PHP4 and PHP5).
+ * in different languages (e.g. PHP4 and PHP5).
* @param string &$script The script will be modified in this method.
*/
protected function addColumnAccessorMethods(&$script)
@@ -75,7 +75,7 @@ protected function addColumnAccessorMethods(&$script)
/**
* Adds the mutator (setter) methods for setting column values.
* This is here because it is probably generic enough to apply to templates being generated
- * in different langauges (e.g. PHP4 and PHP5).
+ * in different languages (e.g. PHP4 and PHP5).
* @param string &$script The script will be modified in this method.
*/
protected function addColumnMutatorMethods(&$script)
2  src/Propel/Generator/Builder/Om/ExtensionObjectBuilder.php
View
@@ -31,7 +31,7 @@ public function getUnprefixedClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
* @param string &$script The script will be modified in this method.
*/
protected function addClassOpen(&$script)
2  src/Propel/Generator/Builder/Om/ExtensionPeerBuilder.php
View
@@ -31,7 +31,7 @@ public function getUnprefixedClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
* @param string &$script The script will be modified in this method.
*/
protected function addClassOpen(&$script)
2  src/Propel/Generator/Builder/Om/ExtensionQueryBuilder.php
View
@@ -31,7 +31,7 @@ public function getUnprefixedClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
* @param string &$script The script will be modified in this method.
*/
protected function addClassOpen(&$script)
4 src/Propel/Generator/Builder/Om/ExtensionQueryInheritanceBuilder.php
View
@@ -50,7 +50,7 @@ public function getPackage()
}
/**
- * Set the child object that we're operating on currrently.
+ * Set the child object that we're operating on currently.
*
* @param Inheritance $child Inheritance
*/
@@ -75,7 +75,7 @@ public function getChild()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
*
* @param string $script
*/
2  src/Propel/Generator/Builder/Om/InterfaceBuilder.php
View
@@ -31,7 +31,7 @@ public function getUnprefixedClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
* @param string &$script The script will be modified in this method.
*/
protected function addClassOpen(&$script)
4 src/Propel/Generator/Builder/Om/MultiExtendObjectBuilder.php
View
@@ -51,7 +51,7 @@ public function getPackage()
}
/**
- * Sets the child object that we're operating on currrently.
+ * Sets the child object that we're operating on currently.
*
* @param Inheritance $child Inheritance
*/
@@ -110,7 +110,7 @@ protected function getParentClassFilePath()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
*
* @param string &$script
*/
22 src/Propel/Generator/Builder/Om/ObjectBuilder.php
View
@@ -192,7 +192,7 @@ protected function getDefaultValueString(Column $column)
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
*
* @param string &$script
*/
@@ -602,7 +602,7 @@ protected function addGetPeerFunctionBody(&$script)
* Adds the function close for the getPeer method.
*
* Note: this is just a } and the body ends with a return statement, so it's
- * quite useless. But it's here anyway for consisency, cause there's a close
+ * quite useless. But it's here anyway for consistency, cause there's a close
* function for all functions and in some other instances, they are useful.
*
* @param string &$script
@@ -2800,7 +2800,7 @@ public function getPrimaryKey()
/**
* Adds the getPrimaryKey() method for objects that have no primary key.
- * This "feature" is dreprecated, since the getPrimaryKey() method is not required
+ * This "feature" is deprecated, since the getPrimaryKey() method is not required
* by the Persistent interface (or used by the templates). Hence, this method is also
* deprecated.
* @param string &$script The script will be modified in this method.
@@ -2893,7 +2893,7 @@ public function setPrimaryKey(\$keys)
/**
* Adds the setPrimaryKey() method for objects that have no primary key.
- * This "feature" is dreprecated, since the setPrimaryKey() method is not required
+ * This "feature" is deprecated, since the setPrimaryKey() method is not required
* by the Persistent interface (or used by the templates). Hence, this method is also
* deprecated.
* @param string &$script The script will be modified in this method.
@@ -3262,7 +3262,7 @@ protected function addRefFKGetJoinMethods(&$script, ForeignKey $refFK)
$tblFK2 = $this->getForeignTable($fk2);
$doJoinGet = !$tblFK2->isForReferenceOnly();
- // it doesn't make sense to join in rows from the curent table, since we are fetching
+ // it doesn't make sense to join in rows from the current table, since we are fetching
// objects related to *this* table (i.e. the joined rows will all be the same row as current object)
if ($this->getTable()->getPhpName() == $tblFK2->getPhpName()) {
$doJoinGet = false;
@@ -4140,7 +4140,7 @@ protected function doSave(ConnectionInterface \$con".($reloadOnUpdate || $reload
$script .= "
// We call the save method on the following object(s) if they
- // were passed to this object by their coresponding set
+ // were passed to this object by their corresponding set
// method. This object relates to these object(s) by a
// foreign key reference.
";
@@ -4625,7 +4625,7 @@ protected function addSaveBody(&$script)
try {";
if ($this->getGeneratorConfig()->getBuildProperty('addHooks')) {
- // save with runtime hools
+ // save with runtime hooks
$script .= "
\$ret = \$this->preSave(\$con);";
$this->applyBehaviorModifier('preSave', $script, " ");
@@ -4760,7 +4760,7 @@ public function ensureConsistency()
if (\$this->".$varName." !== null && \$this->$clo !== \$this->".$varName."->get".$colFK->getPhpName()."()) {
\$this->$varName = null;
}";
- } // foraech
+ } // foreach
} /* if col is foreign key */
} // foreach
@@ -4853,8 +4853,8 @@ public function copyInto(\$copyObj, \$deepCopy = false, \$makeNew = true)
\$copyObj->setNew(false);
";
foreach ($table->getReferrers() as $fk) {
- //HL: commenting out self-referrential check below
- // it seems to work as expected and is probably desireable to have those referrers from same table deep-copied.
+ //HL: commenting out self-referential check below
+ // it seems to work as expected and is probably desirable to have those referrers from same table deep-copied.
//if ( $fk->getTable()->getName() != $table->getName() ) {
if ($fk->isLocalPrimaryKey()) {
@@ -4964,7 +4964,7 @@ protected function addClearAllReferences(&$script)
*
* This method is a user-space workaround for PHP's inability to garbage collect
* objects with circular references (even in PHP 5.3). This is currently necessary
- * when using Propel in certain daemon or large-volumne/high-memory operations.
+ * when using Propel in certain daemon or large-volume/high-memory operations.
*
* @param boolean \$deep Whether to also clear the references on all referrer objects.
*/
14 src/Propel/Generator/Builder/Om/PeerBuilder.php
View
@@ -90,7 +90,7 @@ public function getNamespace()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
*
* @param string &$script
*/
@@ -243,7 +243,7 @@ protected function addConstantsAndAttributes(&$script)
const DEFAULT_STRING_FORMAT = '" . $this->getTable()->getDefaultStringFormat() . "';
/**
- * An identiy map to hold any loaded instances of ".$this->getObjectClassName()." objects.
+ * An identity map to hold any loaded instances of ".$this->getObjectClassName()." objects.
* This must be public so that other peer classes can access this when hydrating from JOIN
* queries.
* @var array ".$this->getObjectClassName()."[]
@@ -265,7 +265,7 @@ protected function addConstantsAndAttributes(&$script)
}
/**
- * Adds the COLUMN_NAME contants to the class definition.
+ * Adds the COLUMN_NAME constant to the class definition.
* @param string &$script The script will be modified in this method.
*/
protected function addColumnNameConstants(&$script)
@@ -407,7 +407,7 @@ protected function addFieldKeysAttribute(&$script)
$script .= ")
);
";
- } // addFielKeysAttribute
+ } // addFieldKeysAttribute
/**
* Adds the valueSet attributes for ENUM columns.
@@ -777,7 +777,7 @@ protected function addDoSelectStmt(&$script)
/**
* Prepares the Criteria object and uses the parent doSelect() method to execute a Statement.
*
- * Use this method directly if you want to work with an executed statement durirectly (for example
+ * Use this method directly if you want to work with an executed statement directly (for example
* to perform your own object hydration).
*
* @param Criteria \$criteria The Criteria object used to build the SELECT statement.
@@ -1313,7 +1313,7 @@ protected function addGetOMClass_NoInheritance(&$script)
* The class that the Peer will make instances of.
*
* If \$withPrefix is true, the returned path
- * uses a dot-path notation which is tranalted into a path
+ * uses a dot-path notation which is translated into a path
* relative to a location on the PHP include_path.
* (e.g. path.to.MyClass -> 'path/to/MyClass.php')
*
@@ -1805,7 +1805,7 @@ protected static function doOnDeleteSetNull(Criteria \$criteria, ConnectionInter
";
// This logic is almost exactly the same as that in doOnDeleteCascade()
- // it may make sense to refactor this, provided that thigns don't
+ // it may make sense to refactor this, provided that things don't
// get too complicated.
foreach ($table->getReferrers() as $fk) {
14 src/Propel/Generator/Builder/Om/QueryBuilder.php
View
@@ -56,7 +56,7 @@ public function getUnprefixedClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
* @param string &$script The script will be modified in this method.
*/
protected function addClassOpen(&$script)
@@ -246,7 +246,7 @@ protected function addConstructorComment(&$script)
/**
* Initializes internal state of ".$this->getClassName()." object.
*
- * @param string \$dbName The dabase name
+ * @param string \$dbName The database name
* @param string \$modelName The phpName of a model, e.g. 'Book'
* @param string \$modelAlias The alias for the model in this query, e.g. 'b'
*/";
@@ -411,7 +411,7 @@ public function findPk(\$key, \$con = null)
$pkHash = $this->getPeerBuilder()->getInstancePoolKeySnippet($pks);
$script .= "
if ((null !== (\$obj = {$peerClassName}::getInstanceFromPool({$pkHash}))) && !\$this->formatter) {
- // the object is alredy in the instance pool
+ // the object is already in the instance pool
return \$obj;
}
if (\$con === null) {
@@ -889,7 +889,7 @@ public function filterBy$colPhpName(\$$variableName = null, \$comparison = null)
}
/**
- * Adds the singular filterByCol method for an Arry column.
+ * Adds the singular filterByCol method for an Array column.
* @param string &$script The script will be modified in this method.
*/
protected function addFilterByArrayCol(&$script, $col)
@@ -1363,9 +1363,9 @@ protected function addBasePreUpdate(&$script)
/**
* Code to execute before every UPDATE statement
*
- * @param array \$values The associatiove array of columns and values for the update
+ * @param array \$values The associative array of columns and values for the update
* @param ConnectionInterface \$con The connection object used by the query
- * @param boolean \$forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), ortherwise it is a series of save() calls on all the found objects
+ * @param boolean \$forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), otherwise it is a series of save() calls on all the found objects
*/
protected function basePreUpdate(&\$values, ConnectionInterface \$con, \$forceIndividualSaves = false)
{" . $behaviorCode . "
@@ -1390,7 +1390,7 @@ protected function addBasePostUpdate(&$script)
/**
* Code to execute after every UPDATE statement
*
- * @param int \$affectedRows the number of udated rows
+ * @param int \$affectedRows the number of updated rows
* @param ConnectionInterface \$con The connection object used by the query
*/
protected function basePostUpdate(\$affectedRows, ConnectionInterface \$con)
4 src/Propel/Generator/Builder/Om/QueryInheritanceBuilder.php
View
@@ -66,7 +66,7 @@ public function getNamespace()
}
/**
- * Sets the child object that we're operating on currrently.
+ * Sets the child object that we're operating on currently.
*
* @param Inheritance $child
*/
@@ -111,7 +111,7 @@ protected function getParentClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
*
* @param string &$script
*/
2  src/Propel/Generator/Builder/Om/TableMapBuilder.php
View
@@ -53,7 +53,7 @@ public function getUnprefixedClassName()
}
/**
- * Adds class phpdoc comment and openning of class.
+ * Adds class phpdoc comment and opening of class.
* @param string &$script The script will be modified in this method.
*/
protected function addClassOpen(&$script)
2  src/Propel/Generator/Builder/Sql/DataSQLBuilder.php
View
@@ -102,7 +102,7 @@ public function buildRowSql(DataRow $row)
}
/**
- * Returns the propertly escaped (and quoted) value for a column.
+ * Returns the property escaped (and quoted) value for a column.
*
* @param ColumnValue $colValue
* @return mixed
2  src/Propel/Generator/Builder/Util/PropelTemplate.php
View
@@ -68,7 +68,7 @@ public function setTemplateFile($filePath)
* // This is Mike
* </code>
*
- * @param array $vars An associative array of argumens to be rendered
+ * @param array $vars An associative array of arguments to be rendered
*
* @return string The rendered template
*/
2  src/Propel/Generator/Config/XmlToArrayConverter.php
View
@@ -66,7 +66,7 @@ protected static function simpleXmlToArray($xml)
$child = self::getConvertedXmlValue($v);
}
- // add the childs attributes as if they where children
+ // add the children attributes as if they where children
foreach ($v->attributes() as $ak => $av) {
if ($ak == 'id') {
// special exception: if there is a key named 'id'
2  src/Propel/Generator/Manager/AbstractManager.php
View
@@ -323,7 +323,7 @@ protected function includeExternalSchemas(\DOMDocument $dom, $srcDir)
$externalSchemaDom = new \DOMDocument('1.0', 'UTF-8');
$externalSchemaDom->load(realpath($include));
- // The external schema may have external schemas of its own ; recurse
+ // The external schema may have external schemas of its own ; recurs
$this->includeExternalSchemas($externalSchemaDom, $srcDir);
foreach ($externalSchemaDom->getElementsByTagName('table') as $tableNode) {
$databaseNode->appendChild($dom->importNode($tableNode, true));
4 src/Propel/Generator/Model/Column.php
View
@@ -1047,7 +1047,7 @@ public function isTemporalType()
}
/**
- * Returns whether or not this colum is an ENUM column.
+ * Returns whether or not this column is an ENUM column.
*
* @return boolean
*/
@@ -1380,7 +1380,7 @@ public function isPhpObjectType()
}
/**
- * Returns an instance of PlateformInterface interface.
+ * Returns an instance of PlatformInterface interface.
*
* @return PlatformInterface
*/
2  src/Propel/Generator/Model/ColumnDefaultValue.php
View
@@ -91,7 +91,7 @@ public function setValue($value)
* A method to compare if two Default values match
*
* @param ColumnDefaultValue $other The value to compare to
- * @return boolean Wheter this object represents same default value as $other
+ * @return boolean Whether this object represents same default value as $other
* @author Niklas Närhinen <niklas@narhinen.net>
*/
public function equals(ColumnDefaultValue $other)
2  src/Propel/Generator/Model/ConstraintNameGenerator.php
View
@@ -30,7 +30,7 @@ class ConstraintNameGenerator implements NameGenerator
* should be a table name, third is the type identifier (spared if
* trimming is necessary due to database type length constraints),
* and the fourth is a <code>Integer</code> indicating the number
- * of this contraint.
+ * of this constraint.
*
* @see NameGenerator
* @throws EngineException
18 src/Propel/Generator/Model/Database.php
View
@@ -130,7 +130,7 @@ public function setName($name)
/**
* Returns the name of the base super class inherited by active record
- * objects. This parameter is overriden at the table level.
+ * objects. This parameter is overridden at the table level.
*
* @return string
*/
@@ -141,7 +141,7 @@ public function getBaseClass()
/**
* Sets the name of the base super class inherited by active record objects.
- * This parameter is overriden at the table level.
+ * This parameter is overridden at the table level.
*
* @param string $class.
*/
@@ -152,7 +152,7 @@ public function setBaseClass($class)
/**
* Returns the name of the base peer super class inherited by Peer classes.
- * This parameter is overriden at the table level.
+ * This parameter is overridden at the table level.
*
* @return string
*/
@@ -163,7 +163,7 @@ public function getBasePeer()
/**
* Sets the name of the base peer super class inherited by Peer classes.
- * This parameter is overriden at the table level.
+ * This parameter is overridden at the table level.
*
* @param string $class
*/
@@ -174,7 +174,7 @@ public function setBasePeer($class)
/**
* Returns the name of the default ID method strategy.
- * This parameter can be overriden at the table level.
+ * This parameter can be overridden at the table level.
*
* @return string
*/
@@ -185,7 +185,7 @@ public function getDefaultIdMethod()
/**
* Sets the name of the default ID method strategy.
- * This parameter can be overriden at the table level.
+ * This parameter can be overridden at the table level.
*
* @param string $strategy
*/
@@ -197,7 +197,7 @@ public function setDefaultIdMethod($strategy)
/**
* Returns the name of the default PHP naming method strategy, which
* specifies the method for converting schema names for table and column to
- * PHP names. This parameter can be overriden at the table layer.
+ * PHP names. This parameter can be overridden at the table layer.
*
* @return string
*/
@@ -228,7 +228,7 @@ public static function getSupportedStringFormats()
/**
* Sets the default string format for ActiveRecord objects in this table.
- * This parameter can be overriden at the table level.
+ * This parameter can be overridden at the table level.
*
* Any of 'XML', 'YAML', 'JSON', or 'CSV'.
*
@@ -249,7 +249,7 @@ public function setDefaultStringFormat($format)
/**
* Returns the default string format for ActiveRecord objects in this table.
- * This parameter can be overriden at the table level.
+ * This parameter can be overridden at the table level.
*
* @return string
*/
2  src/Propel/Generator/Model/ForeignKey.php
View
@@ -664,7 +664,7 @@ public function isSkipSql()
}
/**
- * Whether this foreign key is matched by an invertes foreign key (on foreign table).
+ * Whether this foreign key is matched by an inverted foreign key (on foreign table).
*
* This is to prevent duplicate columns being generated for a 1:1 relationship that is represented
* by foreign keys on both tables. I don't know if that's good practice ... but hell, why not
6 src/Propel/Generator/Model/PhpNameGenerator.php
View
@@ -26,7 +26,7 @@ class PhpNameGenerator implements NameGenerator
* original name of the database element and the method for
* generating the name.
* The optional third element may contain a prefix that will be
- * stript from name prior to generate the resulting name.
+ * script from name prior to generate the resulting name.
* There are currently three methods:
* <code>CONV_METHOD_NOCHANGE</code> - xml names are converted
* directly to php names without modification.
@@ -76,7 +76,7 @@ public function generateName($inputs)
/**
* Converts a database schema name to php object name by Camelization.
- * Removes <code>STD_SEPARATOR_CHAR</code>, capitilizes first letter
+ * Removes <code>STD_SEPARATOR_CHAR</code>, capitalizes first letter
* of name and each letter after the <code>STD_SEPERATOR</code>,
* converts the rest of the letters to lowercase.
*
@@ -103,7 +103,7 @@ protected function underscoreMethod($schemaName)
/**
* Converts a database schema name to php object name. Removes
- * any character that is not a letter or a number and capitilizes
+ * any character that is not a letter or a number and capitalizes
* first letter of the name, the first letter of each alphanumeric
* block and converts the rest of the letters to lowercase.
*
4 src/Propel/Generator/Model/PropelTypes.php
View
@@ -215,7 +215,7 @@ public static function getPhpNative($mappingType)
}
/**
- * Resturns the PDO type (PDO::PARAM_* constant) value.
+ * Returns the PDO type (PDO::PARAM_* constant) value.
*
* @return integer
*/
@@ -225,7 +225,7 @@ public static function getPDOType($type)
}
/**
- * Resturns the PDO type ('PDO::PARAM_*' constant) name.
+ * Returns the PDO type ('PDO::PARAM_*' constant) name.
*
* @return string
*/
4 src/Propel/Generator/Model/VendorInfo.php
View
@@ -93,7 +93,7 @@ public function hasParameter($name)
/**
* Sets an associative array of parameters for venfor specific information.
*
- * @param array $params Paramter data.
+ * @param array $params Parameter data.
*/
public function setParameters(array $parameters = array())
{
@@ -102,7 +102,7 @@ public function setParameters(array $parameters = array())
/**
* Returns an associative array of parameters for
- * venfor specific information.
+ * vendor specific information.
*
* @return array
*/
2  src/Propel/Generator/Platform/DefaultPlatform.php
View
@@ -1037,7 +1037,7 @@ public function hasScale($sqlType)
}
/**
- * Quote and escape needed characters in the string for unerlying RDBMS.
+ * Quote and escape needed characters in the string for underlying RDBMS.
* @param string $text
* @return string
*/
2  src/Propel/Generator/Platform/PgsqlPlatform.php
View
@@ -86,7 +86,7 @@ public function disconnectedEscapeText($text)
public function getBooleanString($b)
{
- // parent method does the checking for allowes tring
+ // parent method does the checking for allows string
// representations & returns integer
$b = parent::getBooleanString($b);
2  src/Propel/Generator/Platform/PlatformInterface.php
View
@@ -146,7 +146,7 @@ public function hasSize($sqlType);
public function hasScale($sqlType);
/**
- * Quote and escape needed characters in the string for unerlying RDBMS.
+ * Quote and escape needed characters in the string for underlying RDBMS.
* @param string $text
* @return string
*/
2  src/Propel/Generator/Reverse/OracleSchemaParser.php
View
@@ -34,7 +34,7 @@ class OracleSchemaParser extends AbstractSchemaParser
* RAW,
* ROWID
*
- * Supported but non existant as a specific type in Oracle:
+ * Supported but non existent as a specific type in Oracle:
* DECIMAL (NUMBER with scale),
* DOUBLE (FLOAT with precision = 126)
*
12 src/Propel/Runtime/Adapter/AdapterInterface.php
View
@@ -80,7 +80,7 @@ public function ignoreCaseInOrderBy($in);
* a piece of text used in a SQL statement (generally a single
* quote).
*
- * @return string The text delimeter.
+ * @return string The text delimiter.
*/
public function getStringDelimiter();
@@ -114,14 +114,14 @@ public function subString($s, $pos, $len);
public function strLength($s);
/**
- * Quotes database objec identifiers (table names, col names, sequences, etc.).
+ * Quotes database object identifiers (table names, col names, sequences, etc.).
* @param string $text The identifier to quote.
* @return string The quoted identifier.
*/
public function quoteIdentifier($text);
/**
- * Quotes a database table which could have space seperating it from an alias,
+ * Quotes a database table which could have space separating it from an alias,
* both should be identified separately. This doesn't take care of dots which
* separate schema names from table names. Adapters for RDBMs which support
* schemas have to implement that in the platform-specific way.
@@ -188,7 +188,7 @@ public function getTimeFormatter();
/**
* Should Column-Names get identifiers for inserts or updates.
- * By default false is returned -> backwards compability.
+ * By default false is returned -> backwards compatibility.
*
* it`s a workaround...!!!
*
@@ -272,7 +272,7 @@ public function turnSelectColumnsToAliases(Criteria $criteria);
* $sql = BasePeer::createSelectSql($criteria, $params);
* $stmt = $con->prepare($sql);
* $params = array();
- * $adapter->populateStmtValues($stmt, $params, Propel::getServiceContainer()->getDatabaseMap($critera->getDbName()));
+ * $adapter->populateStmtValues($stmt, $params, Propel::getServiceContainer()->getDatabaseMap($criteria->getDbName()));
* $stmt->execute();
* </code>
*
@@ -283,7 +283,7 @@ public function turnSelectColumnsToAliases(Criteria $criteria);
public function bindValues(StatementInterface $stmt, array $params, DatabaseMap $dbMap);
/**
- * Binds a value to a positioned parameted in a statement,
+ * Binds a value to a positioned parameter in a statement,
* given a ColumnMap object to infer the binding type.
*
* @param Propel\Runtime\Connection\StatementInterface $stmt The statement to bind
2  src/Propel/Runtime/Adapter/Pdo/MssqlAdapter.php
View
@@ -205,7 +205,7 @@ public function applyLimit(&$sql, $offset, $limit)
$innerSelect .= $selColArr[0] . ' AS ' . $alias . ', ';
$outerSelect .= $alias . ', ';
} else {
- //agregate columns must always have an alias clause
+ //aggregate columns must always have an alias clause
if (!stristr($selCol, ' AS ')) {
throw new MalformedClauseException('MssqlAdapter::applyLimit() requires aggregate columns to have an Alias clause');
}
10 src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
View
@@ -178,7 +178,7 @@ public function getStringDelimiter()
}
/**
- * Quotes database objec identifiers (table names, col names, sequences, etc.).
+ * Quotes database object identifiers (table names, col names, sequences, etc.).
* @param string $text The identifier to quote.
* @return string The quoted identifier.
*/
@@ -188,8 +188,8 @@ public function quoteIdentifier($text)
}
/**
- * Quotes a database table which could have space seperating it from an alias,
- * both should be identified seperately. This doesn't take care of dots which
+ * Quotes a database table which could have space separating it from an alias,
+ * both should be identified separately. This doesn't take care of dots which
* separate schema names from table names. Adapters for RDBMs which support
* schemas have to implement that in the platform-specific way.
*
@@ -306,7 +306,7 @@ public function getTimeFormatter()
/**
* Should Column-Names get identifiers for inserts or updates.
- * By default false is returned -> backwards compability.
+ * By default false is returned -> backwards compatibility.
*
* it`s a workaround...!!!
*
@@ -517,7 +517,7 @@ public function bindValues(StatementInterface $stmt, array $params, DatabaseMap
}
/**
- * Binds a value to a positioned parameted in a statement,
+ * Binds a value to a positioned parameter in a statement,
* given a ColumnMap object to infer the binding type.
*
* @param Propel\Runtime\Connection\StatementInterface $stmt The statement to bind
2  src/Propel/Runtime/Adapter/Pdo/PdoConnection.php
View
@@ -14,7 +14,7 @@
use Propel\Runtime\Exception\InvalidArgumentException;
/**
- * PDO extension that implements ConnectionInterface and builds statements implementting StatementInterface.
+ * PDO extension that implements ConnectionInterface and builds statements implementing StatementInterface.
*/
class PdoConnection extends \PDO implements ConnectionInterface
{
4 src/Propel/Runtime/Collection/ArrayCollection.php
View
@@ -156,7 +156,7 @@ public function toArray($keyColumn = null, $usePrefix = false)
}
/**
- * Synonym for toArray(), to provide a similar interface to PopelObjectCollection
+ * Synonym for toArray(), to provide a similar interface to PropelObjectCollection
*
* @param string $keyColumn
* @param boolean $usePrefix
@@ -175,7 +175,7 @@ public function getArrayCopy($keyColumn = null, $usePrefix = false)
/**
* Get an associative array representation of the collection
* The first parameter specifies the column to be used for the key,
- * And the seconf for the value.
+ * And the second for the value.
* <code>
* $res = $coll->toKeyValue('Id', 'Name');
* </code>
2  src/Propel/Runtime/Collection/Collection.php
View
@@ -543,7 +543,7 @@ public function importFrom($parser, $data)
* => {{"Id":9012,"Title":"Don Juan","ISBN":"0140422161","Price":12.99,"PublisherId":1234,"AuthorId":5678}}');
* </code>
*
- * A OnDemandCollection cannot be exported. Any attempt will result in a PropelExecption being thrown.
+ * A OnDemandCollection cannot be exported. Any attempt will result in a PropelException being thrown.
*
* @param mixed $parser A AbstractParser instance, or a format name ('XML', 'YAML', 'JSON', 'CSV')
* @param boolean $usePrefix (optional) If true, the returned element keys will be prefixed with the
2  src/Propel/Runtime/Collection/ObjectCollection.php
View
@@ -212,7 +212,7 @@ public function getArrayCopy($keyColumn = null, $usePrefix = false)
/**
* Get an associative array representation of the collection
* The first parameter specifies the column to be used for the key,
- * And the seconf for the value.
+ * And the second for the value.
*
* <code>
* $res = $coll->toKeyValue('Id', 'Name');
8 src/Propel/Runtime/Collection/OnDemandCollection.php
View
@@ -129,7 +129,7 @@ public function offsetExists($offset)
return true;
}
- throw new PropelException('The On Demand Collection does not allow acces by offset');
+ throw new PropelException('The On Demand Collection does not allow access by offset');
}
/**
@@ -144,7 +144,7 @@ public function offsetGet($offset)
return $this->currentRow;
}
- throw new PropelException('The On Demand Collection does not allow acces by offset');
+ throw new PropelException('The On Demand Collection does not allow access by offset');
}
/**
@@ -223,12 +223,12 @@ public function exchangeArray($input)
public function getArrayCopy()
{
- throw new PropelException('The On Demand Collection does not allow acces by offset');
+ throw new PropelException('The On Demand Collection does not allow access by offset');
}
public function getFlags()
{
- throw new PropelException('The On Demand Collection does not allow acces by offset');
+ throw new PropelException('The On Demand Collection does not allow access by offset');
}
public function ksort()
2  src/Propel/Runtime/Collection/OnDemandIterator.php
View
@@ -94,7 +94,7 @@ public function key()
}
/**
- * Advances the curesor in the statement
+ * Advances the cursor in the statement
* Closes the cursor if the end of the statement is reached
*/
public function next()
2  src/Propel/Runtime/Connection/ConnectionInterface.php
View
@@ -35,7 +35,7 @@ public function getName();
* While autocommit mode is turned off, changes made to the database via
* the Connection object instance are not committed until you end the
* transaction by calling Connection::commit().
- * Calling Conneciton::rollBack() will roll back all changes to the database
+ * Calling Connection::rollBack() will roll back all changes to the database
* and return the connection to autocommit mode.
*
* @return boolean TRUE on success or FALSE on failure.
4 src/Propel/Runtime/Map/TableMap.php
View
@@ -150,7 +150,7 @@ public function __construct($name = null, $dbMap = null)
/**
* Initialize the TableMap to build columns, relations, etc
- * This method should be overridden by descendents
+ * This method should be overridden by descendants
*/
public function initialize()
{
@@ -543,7 +543,7 @@ public function getForeignKeys()
/**
* Build relations
* Relations are lazy loaded for performance reasons
- * This method should be overridden by descendents
+ * This method should be overridden by descendants
*/
public function buildRelations()
{
2  src/Propel/Runtime/Om/BaseObject.php
View
@@ -143,7 +143,7 @@ public function setDeleted($b)
/**
* Code to be run before persisting the object
* @param ConnectionInterface $con
- * @return bloolean
+ * @return boolean
*/
public function preSave(ConnectionInterface $con = null)
{
2  src/Propel/Runtime/Om/NodeObject.php
View
@@ -71,7 +71,7 @@ public function getPath(ConnectionInterface $con = null);
public function getNumberOfChildren(ConnectionInterface $con = null);
/**
- * Gets the total number of desceandants for the node
+ * Gets the total number of descendants for the node
*
* @param ConnectionInterface $con Connection to use.
* @return int
4 src/Propel/Runtime/Propel.php
View
@@ -45,7 +45,7 @@ class Propel
const DEFAULT_NAME = "default";
/**
- * A constant defining 'System is unusuable' logging level
+ * A constant defining 'System is unusable' logging level
*/
const LOG_EMERG = 550;
@@ -271,7 +271,7 @@ public static function getLogger()
/**
* Logs a message
- * If a logger has been configured, the logger will be used, otherwrise the
+ * If a logger has been configured, the logger will be used, otherwise the
* logging message will be discarded without any further action
*
* @param string The message that will be logged.
18 src/Propel/Runtime/Query/Criteria.php
View
@@ -187,7 +187,7 @@ class Criteria implements \IteratorAggregate
protected $having = null;
/**
- * Storage of join data. colleciton of Join objects.
+ * Storage of join data. collection of Join objects.
* @var array
*/
protected $joins = array();
@@ -208,7 +208,7 @@ class Criteria implements \IteratorAggregate
*/
protected $primaryTableName;
- /** The name of the database as given in the contructor. */
+ /** The name of the database as given in the constructor. */
protected $originalDbName;
/**
@@ -253,7 +253,7 @@ class Criteria implements \IteratorAggregate
* Creates a new instance with the default capacity which corresponds to
* the specified database.
*
- * @param dbName The dabase name.
+ * @param dbName The database name.
*/
public function __construct($dbName = null)
{
@@ -1198,7 +1198,7 @@ public function getLimit()
* Set offset.
*
* @param int $offset An int with the value for offset. (Note this values is
- * cast to a 32bit integer and may result in truncatation)
+ * cast to a 32bit integer and may result in truncation)
* @return Criteria Modified Criteria object (for fluent API)
*/
public function setOffset($offset)
@@ -1520,7 +1520,7 @@ public function equals($crit)
*
* @param Criteria $criteria The criteria to read properties from
* @param string $operator The logical operator used to combine conditions
- * Defaults to Criteria::LOGICAL_AND, also accapts Criteria::LOGICAL_OR
+ * Defaults to Criteria::LOGICAL_AND, also accepts Criteria::LOGICAL_OR
* This parameter is deprecated, use _or() instead
*
@@ -1631,15 +1631,15 @@ public function addHaving($p1, $value = null, $comparison = null)
*
* This method has multiple signatures, and behaves differently according to it:
*
- * - If the first argument is a Criterion, it just resturns this Criterion.
- * <code>$c->getCriterionForConsition($criterion); // returns $criterion</code>
+ * - If the first argument is a Criterion, it just returns this Criterion.
+ * <code>$c->getCriterionForCondition($criterion); // returns $criterion</code>
*
* - If the last argument is a PDO::PARAM_* constant value, create a Criterion
* using Criteria::RAW and $comparison as a type.
- * <code>$c->getCriterionForConsition('foo like ?', '%bar%', PDO::PARAM_STR);</code>
+ * <code>$c->getCriterionForCondition('foo like ?', '%bar%', PDO::PARAM_STR);</code>
*
* - Otherwise, create a classic Criterion based on a column name and a comparison.
- * <code>$c->getCriterionForConsition(BookPeer::TITLE, 'War%', Criteria::LIKE);</code>
+ * <code>$c->getCriterionForCondition(BookPeer::TITLE, 'War%', Criteria::LIKE);</code>
*
* @param mixed $p1 A Criterion, or a SQL clause with a question mark placeholder, or a column name
* @param mixed $value The value to bind in the condition
4 src/Propel/Runtime/Query/Criterion.php
View
@@ -520,8 +520,8 @@ public function hashCode()
foreach ($this->clauses as $clause) {
// TODO: i KNOW there is a php incompatibility with the following line
- // but i dont remember what it is, someone care to look it up and
- // replace it if it doesnt bother us?
+ // but i don't remember what it is, someone care to look it up and
+ // replace it if it doesn't bother us?
// $clause->appendPsTo($sb='',$params=array());
$sb = '';
$params = array();
28 src/Propel/Runtime/Query/ModelCriteria.php
View
@@ -166,7 +166,7 @@ public function getModelAliasOrName()
}
/**
- * Return The short model name (the short ClassName for classe with namespace)
+ * Return The short model name (the short ClassName for class with namespace)
*
* @return string The short model name
*/
@@ -413,7 +413,7 @@ public function orderBy($columnName, $order = Criteria::ASC)
}
/**
- * Adds a GROUB BY clause to the query
+ * Adds a GROUP BY clause to the query
* Usability layer on top of Criteria::addGroupByColumn()
* Infers $column $columnName
* Examples:
@@ -433,7 +433,7 @@ public function groupBy($columnName)
}
/**
- * Adds a GROUB BY clause for all columns of a model to the query
+ * Adds a GROUP BY clause for all columns of a model to the query
* Examples:
* $c->groupBy('Book');
* => $c->addGroupByColumn(BookPeer::ID);
@@ -977,7 +977,7 @@ public function endUse()
*
* @param Criteria $criteria The criteria to read properties from
* @param string $operator The logical operator used to combine conditions
- * Defaults to Criteria::LOGICAL_AND, also accapts Criteria::LOGICAL_OR
+ * Defaults to Criteria::LOGICAL_AND, also accepts Criteria::LOGICAL_OR
*
* @return ModelCriteria The primary criteria object
*/
@@ -1138,9 +1138,9 @@ public static function getRelationName($relation)
/**
* Triggers the automated cloning on termination.
- * By default, temrination methods don't clone the current object,
+ * By default, termination methods don't clone the current object,
* even though they modify it. If the query must be reused after termination,
- * you must call this method prior to temrination.
+ * you must call this method prior to termination.
*
* @param boolean $isKeepQuery
*
@@ -1675,9 +1675,9 @@ public function doDeleteAll($con)
/**
* Code to execute before every UPDATE statement
*
- * @param array $values The associatiove array of columns and values for the update
+ * @param array $values The associative array of columns and values for the update
* @param ConnectionInterface $con The connection object used by the query
- * @param boolean $forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), ortherwise it is a series of save() calls on all the found objects
+ * @param boolean $forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), otherwise it is a series of save() calls on all the found objects
*/
protected function basePreUpdate(&$values, ConnectionInterface $con, $forceIndividualSaves = false)
{
@@ -1711,7 +1711,7 @@ protected function postUpdate($affectedRows, ConnectionInterface $con)
*
* @param array $values Associative array of keys and values to replace
* @param ConnectionInterface $con an optional connection object
- * @param boolean $forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), ortherwise it is a series of save() calls on all the found objects
+ * @param boolean $forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), otherwise it is a series of save() calls on all the found objects
*
* @return integer Number of updated rows
*/
@@ -1755,7 +1755,7 @@ public function update($values, $con = null, $forceIndividualSaves = false)
*
* @param array $values Associative array of keys and values to replace
* @param ConnectionInterface $con a connection object
- * @param boolean $forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), ortherwise it is a series of save() calls on all the found objects
+ * @param boolean $forceIndividualSaves If false (default), the resulting call is a BasePeer::doUpdate(), otherwise it is a series of save() calls on all the found objects
*
* @return integer Number of updated rows
*/
@@ -2087,7 +2087,7 @@ protected function getColumnFromSubQuery($class, $phpName, $failSilently = true)
protected function getRealColumnName($columnName)
{
if (!$this->getTableMap()->hasColumnByPhpName($columnName)) {
- throw new UnknownColumnException('Unkown column ' . $columnName . ' in model ' . $this->modelName);
+ throw new UnknownColumnException('Unknown column ' . $columnName . ' in model ' . $this->modelName);
}
if ($this->useAliasInSQL) {
@@ -2108,7 +2108,7 @@ protected function getRealColumnName($columnName)
*
* @param string $colName the fully qualified column name, e.g 'book.TITLE' or BookPeer::TITLE
*
- * @return string the fully qualified column name, using table alias if applicatble
+ * @return string the fully qualified column name, using table alias if applicable
*/
public function getAliasedColName($colName)
{
@@ -2120,7 +2120,7 @@ public function getAliasedColName($colName)
}
/**
- * Return the short ClassName for classe with namespace
+ * Return the short ClassName for class with namespace
*
* @param string $fullyQualifiedClassName The fully qualified class name
*
@@ -2241,7 +2241,7 @@ public function __call($name, $arguments)
$type = substr($name, 0, $pos);
if (in_array($type, array('left', 'right', 'inner'))) {
$joinType = strtoupper($type) . ' JOIN';
- // Test if first argument is suplied, else don't provide an alias to joinXXX (default value)
+ // Test if first argument is supplied, else don't provide an alias to joinXXX (default value)
if (!isset($arguments[0])) {
$arguments[0] = null;
}
4 src/Propel/Runtime/Query/ModelCriterion.php
View
@@ -274,8 +274,8 @@ public function hashCode()
foreach ($this->clauses as $clause) {
// TODO: i KNOW there is a php incompatibility with the following line
- // but i dont remember what it is, someone care to look it up and
- // replace it if it doesnt bother us?
+ // but i don't remember what it is, someone care to look it up and
+ // replace it if it doesn't bother us?
// $clause->appendPsTo($sb='',$params=array());
$sb = '';
$params = array();
2  src/Propel/Runtime/ServiceContainer/ServiceContainerInterface.php
View
@@ -33,7 +33,7 @@
const DEFAULT_DATASOURCE_NAME = 'default';
/**
- * The name of the defautl Profiler class created by getProfiler()
+ * The name of the default Profiler class created by getProfiler()
*/
const DEFAULT_PROFILER_CLASS = '\Propel\Runtime\Util\Profiler';
2  src/Propel/Runtime/ServiceContainer/StandardServiceContainer.php
View
@@ -346,7 +346,7 @@ public function setConnection($name, ConnectionInterface $connection)
/**
* Override the default profiler class.
*
- * The service container uses this class to instanctiate a new profiler when
+ * The service container uses this class to instantiate a new profiler when
* getProfiler() is called.
*
* @param string $profilerClass
2  src/Propel/Runtime/Util/PropelColumnTypes.php
View
@@ -80,7 +80,7 @@ class PropelColumnTypes
);
/**
- * Resturns the PDO type (PDO::PARAM_* constant) value for the Propel type provided.
+ * Returns the PDO type (PDO::PARAM_* constant) value for the Propel type provided.
* @param string $propelType
* @return int
*/
2  src/Propel/Runtime/Util/PropelConditionalProxy.php
View
@@ -104,7 +104,7 @@ public function _endif()
}
/**
- * return the current conditionnal status
+ * return the current conditional status
*
* @return boolean
*/
2  src/Propel/Runtime/Util/PropelDateTime.php
View
@@ -17,7 +17,7 @@
* DateTime subclass which supports serialization.
*
* Currently Propel is not using this for storing date/time objects
- * within model objeects; however, we are keeping it in the repository
+ * within model objects; however, we are keeping it in the repository
* because it is useful if you want to store a DateTime object in a session.
*
* @author Alan Pinstein
2  src/Propel/Runtime/Util/PropelModelPager.php
View
@@ -185,7 +185,7 @@ public function getFirstIndex()
/**
* Get the index of the last element in the page
- * Always less than or eaqual to $maxPerPage
+ * Always less than or equal to $maxPerPage
*
* @return int
*/
2  tests/Fixtures/bookstore-packaged/build.properties.dist
View
@@ -19,7 +19,7 @@ propel.mysql.tableType = InnoDB
propel.database.user = ##DATABASE_USER##
propel.database.password = ##DATABASE_PASSWORD##
-# propel.database.createUrl = (doesn't aply for SQLite, since db is auto-created)
+# propel.database.createUrl = (doesn't apply for SQLite, since db is auto-created)
propel.targetPackage = bookstore-packaged
propel.packageObjectModel = true
2  tests/Fixtures/bookstore/build.properties.dist
View
@@ -22,7 +22,7 @@ propel.database.user = ##DATABASE_USER##
propel.database.password = ##DATABASE_PASSWORD##
# Note that if you do not wish to specify the database (e.g. if you
-# are using multiple databses) you can use the @DB@ token which
+# are using multiple databases) you can use the @DB@ token which
# will be replaced with a database at runtime.
# E.g.: propel.database.url = sqlite://localhost/./test/@DB@.db
# This will work for the datadump and the insert-sql tasks.
2  tests/Fixtures/namespaced/build.properties.dist
View
@@ -21,7 +21,7 @@ propel.database.user = ##DATABASE_USER##
propel.database.password = ##DATABASE_PASSWORD##
# Note that if you do not wish to specify the database (e.g. if you
-# are using multiple databses) you can use the @DB@ token which
+# are using multiple databases) you can use the @DB@ token which
# will be replaced with a database at runtime.
# E.g.: propel.database.url = sqlite://localhost/./test/@DB@.db
# This will work for the datadump and the insert-sql tasks.
2  tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorTest.php
View
@@ -72,7 +72,7 @@ public function testParentBehavior()
{
$behaviors = ConcreteContentPeer::getTableMap()->getBehaviors();
$this->assertTrue(array_key_exists('concrete_inheritance_parent', $behaviors), 'modifyTable() gives the parent table the concrete_inheritance_parent behavior');
- $this->assertEquals('descendant_class', $behaviors['concrete_inheritance_parent']['descendant_column'], 'modifyTable() passed the descendent_column parameter to the parent behavior');
+ $this->assertEquals('descendant_class', $behaviors['concrete_inheritance_parent']['descendant_column'], 'modifyTable() passed the descendant_column parameter to the parent behavior');
}
public function testModifyTableAddsParentColumn()
2  tests/Propel/Tests/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehaviorWithSchemaTest.php
View
@@ -28,7 +28,7 @@ public function testParentBehaviorWithSchemas()
{
$behaviors = BookPeer::getTableMap()->getBehaviors();
$this->assertTrue(array_key_exists('concrete_inheritance_parent', $behaviors), 'modifyTable() gives the parent table the concrete_inheritance_parent behavior');
- $this->assertEquals('descendant_class', $behaviors['concrete_inheritance_parent']['descendant_column'], 'modifyTable() passed the descendent_column parameter to the parent behavior');
+ $this->assertEquals('descendant_class', $behaviors['concrete_inheritance_parent']['descendant_column'], 'modifyTable() passed the descendant_column parameter to the parent behavior');
}
public function testGetParentOrCreateNewWithSchemas()
2  tests/Propel/Tests/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifierTest.php
View
@@ -310,7 +310,7 @@ public function testTranslationsArePersisted()
$this->assertEquals(2, $count);
}
- public function testClearRemovesExistingTranlsations()
+ public function testClearRemovesExistingTranslations()
{
$o = new \I18nBehaviorTest1();
$translation1 = new \I18nBehaviorTest1I18n();
4 tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifierTest.php
View
@@ -342,7 +342,7 @@ public function testHasPrevSibling()
$this->assertFalse($t0->hasPrevSibling(), 'empty node has no previous sibling');
$this->assertFalse($t1->hasPrevSibling(), 'root node has no previous sibling');
$this->assertFalse($t2->hasPrevSibling(), 'first sibling has no previous sibling');
- $this->assertTrue($t3->hasPrevSibling(), 'not first sibling has a previous siblingt');
+ $this->assertTrue($t3->hasPrevSibling(), 'not first sibling has a previous sibling');
}
public function testGetPrevSibling()
@@ -670,7 +670,7 @@ public function testGetBranch()
't6' => array(8, 9, 3),
't7' => array(10, 11, 3),
);
- $this->assertEquals($expected, $this->dumpNodes($descendants), 'getBranch() returns an array of descendants, uncluding the current node');
+ $this->assertEquals($expected, $this->dumpNodes($descendants), 'getBranch() returns an array of descendants, including the current node');
$c = new Criteria();
$c->add(Table9Peer::TITLE, 't3', Criteria::NOT_EQUAL);
$descendants = $t3->getBranch($c);
2  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorPeerBuilderModifierWithScopeTest.php
View
@@ -213,7 +213,7 @@ public function testShiftLevel()
't6' => array(8, 9, 4),
't7' => array(10, 11, 4),
);
- $this->assertEquals($this->dumpTreeWithScope(1), $expected, 'shiftLevel can shift level whith a scope');
+ $this->assertEquals($this->dumpTreeWithScope(1), $expected, 'shiftLevel can shift level with a scope');
$expected = array(
't8' => array(1, 6, 0),
't9' => array(2, 3, 1),
4 tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierTest.php
View
@@ -43,13 +43,13 @@ public function testDescendantsOf()
->orderByBranch()
->find();
$coll = $this->buildCollection(array());
- $this->assertEquals($coll, $objs, 'decendantsOf() filters by descendants');
+ $this->assertEquals($coll, $objs, 'descendantsOf() filters by descendants');
$objs = Table9Query::create()
->descendantsOf($t3)
->orderByBranch()
->find();
$coll = $this->buildCollection(array($t4, $t5, $t6, $t7));
- $this->assertEquals($coll, $objs, 'decendantsOf() filters by descendants');
+ $this->assertEquals($coll, $objs, 'descendantsOf() filters by descendants');
}
public function testBranchOf()
2  tests/Propel/Tests/Generator/Behavior/NestedSet/NestedSetBehaviorQueryBuilderModifierWithScopeTest.php
View
@@ -103,7 +103,7 @@ public function testDescendantsOf()
->orderByBranch()
->find();
$coll = $this->buildCollection(array($t2, $t3, $t4, $t5, $t6, $t7));
- $this->assertEquals($coll, $objs, 'decendantsOf() filters by descendants of the same scope');
+ $this->assertEquals($coll, $objs, 'descendantsOf() filters by descendants of the same scope');
}
public function testBranchOf()
4 tests/Propel/Tests/Generator/Behavior/Sluggable/SluggableBehaviorTest.php
View
@@ -173,7 +173,7 @@ public function testObjectPreSave()
$t = new Table14();
$t->setTitle('Hello, World');
$t->save();
- $this->assertEquals('/foo/hello-world/bar', $t->getSlug(), 'preSave() sets a cleanued up slug for objects');
+ $this->assertEquals('/foo/hello-world/bar', $t->getSlug(), 'preSave() sets a cleaned up slug for objects');
$t = new Table14();
$t->setTitle('Hello, World');
$t->save();
@@ -249,7 +249,7 @@ public function testObjectSlugAutoUpdatePermanent()
public function testQueryFindOneBySlug()
{
$this->assertTrue(method_exists('\Propel\Tests\Bookstore\Behavior\Table13Query', 'findOneBySlug'), 'The generated query provides a findOneBySlug() method');
- $this->assertTrue(method_exists('\Propel\Tests\Bookstore\Behavior\Table14Query', 'findOneBySlug'), 'The generated query provides a findOneBySlug() method even if the slug column doesnt have the default name');
+ $this->assertTrue(method_exists('\Propel\Tests\Bookstore\Behavior\Table14Query', 'findOneBySlug'), 'The generated query provides a findOneBySlug() method even if the slug column doesn\'t have the default name');
Table14Query::create()->deleteAll();
$t1 = new Table14();
4 tests/Propel/Tests/Generator/Builder/NamespaceTest.php
View
@@ -95,8 +95,8 @@ public function testBasicQuery()
\Baz\NamespacedPublisherQuery::create()->deleteAll();
$noNamespacedBook = \Foo\Bar\NamespacedBookQuery::create()->findOne();
$this->assertNull($noNamespacedBook);
- $noPublihser = \Baz\NamespacedPublisherQuery::create()->findOne();
- $this->assertNull($noPublihser);
+ $noPublisher = \Baz\NamespacedPublisherQuery::create()->findOne();
+ $this->assertNull($noPublisher);
}
public function testFind()
2  tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectLobTest.php
View
@@ -30,7 +30,7 @@
* object operations. The _idea_ here is to test every possible generated method
* from Object.tpl; if necessary, bookstore will be expanded to accommodate this.
*
- * The database is relaoded before every test and flushed after every test. This
+ * The database is reloaded before every test and flushed after every test. This
* means that you can always rely on the contents of the databases being the same
* for each test method in this class. See the BookstoreDataPopulator::populate()
* method for the exact contents of the database.
10 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectRelTest.php
View
@@ -45,7 +45,7 @@
* object operations. The _idea_ here is to test every possible generated method
* from Object.tpl; if necessary, bookstore will be expanded to accommodate this.
*
- * The database is relaoded before every test and flushed after every test. This
+ * The database is reloaded before every test and flushed after every test. This
* means that you can always rely on the contents of the databases being the same
* for each test method in this class. See the BookstoreDataPopulator::populate()
* method for the exact contents of the database.
@@ -166,8 +166,8 @@ public function testManyToMany_Dir2_Saved()
public function testManyToManyGetterExists()
{
- $this->assertTrue(method_exists('Propel\Tests\Bookstore\BookClubList', 'getBooks'), 'Object generator correcly adds getter for the crossRefFk');
- $this->assertFalse(method_exists('Propel\Tests\Bookstore\BookClubList', 'getBookClubLists'), 'Object generator correcly adds getter for the crossRefFk');
+ $this->assertTrue(method_exists('Propel\Tests\Bookstore\BookClubList', 'getBooks'), 'Object generator correctly adds getter for the crossRefFk');
+ $this->assertFalse(method_exists('Propel\Tests\Bookstore\BookClubList', 'getBookClubLists'), 'Object generator correctly adds getter for the crossRefFk');
}
public function testManyToManyGetterNewObject()
@@ -199,8 +199,8 @@ public function testManyToManyGetter()
public function testManyToManyCounterExists()
{
- $this->assertTrue(method_exists('Propel\Tests\Bookstore\BookClubList', 'countBooks'), 'Object generator correcly adds counter for the crossRefFk');
- $this->assertFalse(method_exists('Propel\Tests\Bookstore\BookClubList', 'countBookClubLists'), 'Object generator correcly adds counter for the crossRefFk');
+ $this->assertTrue(method_exists('Propel\Tests\Bookstore\BookClubList', 'countBooks'), 'Object generator correctly adds counter for the crossRefFk');
+ $this->assertFalse(method_exists('Propel\Tests\Bookstore\BookClubList', 'countBookClubLists'), 'Object generator correctly adds counter for the crossRefFk');
}
public function testManyToManyCounterNewObject()
16 tests/Propel/Tests/Generator/Builder/Om/GeneratedObjectTest.php
View
@@ -62,7 +62,7 @@
* object operations. The _idea_ here is to test every possible generated method
* from Object.tpl; if necessary, bookstore will be expanded to accommodate this.
*
- * The database is relaoded before every test and flushed after every test. This
+ * The database is reloaded before every test and flushed after every test. This
* means that you can always rely on the contents of the databases being the same
* for each test method in this class. See the BookstoreDataPopulator::populate()
* method for the exact contents of the database.
@@ -144,7 +144,7 @@ public function testDefaultValues()
* @link http://propel.phpdb.org/trac/ticket/378