Commit Graph

2026 Commits

Author SHA1 Message Date
Fabien Potencier
b99b1e1e59 Merge remote branch 'kriswallsmith/assetic/dump-fix'
* kriswallsmith/assetic/dump-fix:
  [AsseticBundle] made some methods private
  [AsseticBundle] added a test of dumping in debug mode
  [AsseticBundle] added test of dumping one asset
  [AsseticBundle] added the beginnings of a test class for the assetic:dump command
  [AsseticBundle] updated dump command to dump leaf assets per debug mode
  [AsseticBundle] rearranged execute() method
  [AsseticBundle] moved debug flag to object property
  [AsseticBundle] moved asset manager to object property
  [AsseticBundle] moved base path to object property
2011-05-09 08:51:39 +02:00
Kris Wallsmith
545a7fdcb9 [AsseticBundle] made some methods private 2011-05-07 08:06:48 -07:00
Kris Wallsmith
539ae49f62 [AsseticBundle] added a test of dumping in debug mode 2011-05-07 07:58:29 -07:00
Kris Wallsmith
520941d60d [AsseticBundle] added test of dumping one asset 2011-05-07 07:57:38 -07:00
Kris Wallsmith
6f03a08714 [AsseticBundle] added the beginnings of a test class for the assetic:dump command 2011-05-07 07:32:13 -07:00
Kris Wallsmith
f78be41355 [AsseticBundle] updated dump command to dump leaf assets per debug mode 2011-05-07 07:32:12 -07:00
Christophe Coevoet
0ed6d04a5f [MonologBundle] Moved the handlers to the Bridge namespace 2011-05-07 10:35:19 +02:00
Kris Wallsmith
9e19cac3c0 [AsseticBundle] rearranged execute() method 2011-05-06 19:16:32 -07:00
Kris Wallsmith
547610a631 [AsseticBundle] moved debug flag to object property 2011-05-06 19:13:07 -07:00
Kris Wallsmith
918ece8baf [AsseticBundle] moved asset manager to object property 2011-05-06 19:11:56 -07:00
Kris Wallsmith
a11f18687b [AsseticBundle] moved base path to object property 2011-05-06 17:23:13 -07:00
Fabien Potencier
d1c6e44082 Merge remote branch 'stof/firephp'
* stof/firephp:
  [MonologBundle] Fixed CS
  [MonologBundle] Fixed the handling of subrequests in FirePHPHandler
2011-05-06 22:14:25 +02:00
Christophe Coevoet
e3ae374b47 [DoctrineBundle] Removed orm reference in DoctrineAbstractBundle 2011-05-06 21:53:40 +02:00
Christophe Coevoet
0704bc348b [MonologBundle] Fixed CS 2011-05-06 18:02:32 +02:00
Christophe Coevoet
5afe7d20a6 [MonologBundle] Fixed the handling of subrequests in FirePHPHandler 2011-05-06 18:01:38 +02:00
Fabien Potencier
62c0b10b88 [FrameworkBundle] prevented search engine indexing on exception pages 2011-05-06 12:33:37 +02:00
Fabien Potencier
f23044f63b Merge remote branch 'ptheg/master'
* ptheg/master:
  Search engines should not indexing Profiler
2011-05-06 12:31:49 +02:00
Fabien Potencier
dfd5b653cb [DoctrineBundle] changed mapping file suffix from .orm.dcm.yml to .orm.yml 2011-05-06 11:23:00 +02:00
Fabien Potencier
0cdd6ca4e2 [DoctrineBundle] added --path option to doctrine:generate:entities 2011-05-06 11:19:19 +02:00
Geyer Pierre
daeedb5705 Search engines should not indexing Profiler 2011-05-06 07:58:35 +02:00
Fabien Potencier
d9299e930b [DoctrineBundle] changed mapping directory
From Resources/config/ to Resources/config/doctrine
From doctrine.orm.dcm.xml to mapping.orm.dcm.xml
2011-05-05 18:12:21 +02:00
Fabien Potencier
ca3c5e652e moved ErrorHandler management to the distributions 2011-05-05 08:53:13 +02:00
Fabien Potencier
36bcfcc5ee Merge remote branch 'bschussek/form'
* bschussek/form:
  [Form] CSRF fields are not included in the children of a FormView anymore if the view is not the root
  [Form] FormView::offsetUnset() is now supported. It was possible anyway using getChildren() and setChildren().
  [Form] Split the option "modifiable" of the "collection" type into "allow_add" and "allow_delete"
  [Form] Added test for last commit by kriswallsmith and improved dealing with original names
  [Form] Fixed variable scope when entering nested form helpers
  [Form] Added tests for blocks/templates in the format _<ID>_(widget|row|label|...)
  [Form] updated listener to check that data is an array
2011-05-04 22:13:33 +02:00
Fabien Potencier
b7c8442068 [DoctrineBundle] made Doctrine metadata configuration easier
You can now configure your Doctrine metadata in one single file named 'doctrine':

  Resources/config/doctrine.orm.dcm.yml
  Resources/config/doctirne.orm.dcm.xml

You can still use one file per entity, but the directory has changed (see the UPDATE file)
2011-05-04 19:58:48 +02:00
Fabien Potencier
ec226cd4bc [DoctrineBundle] fixed doctrine:generate:entities 2011-05-04 19:38:36 +02:00
Fabien Potencier
e150ffd699 Merge remote branch 'Bart00/patch-1'
* Bart00/patch-1:
  Change "zou moeten" to "moet", ("zou moeten" implies that the problem is not so severe and was translated from english too literally) Also  fixes some typo's
2011-05-04 18:51:26 +02:00
Bernhard Schussek
74cca63938 [Form] CSRF fields are not included in the children of a FormView anymore if the view is not the root 2011-05-04 18:27:20 +02:00
Bernhard Schussek
bf1dfbbe99 [Form] Added test for last commit by kriswallsmith and improved dealing with original names
The form component should now guarantee to always pass an UploadedFile object to your model. There you can call getOriginalName() to retrieve the original name of the uploaded file. For security reasons, the real file name is a generated hash value.
2011-05-04 17:04:44 +02:00
Fabien Potencier
86d0ddb4e3 [DoctrineBundle] split Registry::getEntityManager() in two methods
Resetting an entity manager has a lot of consequences and the developer should
be aware of that. So, instead of implicitly reset an entity manager when it is
closed, the developer should reset it by hand if he thinks that this is
possible:

    $em = $this->get('registry')->getEntityManager();
    $em->getConnection()->beginTransaction(); // suspend auto-commit
    try {
        //... do some work
    } catch (Exception $e) {
        $em->getConnection()->rollback();
        $em->close();

        $this->get('registry')->resetEntityManager();
    }

    // you will get a new one
    $em = $this->get('registry')->getEntityManager();
2011-05-04 16:23:47 +02:00
Bernhard Schussek
eb50d766da [Form] Fixed variable scope when entering nested form helpers
The consequence of this commit is that variables are accessible that have been passed to a surrounding form helper.

Example template:

{% block my_widget_label %}
    <label>{{ label }}
{% endblock %}

{% block my_widget_row %}
    {# It is not necessary to explicitely pass through the label variable #}
    {{ form_label(form) }}
    {{ form_widget(form) }}
{% endblock %}

Example usage:

{{ form_row(form.mywidget, { 'label': 'My Widget' }) }}
2011-05-04 15:40:15 +02:00
Bernhard Schussek
38098604af [Form] Added tests for blocks/templates in the format _<ID>_(widget|row|label|...) 2011-05-04 15:33:51 +02:00
Bart00
f9940b4175 Change "zou moeten" to "moet", ("zou moeten" implies that the problem is not so severe and was translated from english too literally)
Also  fixes some typo's
2011-05-04 05:11:50 -07:00
Fabien Potencier
2e5bd42be3 Merge remote branch 'hollodk/master'
* hollodk/master:
  Made some better translation.
  First sample of translation.
2011-05-04 13:00:33 +02:00
Michael Holm
dc58b79e58 Made some better translation. 2011-05-04 12:47:06 +02:00
Fabien Potencier
b752e31b66 Merge remote branch 'lenar/translation'
* lenar/translation:
  added translation for Estonian
2011-05-04 11:46:05 +02:00
Fabien Potencier
0331501580 [DoctrineBundle] fixed some configuration options 2011-05-04 11:35:14 +02:00
lenar
1cfed9e24e added translation for Estonian 2011-05-04 12:20:22 +03:00
Fabien Potencier
736948887d Merge remote branch 'lenar/doctrinebundle'
* lenar/doctrinebundle:
  fix variable names
2011-05-04 10:55:25 +02:00
Fabien Potencier
f7808de3a8 [DoctrineBundle] moved more DIC definition into orm.xml 2011-05-04 10:53:05 +02:00
lenar
1301995cdc fix variable names 2011-05-04 11:11:38 +03:00
Michael Holm
8be22f19d7 First sample of translation. 2011-05-04 01:59:48 +02:00
wtfzdotnet
898019559a Some changes to the translation of "should" -> "zou moeten", "must" -> "moeten". 2011-05-03 14:06:33 -07:00
Fabien Potencier
e8838e51a6 [DoctrineBundle] fixed previous merge 2011-05-03 16:52:19 +02:00
Fabien Potencier
a02805714f [DoctrineBundle] merged fabpot:doctrine-registry 2011-05-03 16:38:59 +02:00
Daniel Gomes
8870d3f31e Merge remote-tracking branch 'upstream/master' 2011-05-03 14:28:33 +01:00
Daniel Gomes
0147df6b22 added translation for European Portugues (Portugal) 2011-05-03 14:27:37 +01:00
Jordi Boggiano
04f9b23b34 [FrameworkBundle] Adjust styling and display of logs 2011-05-03 14:44:27 +02:00
Fabien Potencier
e9b085ef42 [DoctrineBundle] fixed typo 2011-05-03 14:06:34 +02:00
Fabien Potencier
ca4c1355c7 [DoctrineBundle] made doctrine:generate:entities smarter
The doctrine:generate:entities is now able to generate classes
based on a bundle name, a class name, or a namespace.

The command has still some limitations which will be hopefully
be fixed later on.

If also generates the repository class when possible
(replaces the doctrine:generate:repositories command).
2011-05-03 13:39:01 +02:00
Fabien Potencier
014b19040c [DoctrineBundle] changed the Registry to return a new instance if the current em is closed
$em = $this->get('doctrine')->getEntityManager();

    $em->getConnection()->beginTransaction(); // suspend auto-commit
    try {
        //... do some work
    } catch (Exception $e) {
        $em->getConnection()->rollback();
        $em->close();

        // get a new EM
        $em = $this->get('doctrine')->getEntityManager();
    }
2011-05-03 07:39:12 +02:00