Permalink
Browse files

Removed trailing spaces

  • Loading branch information...
1 parent e537cf5 commit 0ba5f543682d5f20a2bff3b6ca1f000e72352760 rozwell committed May 2, 2011
Showing with 260 additions and 260 deletions.
  1. +1 −1 INSTALL.md
  2. +3 −3 README.md
  3. +2 −2 config/sfPropel15PluginConfiguration.class.php
  4. +5 −5 data/generator/sfPropelModule/admin/template/templates/_assets.php
  5. +1 −1 data/generator/sfPropelModule/admin15/parts/configuration.php
  6. +1 −1 data/generator/sfPropelModule/admin15/parts/indexAction.php
  7. +2 −2 data/generator/sfPropelModule/admin15/parts/paginationAction.php
  8. +4 −4 data/generator/sfPropelModule/admin15/parts/sortingAction.php
  9. +5 −5 data/generator/sfPropelModule/admin15/template/templates/_assets.php
  10. +2 −2 doc/database.md
  11. +9 −9 doc/form.md
  12. +11 −11 doc/schema.md
  13. +3 −3 i18n/sf_admin.ca.xml
  14. +2 −2 i18n/sf_admin.cs.xml
  15. +1 −1 i18n/sf_admin.nl.xml
  16. +1 −1 i18n/sf_admin.pl.xml
  17. +1 −1 lib/addon/sfPropel.class.php
  18. +4 −4 lib/addon/sfPropelData.class.php
  19. +2 −2 lib/addon/sfPropelDatabaseSchema.class.php
  20. +4 −4 lib/behavior/SfPropelBehaviorI18n.php
  21. +1 −1 lib/debug/sfWebDebugPanelPropel.class.php
  22. +1 −1 lib/form/sfFormFilterPropel.class.php
  23. +42 −42 lib/form/sfFormPropel.class.php
  24. +13 −13 lib/form/sfFormPropelCollection.class.php
  25. +1 −1 lib/generator/sfPropelFormGenerator.class.php
  26. +16 −16 lib/generator/sfPropelGenerator.class.php
  27. +4 −4 lib/routing/sfPropel15Route.class.php
  28. +1 −1 lib/routing/sfPropel15RouteCollection.class.php
  29. +1 −1 lib/task/phing/tasks/defaults.properties
  30. +8 −8 lib/task/sfPropelBaseTask.class.php
  31. +8 −8 lib/task/sfPropelDiffTask.class.php
  32. +7 −7 lib/task/sfPropelMigrateDownTask.class.php
  33. +7 −7 lib/task/sfPropelMigrateTask.class.php
  34. +5 −5 lib/task/sfPropelMigrateUpTask.class.php
  35. +4 −4 lib/task/sfPropelStatusTask.class.php
  36. +2 −2 lib/validator/sfValidatorSchemaRemove.php
  37. +2 −2 lib/widget/sfWidgetFormDelete.class.php
  38. +1 −1 lib/widget/sfWidgetFormPlain.php
  39. +2 −2 lib/widget/sfWidgetFormPropelChoice.class.php
  40. +4 −4 lib/widget/sfWidgetFormSchemaDecoratorEscaped.class.php
  41. +3 −3 lib/widget/sfWidgetFormSchemaOptional.class.php
  42. +6 −6 package.xml.tmpl
  43. +1 −1 test/bootstrap/unit.php
  44. +1 −1 test/functional/crud/crud2Test.php
  45. +1 −1 test/functional/crud/crud3Test.php
  46. +1 −1 test/functional/crud/crud6Test.php
  47. +1 −1 test/functional/crud/crud7Test.php
  48. +1 −1 test/functional/crud/rest1Test.php
  49. +1 −1 test/functional/crud/rest2Test.php
  50. +1 −1 test/functional/fixtures/config/propel.ini
  51. +1 −1 test/functional/fixtures/lib/form/BaseForm.class.php
  52. +2 −2 test/functional/fixtures/lib/model/Article.php
  53. +2 −2 test/functional/fixtures/lib/model/ArticlePeer.php
  54. +1 −1 test/functional/fixtures/lib/model/ArticleQuery.php
  55. +2 −2 test/functional/fixtures/lib/model/Attachment.php
  56. +2 −2 test/functional/fixtures/lib/model/AttachmentPeer.php
  57. +1 −1 test/functional/fixtures/lib/model/AttachmentQuery.php
  58. +2 −2 test/functional/fixtures/lib/model/AuthorArticle.php
  59. +2 −2 test/functional/fixtures/lib/model/AuthorArticlePeer.php
  60. +1 −1 test/functional/fixtures/lib/model/AuthorArticleQuery.php
  61. +2 −2 test/functional/fixtures/lib/model/AuthorPeer.php
  62. +1 −1 test/functional/fixtures/lib/model/AuthorQuery.php
  63. +2 −2 test/functional/fixtures/lib/model/BookPeer.php
  64. +1 −1 test/functional/fixtures/lib/model/BookQuery.php
  65. +2 −2 test/functional/fixtures/lib/model/CategoryPeer.php
  66. +1 −1 test/functional/fixtures/lib/model/CategoryQuery.php
  67. +2 −2 test/functional/fixtures/lib/model/Movie.php
  68. +2 −2 test/functional/fixtures/lib/model/MovieI18n.php
  69. +2 −2 test/functional/fixtures/lib/model/MovieI18nPeer.php
  70. +1 −1 test/functional/fixtures/lib/model/MovieI18nQuery.php
  71. +2 −2 test/functional/fixtures/lib/model/MoviePeer.php
  72. +1 −1 test/functional/fixtures/lib/model/MovieQuery.php
  73. +1 −1 test/functional/fixtures/lib/model/Product.php
  74. +1 −1 test/functional/fixtures/lib/model/ProductI18n.php
  75. +1 −1 test/functional/fixtures/lib/model/ProductI18nPeer.php
  76. +1 −1 test/functional/fixtures/lib/model/ProductI18nQuery.php
  77. +1 −1 test/functional/fixtures/lib/model/ProductPeer.php
  78. +1 −1 test/functional/fixtures/lib/model/ProductQuery.php
  79. +1 −1 test/functional/fixtures/symfony
  80. +1 −1 test/functional/formTest.php
  81. +2 −2 test/functional/i18nTest.php
  82. +2 −2 test/functional/pagerTest.php
  83. +1 −1 test/functional/poolingTest.php
  84. +1 −1 test/unit/sfMixerTest.php
View
@@ -12,7 +12,7 @@ This version of sfPropelPlugin doesn't come bundled with the required dependenci
> svn checkout http://svn.propelorm.org/branches/1.6/runtime/lib propel
> svn checkout http://svn.propelorm.org/branches/1.6/generator propel-generator
> cd ../../..
-
+
Now the classic install continues.
Right after the installation of the plugin, you should update plugin assets:
View
@@ -45,7 +45,7 @@ Change the path of the symfony behaviors in the `config/propel.ini` file of your
What's New In Propel 1.5
------------------------
-Propel 1.5 is a **backwards compatible** evolution of Propel 1.4 (the version bundled with symfony 1.3 and 1.4), which adds some very interesting features. Among these features, you will find the **new Propel Query API**, which is essentially a Criteria on steroids:
+Propel 1.5 is a **backwards compatible** evolution of Propel 1.4 (the version bundled with symfony 1.3 and 1.4), which adds some very interesting features. Among these features, you will find the **new Propel Query API**, which is essentially a Criteria on steroids:
[php]
// find the 10 latest books published by authror 'Leo'
@@ -118,7 +118,7 @@ The new options for the `admin15` generator theme are fully documented, and illu
Form Subframework Modifications
-------------------------------
-- **Updated `sfWidgetFormPropelChoice` widget**: The widget now uses the new Query API. You can customize the list of choices more easily by executing custom query methods, using the new `query_methods` option.
+- **Updated `sfWidgetFormPropelChoice` widget**: The widget now uses the new Query API. You can customize the list of choices more easily by executing custom query methods, using the new `query_methods` option.
- **Updated Propel validators**: Both the `sfValidatorPropelChoice` and the `sfValidatorPropelUnique` were updated to use the new PropelQuery objects, and to accept a `query_methods` option similar to the one of `sfWidgetFormPropelChoice`.
- **Plain text widget and validator**: This new widget allows a field to be displayed in a form, without letting the use change it.
- **Easy Relation Embed**: Editing related objects together with the main objects (e.g., editing `Comments` in a `Post` form) is a piece of cake. The new `sfFormPropel::embedRelation()` method does all the work to fetch related objects, build the forms for each of them, and embed the related object forms into the main form. Embdeded relation forms allow to **edit**, **add**, and **delete** a related objects with no additional code.
@@ -147,7 +147,7 @@ The plugin offer two new routing classes, `sfPropel15Route` and `sfPropel15Route
module: author
prefix_path: /author
column: id
- query_methods:
+ query_methods:
object: [filterByIsPublished]
list: [filterByIsPublished, orderByLastName]
with_wildcard_routes: true
@@ -2,7 +2,7 @@
/**
* sfPropelPlugin configuration.
- *
+ *
* @package sfPropelPlugin
* @subpackage config
* @author Fabien Potencier <fabien.potencier@symfony-project.com>
@@ -58,7 +58,7 @@ public function initialize()
/**
* Clears all instance pools.
- *
+ *
* This method is used to clear Propel's static instance pools between
* requests performed in functional tests.
*/
@@ -1,6 +1,6 @@
-<?php if (isset($this->params['css']) && ($this->params['css'] !== false)): ?>
-[?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?]
-<?php elseif(!isset($this->params['css'])): ?>
-[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/global.css' ?>', 'first') ?]
-[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/default.css' ?>', 'first') ?]
+<?php if (isset($this->params['css']) && ($this->params['css'] !== false)): ?>
+[?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?]
+<?php elseif(!isset($this->params['css'])): ?>
+[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/global.css' ?>', 'first') ?]
+[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/default.css' ?>', 'first') ?]
<?php endif; ?>
@@ -50,7 +50,7 @@ public function getWiths()
return <?php echo $this->asPhp(isset($this->config['list']['with']) ? $this->config['list']['with'] : array()) ?>;
<?php unset($this->config['list']['with']) ?>
}
-
+
public function getQueryMethods()
{
return <?php echo $this->asPhp(isset($this->config['list']['query_methods']) ? $this->config['list']['query_methods'] : array()) ?>;
@@ -5,7 +5,7 @@ public function executeIndex(sfWebRequest $request)
{
$this->setFilters($request->getParameter('filters'));
}
-
+
// sorting
if ($request->getParameter('sort'))
{
@@ -30,7 +30,7 @@ protected function buildQuery()
<?php else: ?>
$query = PropelQuery::from('<?php echo $this->getModelClass() ?>');
<?php endif; ?>
-
+
foreach ($this->configuration->getWiths() as $with) {
$query->joinWith($with);
}
@@ -47,7 +47,7 @@ protected function buildQuery()
}
$this->processSort($query);
-
+
$event = $this->dispatcher->filter(new sfEvent($this, 'admin.build_criteria'), $query);
$query = $event->getReturnValue();
@@ -1,5 +1,5 @@
<?php
-$customSorts = array();
+$customSorts = array();
foreach ($this->configuration->getValue('list.display') as $name => $field)
{
if ($customSort = $field->getConfig('sort_method', false, false))
@@ -26,7 +26,7 @@ protected function processSort($query)
return;
}
-<?php endif ?>
+<?php endif ?>
try
{
$column = <?php echo constant($this->getModelClass().'::PEER') ?>::translateFieldName($sort[0], BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
@@ -36,9 +36,9 @@ protected function processSort($query)
// probably a fake column, using a custom orderByXXX() query method
$column = sfInflector::camelize($sort[0]);
}
-
+
$method = sprintf('orderBy%s', $column);
-
+
try
{
$query->$method('asc' == $sort[1] ? 'asc' : 'desc');
@@ -1,6 +1,6 @@
-<?php if (isset($this->params['css']) && ($this->params['css'] !== false)): ?>
-[?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?]
-<?php elseif(!isset($this->params['css'])): ?>
-[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/global.css' ?>', 'first') ?]
-[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/default.css' ?>', 'first') ?]
+<?php if (isset($this->params['css']) && ($this->params['css'] !== false)): ?>
+[?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?]
+<?php elseif(!isset($this->params['css'])): ?>
+[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/global.css' ?>', 'first') ?]
+[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/default.css' ?>', 'first') ?]
<?php endif; ?>
View
@@ -16,11 +16,11 @@ Symfony is to specify slave servers for each connection in config/databases.yml
dsn: mysql:dbname=test;host=mysql-master
username: root
password:
-
+
encoding: utf8
persistent: true
pooling: true
-
+
slaves:
connection:
mysql-slave-01:
View
@@ -18,15 +18,15 @@ Most of the time, the configuration of this widget and validator is already done
public function setup()
{
// ...
-
+
$this->setWidgets(array(
// ...
'author_id' => new sfWidgetFormPropelChoice(array(
'model' => 'Author',
'add_empty' => true)
),
));
-
+
$this->setValidators(array(
// ...
'author_id' => new sfValidatorPropelChoice(array(
@@ -78,11 +78,11 @@ You can also enable the `query_method` option on an existing widget. For instanc
class ArticleForm extends BaseArticleForm
{
public function configure()
- {
+ {
$this->widgetSchema['author_id']->setOption('query_methods', array('active'));
}
}
-
+
class ArticleQuery extends BaseArticleQuery
{
public function active()
@@ -113,7 +113,7 @@ Alternatively, build the query yourself in the form, and pass it to the widget i
class ArticleForm extends BaseArticleForm
{
public function configure()
- {
+ {
$query = ArticleQuery::create()->filterByIsActive(true);
$this->widgetSchema['author_id']->setOption('criteria', $query);
}
@@ -128,7 +128,7 @@ The `sfWidgetFormPropelChoice` widget supports the following options:
* `model`: The model class (required)
* `add_empty`: Whether to add a first empty value or not (false by default). If the option is not a Boolean, the value will be used as the text value
* `method`: The method to use to display object values (__toString by default)
-* `key_method`: The method to use to display the object keys (getPrimaryKey by default)
+* `key_method`: The method to use to display the object keys (getPrimaryKey by default)
* `order_by`: An array composed of two fields:
* The column to order by the results (must be in the PhpName format)
* asc or desc
@@ -159,7 +159,7 @@ In a blog application, two articles can not have the same slug; to ensure this c
public function configure()
{
// ...
-
+
$this->validatorSchema->setPostValidator(
new sfValidatorPropelUnique(array(
'model' => 'Article',
@@ -183,7 +183,7 @@ This validator supports the following options:
`sfWidgetFormPlain` and `sfValidatorSchemaRemove`
-------------------------------------------------
-To display a field without any possiblity to change its value, no need to use a partial field. Just use the `sfWidgetFormPlain` widget to display the value in a div. Don't forget to disable the validator on that field, too, using the `sfValidatorPass` validator.
+To display a field without any possiblity to change its value, no need to use a partial field. Just use the `sfWidgetFormPlain` widget to display the value in a div. Don't forget to disable the validator on that field, too, using the `sfValidatorPass` validator.
But symfony expects to receive all form fields for binding, including plain fields. If the field is not present in the request, symfony uses a null value, which may erase the data in the column you want to display. To avoid erasing data, use the new `sfValidatorSchemaRemove` to remove plain fields from the binding process. This is a post validator, and it expects an array of field names in the `fields` option.
@@ -226,7 +226,7 @@ If you need to build a form based on a collection of objects rather than on a si
$collection[]= new Book();
$form = new sfFormPropelCollection($collection);
echo $form; // displays a list of 3 BookForms, bound to each element in the collection
-
+
Embedding A Relation Form
-------------------------
View
@@ -10,7 +10,7 @@ Connections and tables can have specific attributes, set under an `_attributes`
propel:
# connection attributes
_attributes: { noXsd: false, defaultIdMethod: none, package: lib.model }
-
+
blog_article:
# table attributes
_attributes: { phpName: Article }
@@ -117,7 +117,7 @@ The common column parameters are as follows:
* `scale`: Number of decimal places for use with decimal data type (size must also be specified)
* `index`: Boolean. Set it to `true` if you want a simple index or to `unique` if you want a unique index to be created on the column.
* `isCulture`: Boolean. Set it to `true` for culture columns in localized content tables (see i18n section).
-
+
Primary key columns accept additional parameters:
* `primaryKey`: Boolean. Set it to `true` for primary keys.
@@ -134,7 +134,7 @@ Foreign key columns accept additional parameters:
* `fkSkipSql`: Set to true for virtual foreign keys, not translated into SQL
### Empty Column Definition
-
+
If you define nothing (`~` in YAML is equivalent to `null` in PHP), symfony will guess the best attributes according to the column name and a few conventions.
[yml]
@@ -144,7 +144,7 @@ If you define nothing (`~` in YAML is equivalent to `null` in PHP), symfony will
blog_id: ~
created_at: ~
updated_at: ~
-
+
# symfony fills the blanks using the following rules
propel:
blog_read:
@@ -215,10 +215,10 @@ Cross-reference tables, used for many-to-many relationships, must declare with a
propel:
blog_article:
# columns definition
-
+
blog_author:
# columns definition
-
+
blog_article_author:
_attributes: { phpName: ArticleAuthor, isCrossRef: true }
article_id: { type: integer, foreignTable: blog_article, foreignReference: id, onDelete: cascade }
@@ -233,7 +233,7 @@ Declaring a table as a cross reference table leads Propel to generate more metho
Author::getArticles()
Author::countArticles()
AuthorQuery::filterByArticle($article)
-
+
I18n Tables
-----------
@@ -269,7 +269,7 @@ Note that you can use the second syntax to be able to see the columns in your YA
Propel Behaviors
----------------
-Enable native Propel behaviors in your tables by setting the `_propel_behaviors` key. For instance, to turn on `soft_delete` on an `Article` table, write the following schema:
+Enable native Propel behaviors in your tables by setting the `_propel_behaviors` key. For instance, to turn on `soft_delete` on an `Article` table, write the following schema:
[yaml]
propel:
@@ -281,13 +281,13 @@ Enable native Propel behaviors in your tables by setting the `_propel_behaviors`
_propel_behaviors:
soft_delete:
-Here is the list of Propel core behaviors available in this plugin:
+Here is the list of Propel core behaviors available in this plugin:
- [timestampable](http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/timestampable): Keep track of the creation and modification date of each record.
- [sluggable](http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/sluggable): Each row gets a unique slug that you can use to make smart URIs
- [soft_delete]([http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/soft_delete): Keep the deleted rows hidden, so that you can recover them.
- [nested_set](http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/nested_set): Handle hierarchichal data with ease; the nested sets algorithm needs only one query to parse a tree in any way.
-- [sortable](http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/sortable): Give rows in a table the ability to be moved up and down of a list, and to retrieve sorted results.
+- [sortable](http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/sortable): Give rows in a table the ability to be moved up and down of a list, and to retrieve sorted results.
- [concrete_inheritance](http://www.propelorm.org/wiki/Documentation/1.5/Inheritance#ConcreteTableInheritance): Copy the structure of a model class to another; also copy the data back to the parent class, for efficient queries.
- [query_cache](http://www.propelorm.org/wiki/Documentation/1.5/Behaviors/query_cache): Speed up often used queries by skipping the query analysis process. Propel will still query the database for results, only faster.
- [alternative_coding_standards](http://www.propelorm.org/xiki/Documentation/1.5/Behaviors/alternative_coding_standards): Use symfony's coding standards in Propel's generated classes.
@@ -345,7 +345,7 @@ Such a schema will generate both a Model and a Query class for `Employee` and `M
EmployeeQuery.php
Manager.php
ManagerQuery.php
-
+
A `PersonQuery` returns mixed results, of class `Person`, `Employee`, and `Manager`, while a `ManagerQuery` returns only objects of class `Manager`:
[php]
View
@@ -81,7 +81,7 @@
<source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
<target>[0] cap resultat|[1] 1 resultat|(1,+Inf] %1% resultats</target>
</trans-unit>
-
+
<!-- Pagination -->
<trans-unit>
<source>First page</source>
@@ -99,8 +99,8 @@
<source>Last page</source>
<target>Última pàgina</target>
</trans-unit>
-
-
+
+
<!-- Form -->
<trans-unit>
<source>The item was created successfully.</source>
View
@@ -41,7 +41,7 @@
<source>go</source>
<target>ok</target>
</trans-unit>
-
+
<!-- Filters -->
<trans-unit>
<source>Reset</source>
@@ -85,7 +85,7 @@
<source>Checked</source>
<target>Aktivováno</target>
</trans-unit>
-
+
<!-- Pagination -->
<trans-unit>
<source>First page</source>
View
@@ -74,7 +74,7 @@
<target>afl</target>
</trans-unit>
<trans-unit>
- <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
+ <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
<target>[0] geen resultaat|[1] 1 resultaat|(1,+Inf] %1% resultaten</target>
</trans-unit>
View
@@ -79,7 +79,7 @@
</trans-unit>
<trans-unit>
<source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
- <target>[0] brak wyników|[1,+Inf] wyników: %1%</target>
+ <target>[0] brak wyników|[1,+Inf] wyników: %1%</target>
</trans-unit>
<!-- Pagination -->
@@ -26,7 +26,7 @@ class sfPropel
*
* @param sfEventDispatcher $dispatcher
* @param string $culture
- *
+ *
* @deprecated Moved to {@link sfPropelPluginConfiguration}
*/
static public function initialize(sfEventDispatcher $dispatcher, $culture = null)
Oops, something went wrong.

0 comments on commit 0ba5f54

Please sign in to comment.