Commit Graph

4145 Commits

Author SHA1 Message Date
Johannes Schmitt
f787a2a748 Merge branch 'acl' of https://github.com/IamPersistent/symfony into security 2011-05-05 08:06:31 +02:00
Fabien Potencier
fe9ef5c68b [Routing] fixed deep nested route collections (closes #770) 2011-05-04 23:29:47 +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
c200b42e89 Merge remote branch 'kriswallsmith/http/forwarded-secure'
* kriswallsmith/http/forwarded-secure:
  [HttpFoundation] added support for X-Forwarded-Port request header
2011-05-04 19:12:32 +02:00
Kris Wallsmith
ae46150bc8 [HttpFoundation] added support for X-Forwarded-Port request header 2011-05-04 09:56:34 -07: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
173beeba74 [Form] FormView::offsetUnset() is now supported. It was possible anyway using getChildren() and setChildren(). 2011-05-04 18:21:49 +02:00
Bernhard Schussek
3cc5d9f4cd [Form] Split the option "modifiable" of the "collection" type into "allow_add" and "allow_delete" 2011-05-04 17:29:59 +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
4c6f26f008 Merge remote branch 'kriswallsmith/form/fix-upload-fix' into kris_merge 2011-05-04 15:51:20 +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
Daniel Holmes
dd692c0203 [Form] fixed transformation failed exception 2011-05-04 05:51:03 -07: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
ba3785896f Merge remote branch 'schmittjoh/di'
* schmittjoh/di:
  [DependencyInjection] fixes a bug when requesting a definition that uses property injection
2011-05-04 12:05: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
Fabien Potencier
6d334289ee [BrowserKit] fixed a weird behavior where a PHP process returns a successful exit code, but the PHP scripts actually died 2011-05-04 09:08:05 +02:00
Fabien Potencier
17aa0ed0ed changed the default httpOnly value for cookie for better security out of the box 2011-05-04 08:44:59 +02:00
Fabien Potencier
8b83b9847b Merge remote branch 'wtfzdotnet/patch-1'
* wtfzdotnet/patch-1:
  Some changes to the translation of "should" -> "zou moeten", "must" -> "moeten".
2011-05-04 08:05:01 +02:00
Michael Holm
8be22f19d7 First sample of translation. 2011-05-04 01:59:48 +02:00
Johannes Schmitt
2c287676fb [DependencyInjection] fixes a bug when requesting a definition that uses property injection 2011-05-03 23:46:02 +02:00
Fabien Potencier
c7fddca891 replaced some url..code by rawurl..code 2011-05-03 23:06:55 +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
Fabien Potencier
731993869c Merge remote branch 'Seldaek/exception_handling'
* Seldaek/exception_handling:
  [HttpKernel] Log non-http exceptions as critical as well
2011-05-03 14:53:38 +02:00
Fabien Potencier
13bc7c7c53 Merge remote branch 'Seldaek/exception_template'
* Seldaek/exception_template:
  [FrameworkBundle] Adjust styling and display of logs
2011-05-03 14:53:28 +02:00
Fabien Potencier
27d02a7d4a [Routing] fixed regression (/ should not be matched by /{foo} when foo has no default value) 2011-05-03 14:48:08 +02:00
Jordi Boggiano
04f9b23b34 [FrameworkBundle] Adjust styling and display of logs 2011-05-03 14:44:27 +02:00
Jordi Boggiano
0ca4ed33fe [HttpKernel] Log non-http exceptions as critical as well 2011-05-03 14:43:22 +02:00
Fabien Potencier
e9b085ef42 [DoctrineBundle] fixed typo 2011-05-03 14:06:34 +02:00
Fabien Potencier
036be03dff [HttpKernel] fixed a PHP notice 2011-05-03 13:55:00 +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
d2a9b23c28 [Routing] fixed routing when a pattern has only one segment which is an optional variable 2011-05-03 08:54:33 +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
Fabien Potencier
bd608c8bfa [DoctrineBundle] removed redundant check 2011-05-03 07:38:23 +02:00
Kris Wallsmith
4ea274244d [Form] updated listener to check that data is an array 2011-05-02 15:56:35 -07:00