Commit Graph

5111 Commits

Author SHA1 Message Date
Fabien Potencier
9b1b9373b8 [HttpFoundation] simplified code 2011-06-14 16:08:07 +02:00
Fabien Potencier
24778553cd [HttpFoundation] simplified code 2011-06-14 16:07:18 +02:00
Fabien Potencier
b763d667f5 merged branch lsmith77/checkIp (PR #1322)
Commits
-------

2f04bdb make checkIp() reuseable

Discussion
----------

[RequestMatcher] make checkIp() reuseable
2011-06-14 15:59:49 +02:00
Fabien Potencier
ddb0a8559d [AsseticBundle] fixed unit tests 2011-06-14 15:53:30 +02:00
Fabien Potencier
e5ccaabefd merged branch kriswallsmith/assetic/cssembed-config (PR #1321)
Commits
-------

ee8f34e [AsseticBundle] added more cssembed config options (closes #1249)

Discussion
----------

[AsseticBundle] added more cssembed config options (closes #1249)
2011-06-14 15:45:31 +02:00
Fabien Potencier
be3587d165 merged branch kriswallsmith/assetic/lazy-finder (PR #1320)
Commits
-------

4016dfb [AsseticBundle] moved ExecutableFinder back into a closure so it's only called if needed

Discussion
----------

[AsseticBundle] moved ExecutableFinder back into a closure

[AsseticBundle] moved ExecutableFinder back into a closure so it's only called if needed

---------------------------------------------------------------------------

by fabpot at 2011/06/14 05:46:14 -0700

Does it relate to #1319?

---------------------------------------------------------------------------

by kriswallsmith at 2011/06/14 05:47:25 -0700

It's related, yes, but I don't think it's a solution for the issue.

---------------------------------------------------------------------------

by dlsniper at 2011/06/14 06:00:55 -0700

The issue in #1319 has been fixed with this: 0d54f5c21e
It's in the latest master tree but finding that file only when needed is also a good idea.
2011-06-14 15:45:17 +02:00
Fabien Potencier
397fad3810 [Routing] added missing public @api 2011-06-14 15:40:43 +02:00
Fabien Potencier
72483f946b [Routing] tagged the public @api 2011-06-14 15:35:32 +02:00
Lukas Kahwe Smith
2f04bdb3c5 make checkIp() reuseable 2011-06-14 15:31:52 +02:00
Fabien Potencier
59301a93d7 [ClassLoader] tweaked public @api 2011-06-14 15:20:59 +02:00
Fabien Potencier
54e054b2d1 [DomCrawler] tweaked public @api 2011-06-14 15:16:43 +02:00
Kris Wallsmith
ee8f34e7ed [AsseticBundle] added more cssembed config options (closes #1249) 2011-06-14 05:48:51 -07:00
Fabien Potencier
dd23402e94 [EventDispatcher] tweaked public @api 2011-06-14 14:40:48 +02:00
Fabien Potencier
c6cc427e4b [EventDispatcher] added a way to set the priority for event subscribers 2011-06-14 14:40:27 +02:00
Fabien Potencier
b76a1c3077 [Finder] added a convenience method Finder::create() 2011-06-14 14:18:24 +02:00
Fabien Potencier
1ad5bfd723 [CssSelector] renamed SyntaxError 2011-06-14 14:12:03 +02:00
Kris Wallsmith
4016dfbb84 [AsseticBundle] moved ExecutableFinder back into a closure so it's only called if needed 2011-06-14 04:22:47 -07:00
Fabien Potencier
d87c96bb65 [CssSelector] ... 2011-06-14 13:06:37 +02:00
Fabien Potencier
a232c148eb fixed CS 2011-06-14 12:54:32 +02:00
Fabien Potencier
a7c1ff8558 merged branch ajessu/time_validator (PR #1254)
# Commits

ca52a04 [Validator] Allow DateTime objects as valid Times

# Discussion

## [Validator] Allow DateTime objects as valid Times

Also added tests for `DateTime` objects as valid on `Date` and `Time` constraints.

I didn't include the test for the `DateTime` constraint, as it's already included in this PR:

https://github.com/symfony/symfony/pull/1085

---------------------------------------------------------------------------

## fabpot @ 2011/06/09 09:07:21 -0700

I don't think it makes sense to use a \DateTime instance to represent a Time.

---------------------------------------------------------------------------

## ajessu @ 2011/06/09 09:33:20 -0700

If I have an entity with a doctrine type `Time`:

    Time (DateTime instance where only H:i:s get persisted)

```php
<?php
    /**
     * @ORM\Column(type="time")
     * @Assert\Time()
     */
    protected $startTime;
```

and I create a form out of this Entity, a `DateTime` object is passed when the form is submitted.

This generates an `UnexpectedTypeException`.

I just made this change to match the `Date` validator with the doctrine type `Date`, which also shares this behavior:
https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Validator/Constraints/DateValidator.php#L28

    Date (DateTime instance where only Y-m-d get persisted)
2011-06-14 12:08:41 +02:00
Victor Berchet
38b3b7474f [HttpKernel] Fix and test previous commit 2011-06-14 11:54:55 +02:00
Victor Berchet
ac0c00c6e8 [HttpFoundation] Make File extends \SplFileInfo 2011-06-14 10:47:04 +02:00
Victor Berchet
87ca9f3a52 [Validation] some tweaks and phpDoc 2011-06-14 09:40:26 +02:00
Victor Berchet
4e3e2768fb [Form] Make the prototype view child of the collection view 2011-06-14 09:33:19 +02:00
Fabien Potencier
2ce3cfad18 [Form] made it possible to translate the empty value of Choice fields 2011-06-14 08:33:48 +02:00
Fabien Potencier
c364008a3b [Form] allowed an empty value to be displayed for choices even when required is true
Rules are as follows:

* If multiple is true, then the empty_value is ignored
* If not, and if the field is not required, the empty_value is set to the empty string by default and displayed
* If the field is required, and if the user explicitely set the empty_value, then it is displayed
2011-06-14 08:27:19 +02:00
Fabien Potencier
b29597a585 Merge remote branch 'stof/form_collection'
* stof/form_collection:
  [TwigBridge] fixed the check for the collection prototype in the form theme
2011-06-14 07:48:17 +02:00
Ryan Weaver
52cbbfe0d3 [HttpKernel] Adding small example of how the extension alias is auto-generated 2011-06-13 17:16:49 -05:00
Christophe Coevoet
df0039f701 [TwigBridge] fixed the check for the collection prototype in the form theme 2011-06-14 00:15:50 +02:00
Fabien Potencier
a12ea12fc1 fixed CS 2011-06-13 18:54:20 +02:00
Fabien Potencier
0b7a19e6fd [DoctrineBundle] removed old code 2011-06-13 18:38:56 +02:00
Fabien Potencier
d16a708cc8 [Form] simplified file type class
File uploads documentation is here:

https://github.com/symfony/symfony-docs/pull/400
2011-06-13 18:11:18 +02:00
Fabien Potencier
59f0602aef Merge remote branch 'kriswallsmith/assetic/fix-type-hint'
* kriswallsmith/assetic/fix-type-hint:
  [AsseticBundle] fixed an incorrect type hint
2011-06-13 17:37:08 +02:00
Kris Wallsmith
dc2da52790 [AsseticBundle] fixed an incorrect type hint 2011-06-13 08:27:11 -07:00
Kris Wallsmith
16e3aa3dc3 [AsseticBundle] added FileResource test 2011-06-13 08:17:05 -07:00
Kris Wallsmith
1890dab212 [AsseticBundle] added custom coalescing logic to work with logical template names 2011-06-13 08:17:05 -07:00
Fabien Potencier
33baf9d8ad [FrameworkBundle] partially reverted previous merge 2011-06-13 17:00:18 +02:00
Fabien Potencier
459678a0e9 Merge remote branch 'vicb/twig-templates'
* vicb/twig-templates:
  [FrameworkBundle] Fix previous commit
  [TwigBundle] Optimize the FilesystemLoader
2011-06-13 16:54:21 +02:00
Fabien Potencier
16e6cea240 [DoctrineBundle] fixed generation of the first entity in a bundle (closes #1271) 2011-06-13 16:29:04 +02:00
Fabien Potencier
196350b892 Merge remote branch 'djama/patch-1'
* djama/patch-1:
  call header() with replace=false, to provide the possibility of sending mutiple headers of the same type.
2011-06-13 12:19:40 +02:00
Fabien Potencier
9c1f999e21 [FrameworkBundle] fixed typo 2011-06-13 11:58:58 +02:00
Fabien Potencier
0c29a25d89 Merge remote branch 'kriswallsmith/form/collection-proto'
* kriswallsmith/form/collection-proto:
  added script[type="text/html"] collection prototype to form themes
  [Form] removed collection prototype from form tree
2011-06-13 11:51:18 +02:00
Fabien Potencier
973b323b12 Merge remote branch 'vicb/form-render-fix'
* vicb/form-render-fix:
  [Form][TwigBridge] Improve the cache layer by caching blocks instead of templates
  [Form][TwigBridge] Make the template cache more efficient
  [Form][TwigBridge] Fix rendering
2011-06-13 11:48:44 +02:00
Fabien Potencier
41b7190efc Revert "[Form] changed the way default type names are created to avoid collisions"
This reverts commit d044498cde.

The reason for reverting is that the name is actually used to customize
the template on a per field basis:

{% block _post_excerpt_widget %}
    ***{{ block('text_widget') }}***
{% endblock %}

Here, post is the name of the Type.
2011-06-13 11:47:21 +02:00
Fabien Potencier
0fc56346f7 Merge remote branch 'AurelC2G/fix-charset'
* AurelC2G/fix-charset:
  [HttpFoundation] Fixed indentation
  [HttpFoundation] Fixed charset always being set to UTF-8
2011-06-13 11:22:46 +02:00
Fabien Potencier
b72f980fac Merge remote branch 'brikou/phpdoc_formType'
* brikou/phpdoc_formType:
  [Form] added phpdoc (inherit) for types
2011-06-13 11:20:57 +02:00
Fabien Potencier
11761e48a5 Merge remote branch 'brikou/phpdoc_session'
* brikou/phpdoc_session:
  [Session] added phpdoc about flash messages
2011-06-13 11:20:35 +02:00
Fabien Potencier
dbac5324ee Merge remote branch 'pzwosta/php-scope-request'
* pzwosta/php-scope-request:
  [AsseticBundle] fixed ScopeWideningInjectionExc in prod evn using php templates
2011-06-13 11:15:48 +02:00
Fabien Potencier
0ec604cb1e Merge remote branch 'mschneid/master'
* mschneid/master:
  Fix array access
2011-06-13 11:12:46 +02:00
Fabien Potencier
2ba7e4207c Merge remote branch 'craue/patch-4'
* craue/patch-4:
  typo
2011-06-13 11:09:38 +02:00
Kris Wallsmith
a3ed5e3f84 [AsseticBundle] changed file resource string value to logical template name 2011-06-12 19:12:22 -07:00
Lee McDermott
49dd558444 Couple more CS fixes 2011-06-13 02:40:21 +01:00
Michael Schneider
fdab1955f8 Fix array access
If you provide only one field as string you're not able to access the $constraint->fields as an array. Use $fields instead.
2011-06-12 23:48:17 +02:00
Christian Raue
99eb3a120d typo 2011-06-12 11:59:47 -07:00
Victor Berchet
dbea68effc [FrameworkBundle] Fix previous commit 2011-06-12 18:37:54 +02:00
Victor Berchet
acd2cf11d8 [TwigBundle] Optimize the FilesystemLoader 2011-06-12 14:49:18 +02:00
Victor Berchet
b19052f879 [Form][TwigBridge] Improve the cache layer by caching blocks instead of templates 2011-06-12 12:56:25 +02:00
Victor Berchet
9135f963db [Form][TwigBridge] Make the template cache more efficient 2011-06-12 12:15:48 +02:00
Victor Berchet
8677aa3dce [Form][TwigBridge] Fix rendering 2011-06-12 11:33:17 +02:00
Peter Zwosta
c0e120e072 [AsseticBundle] fixed ScopeWideningInjectionExc in prod evn using php templates
The definition "assetic.helper.static" references the service "templating.helper.assets" which belongs to a narrower scope. Generally, it is safer to either move "assetic.helper.static" to scope "request" or alternatively rely on the provider pattern by injecting the container itself, and requesting the service "templating.helper.assets" each time it is needed. In rare, special cases however that might not be necessary, then you can set the reference to strict=false to get rid of this error.
2011-06-11 19:49:13 +02:00
Kris Wallsmith
5b0f1da074 [HttpKernel] made WebTestCase methods static 2011-06-11 08:50:27 -07:00
Lee McDermott
5a986bfc27 Add $keysCount & minor CS fix 2011-06-11 16:43:28 +01:00
Lee McDermott
91f4097a09 [Routing] Better nesting for RouteCollections in dumped URL matcher classes
With this change, a route prefixed with '/blogger' will be nested inside '/blog' (for example)
2011-06-11 16:11:55 +01:00
Brikou CARRE
66ae994528 [Form] added phpdoc (inherit) for types 2011-06-11 11:59:28 +02:00
Brikou CARRE
3dff029c37 [Session] added phpdoc about flash messages 2011-06-11 11:44:30 +02:00
Aurélien Fredouelle
6ae2bdeabd [HttpFoundation] Fixed indentation 2011-06-11 10:24:44 +02:00
Aurélien Fredouelle
1e50a553d2 [HttpFoundation] Fixed charset always being set to UTF-8
Fixes #1281
2011-06-11 10:22:26 +02:00
Joseph Bielawski
6bb9075b35 Remove unused code from DateTime constraint 2011-06-11 01:18:16 -07:00
Fabien Potencier
ca013311bd [TwigBundle] fixed XSD 2011-06-11 08:00:55 +02:00
Fabien Potencier
355f802546 [TwigBundle] fixed tests 2011-06-11 07:54:10 +02:00
Fabien Potencier
96045739b1 [TwigBundle] removed the extensions setting 2011-06-11 07:50:14 +02:00
Fabien Potencier
afa30d9864 Merge remote branch 'theinterned/patch-1'
* theinterned/patch-1:
  made logoutPath localizable as well
  storing localized targetPath in a string as opposed to updating the attribute
  In the spirit of 882a8e3f09 allow for localized logout target url
2011-06-11 07:39:04 +02:00
Fabien Potencier
c79e51c9aa Merge remote branch 'kriswallsmith/form/lazier-csrf-token'
* kriswallsmith/form/lazier-csrf-token:
  [Form] fixed xpath
  [Form] moved csrf listener to its own class
  fix issue with csrf token not present on collection fields because of resize listener
2011-06-11 07:36:51 +02:00
Fabien Potencier
8d58826085 [Routing] fixed unit tests for previous commit 2011-06-11 07:33:55 +02:00
Fabien Potencier
96554e645a Merge remote branch 'lmcd/master'
* lmcd/master:
  $code referenced but not defined in compileRoute()
  [Routing] Optimised the PHP URL matcher dumper The cached URL matcher classes contain some unneeded logic. Consider the following example:
2011-06-11 07:32:22 +02:00
Lee McDermott
2c0efa7488 $code referenced but not defined in compileRoute() 2011-06-11 04:38:11 +01:00
Lee McDermott
10bb4ff25e [Routing] Optimised the PHP URL matcher dumper
The cached URL matcher classes contain some unneeded logic. Consider the following example:

if (0 === strpos($pathinfo, '/Blog')) {
    // blog_index
    if (0 === strpos($pathinfo, '/Blog') && preg_match('#^/Blog/(?P<slug>[^/]+?)$#x', $pathinfo, $matches)) {
        return array_merge($this->mergeDefaults($matches, array (  '_action' => 'index',)), array('_route' => 'blog_index'));
    }
}

The 2nd strpos is not required, as we have already satisfied this condition in the parent if statement.
My change will produce the following code for the same routing setup::

if (0 === strpos($pathinfo, '/Blog')) {
    // blog_index
    if (preg_match('#^/Blog/(?P<slug>[^/]+?)$#x', $pathinfo, $matches)) {
        return array_merge($this->mergeDefaults($matches, array (  '_action' => 'index',)), array('_route' => 'blog_index'));
    }
}
2011-06-11 01:20:22 +01:00
Ned Schwartz
47df88bfc9 made logoutPath localizable as well 2011-06-10 15:04:50 -07:00
Ned Schwartz
8fd4158468 storing localized targetPath in a string as opposed to updating the attribute 2011-06-10 14:32:10 -07:00
Kris Wallsmith
fe4382eb73 [Form] moved csrf listener to its own class 2011-06-10 13:00:44 -07:00
Ned Schwartz
17b7b558ce In the spirit of 882a8e3f09 allow for localized logout target url 2011-06-10 12:24:27 -07:00
Bulat Shakirzyanov
cb53414e91 fix issue with csrf token not present on collection fields because of resize listener 2011-06-10 11:12:35 -07:00
Fabien Potencier
d67e25c003 Merge remote branch 'richardmiller/fixed_container_debug_command_help'
* richardmiller/fixed_container_debug_command_help:
  [FrameworkBundle] Added missing word to ContainerDebugCommand help message.
2011-06-10 19:50:58 +02:00
Fabien Potencier
f857ad2a31 Merge remote branch 'stof/monolog_bubbling'
* stof/monolog_bubbling:
  [MonologBundle] Changed the default bubbling behavior. Fixes #1268
2011-06-10 19:49:41 +02:00
Christophe Coevoet
5458baf465 [MonologBundle] Changed the default bubbling behavior. Fixes #1268 2011-06-10 19:44:10 +02:00
Fabien Potencier
293ba3426a [DoctrineBridge] fixed guesser 2011-06-10 19:41:49 +02:00
Richard Miller
346cbf352a [FrameworkBundle] Added missing word to ContainerDebugCommand help message. 2011-06-10 17:56:06 +01:00
djama
96359fb86d call header() with replace=false, to provide the possibility of sending mutiple headers of the same type. 2011-06-10 09:16:33 -07:00
Fabien Potencier
4da7909f9a Merge remote branch 'kriswallsmith/form/is-valid-read-only'
* kriswallsmith/form/is-valid-read-only:
  [Form] fixed isValid() on readOnly forms that have children
2011-06-10 16:32:50 +02:00
Kris Wallsmith
8d55df42de [Form] fixed isValid() on readOnly forms that have children 2011-06-10 07:11:50 -07:00
Fabien Potencier
37cd020040 Merge remote branch 'lsmith77/serializer_tweaks'
* lsmith77/serializer_tweaks: (22 commits)
  clarified that BC is broken in the Serializer component
  added UPDATE notes for Serializer component changes
  fix tests
  marked public api
  more encoder lazy loading tweaks
  always use getEncoder() to enable lazy loading
  cosmetic tweak
  removed setEncoder/removeEncoder/addNormalizer/removeNormalizer
  SerializerAwareInterface and DecoderInterface do not implement EncoderInterface anymore
  handle non objects
  moved the methods that can later be moved to a Builder to the bottom
  use getEncoder inside encode/decode
  made serialize/deserialize/encode/decode final
  added Constructor
  added Exception's from SerializerBundle
  made (de)normalizeObject() private
  renamed hasEncoder/hasDecoder to supportsSerialization/supportsDeserialization
  notice fixes
  typo fixes
  all encoders implement EncoderInterface
  ...
2011-06-10 15:56:35 +02:00
Fabien Potencier
44816ebca0 Merge remote branch 'Infranology/minor-code-simplification'
* Infranology/minor-code-simplification:
  [Form] minor code simplification
2011-06-10 15:55:26 +02:00
Fabien Potencier
09ee01501d Merge remote branch 'lmcd/master'
* lmcd/master:
  Added an optimisation for PHP-FPM (FastCGI Process Manager). As soon as a full Response is dispatched to the browser, the HTTP connection is closed, but the script stays alive on FPM servers.
2011-06-10 15:52:35 +02:00
Fabien Potencier
e92669eb47 Merge remote branch 'brikou/phpdoc_cookie'
* brikou/phpdoc_cookie:
  [HttpFoundation] added phpdoc + exception fix
2011-06-10 15:51:46 +02:00
Fabien Potencier
8e6d287614 Merge remote branch 'hhamon/doctrine_metadatafactory_fix'
* hhamon/doctrine_metadatafactory_fix:
  [DoctrineBundle] fixed missing backslashe.
  [DoctrineBundle] simplified getClassMetadataFactoryClass() method in both DisconnectedMetadataFactory and MetadataFactory classes.
  [DoctrineBundle] added new DisconnectedMetadataFactory class that is now used in the doctrine:generate:entities command instead of the MetadataFactory class.
2011-06-10 15:51:27 +02:00
Fabien Potencier
03a05661f9 [Form] fixed more cases where the delegating validator did not match the validator paths 2011-06-10 15:35:49 +02:00
Fabien Potencier
1daca76197 [Form] unified the way form and data path are created 2011-06-10 15:35:35 +02:00
Hugo Hamon
aa6645d955 [DoctrineBundle] fixed missing backslashe. 2011-06-10 14:55:47 +02:00
Hugo Hamon
1da8922eab [DoctrineBundle] simplified getClassMetadataFactoryClass() method in both DisconnectedMetadataFactory and MetadataFactory classes. 2011-06-10 14:27:55 +02:00
Hugo Hamon
ce3839a3ea [DoctrineBundle] added new DisconnectedMetadataFactory class that is now used in the doctrine:generate:entities command instead of the MetadataFactory class. 2011-06-10 14:24:31 +02:00