Commit Graph

10981 Commits

Author SHA1 Message Date
Fabien Potencier
30357d6096 merged branch 77web/fix-form-renderer-humanize (PR #6992)
This PR was squashed before being merged into the master branch (closes #6992).

Commits
-------

8adb0e3 [Form]fixed FormRenderer::humanize() to humanize camel cased label

Discussion
----------

[Form]fixed FormRenderer::humanize() to humanize camel cased label

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

FormRenderer::humanize() only converts underscored_field_name to humanized field name(just the same as sfInflector::humanize()).
Sensio\Bundle\GeneratorBundle\Generator\DoctrineFormGenerator does not convert camelCased field names to underscored one, however.
I have to edit manually field names in the generated FormType class everytime I use doctrine:generate:form Command, too messy.
so I suggest humanize() is to take care of it.

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

by 77web at 2013-02-08T01:40:59Z

@vicb thank you for your kind review. I've added commits as you told.

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

by vicb at 2013-02-08T07:33:47Z

@77web you probably could merge the the setup into the test method.

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

by 77web at 2013-02-08T08:17:10Z

@vicb I've merged setUp() and tearDown() into test method(before and after assertion). anything else to fix?

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

by 77web at 2013-02-08T10:11:51Z

@vicb I've fixed test as you told.thanks again for your kind help!

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

by vicb at 2013-02-08T12:00:29Z

One last thing: a note in the changelog ?

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

by 77web at 2013-02-08T12:23:57Z

I added a note in 2.2.0 section. or shold I write it in 2.1.0?

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

by vicb at 2013-02-08T12:25:36Z

As you send it to master, you should create a 2.3.0 (2.1 & 2.2 have their own branches)

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

by vicb at 2013-02-08T12:26:40Z

and should write your comment as "fixed xyz to abc". Thanks.

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

by 77web at 2013-02-08T12:32:39Z

fixed my note. thanks a lot! @vicb
2013-02-11 12:02:24 +01:00
77web
8adb0e3673 [Form]fixed FormRenderer::humanize() to humanize camel cased label 2013-02-11 12:02:23 +01:00
Fabien Potencier
391389d0e4 Merge branch '2.2'
* 2.2:
  fixed typos in composer.json version constraints

Conflicts:
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/Routing/composer.json
2013-02-11 11:29:42 +01:00
Fabien Potencier
c5148a1d11 fixed typos in composer.json version constraints 2013-02-11 11:28:56 +01:00
Fabien Potencier
386884046d changed dependencies to allow all 2.3 versions of the components (closes #6983) 2013-02-11 11:13:11 +01:00
Fabien Potencier
c97be281c0 Merge branch '2.2'
* 2.2: (30 commits)
  [HttpFoundation] Added support for partial ranges in the BinaryFileResponse.
  [HttpFoundation] Fixed byte ranges in the BinaryFileResponse.
  updated required versions when depending on the HttpFoundation component
  updated required versions when depending on the HttpKernel component
  updated required versions when depending on the Config component
  updated required versions when depending on the Form component
  updated required versions when depending on the DependencyInjection component
  updated required versions when depending on the Validator component
  updated required versions when depending on the Translation component
  updated required versions when depending on the Routing component
  updated required versions when depending on the EventDispatcher component
  updated required versions when depending on the OptionsResolver component
  updated required versions when depending on the PropertyAccess component
  updated required versions when depending on the Security component
  updated required versions when depending on the Templating component
  updated required versions when depending on the Stopwatch component
  updated required versions when depending on the Process component
  updated required versions when depending on the Finder component
  updated required versions when depending on the Dom Crawler component
  use ~2.0 when depending on the Dom Crawler component
  ...
2013-02-11 11:09:44 +01:00
Fabien Potencier
1697b7204c merged branch fabpot/composer-deps (PR #7027)
This PR was merged into the 2.2 branch.

Commits
-------

0e4a1fe updated required versions when depending on the HttpFoundation component
2704705 updated required versions when depending on the HttpKernel component
0a70fe7 updated required versions when depending on the Config component
2f1939b updated required versions when depending on the Form component
719628a updated required versions when depending on the DependencyInjection component
3db311a updated required versions when depending on the Validator component
a671313 updated required versions when depending on the Translation component
289ccfc updated required versions when depending on the Routing component
a742f0a updated required versions when depending on the EventDispatcher component
51857fe updated required versions when depending on the OptionsResolver component
20dfc15 updated required versions when depending on the PropertyAccess component
f971ccf updated required versions when depending on the Security component
da06817 updated required versions when depending on the Templating component
108a8c0 updated required versions when depending on the Stopwatch component
155cccb updated required versions when depending on the Process component
b95184b updated required versions when depending on the Finder component
a5da4a1 updated required versions when depending on the Dom Crawler component
0d74948 use ~2.0 when depending on the Dom Crawler component
d2d4c0a use ~2.1 when depending on the ClassLoader component
4def221 use ~2.0 when depending on the CSS selector component
9b64be2 use ~2.0 when depending on the locale component
c3906a4 updated required versions when depending on the Yaml component

Discussion
----------

Update Composer deps

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Since we adopted Composer in Symfony, we limit the Symfony Components deps for any Symfony Component to the current version of Symfony. That's very limited as for instance, any version of Yaml can be used as a dependency for any other Symfony Component. So, this PR changes the version constraints for dependencies to the largest range possible.

The idea is also to open the range even more when new versions of Symfony comes.

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

by bamarni at 2013-02-08T17:40:41Z

👍 closes #5891

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

by canni at 2013-02-08T23:42:04Z

👍

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

by simensen at 2013-02-09T05:35:41Z

👍

I think this is a great idea but it opens up the potential for internal version conflicts between components. The increased maintenance is probably worth it, though. :)

Several packages on Packagist are currently broken (see #6983) and I think this would fix that. A number of my projects have been forced back to 2.2@RC in favor of staying on 2.3@dev so I'm excited to see this resolved one way or another.

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

by vicb at 2013-02-09T10:06:36Z

Would the right way to fix this issue be semantic versioning ?
2013-02-11 11:09:17 +01:00
Jakub Zalas
381bd7e235 [HttpFoundation] Added support for partial ranges in the BinaryFileResponse.
Valid ranges include:
* bytes=0-499
* bytes=500-999
* bytes=-500
* bytes=9500-
* bytes=0-0
2013-02-09 16:41:39 +01:00
Jakub Zalas
d9b91458f1 [HttpFoundation] Fixed byte ranges in the BinaryFileResponse.
According to rfc2616 (http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.1)
byte positions are inclusive:

The first-byte-pos value in a byte-range-spec gives the byte-offset of
the first byte in a range. The last-byte-pos value gives the byte-offset
of the last byte in the range; that is, the byte positions specified are
inclusive. Byte offsets start at zero.
2013-02-09 16:41:27 +01:00
Fabien Potencier
0e4a1fe418 updated required versions when depending on the HttpFoundation component 2013-02-08 17:10:58 +01:00
Fabien Potencier
270470596f updated required versions when depending on the HttpKernel component 2013-02-08 17:10:57 +01:00
Fabien Potencier
0a70fe7079 updated required versions when depending on the Config component 2013-02-08 17:10:57 +01:00
Fabien Potencier
2f1939b4a0 updated required versions when depending on the Form component 2013-02-08 17:10:57 +01:00
Fabien Potencier
719628a5ce updated required versions when depending on the DependencyInjection component 2013-02-08 17:10:56 +01:00
Fabien Potencier
3db311a601 updated required versions when depending on the Validator component 2013-02-08 17:10:56 +01:00
Fabien Potencier
a6713136d0 updated required versions when depending on the Translation component 2013-02-08 17:10:56 +01:00
Fabien Potencier
289ccfc724 updated required versions when depending on the Routing component 2013-02-08 17:10:56 +01:00
Fabien Potencier
a742f0a03e updated required versions when depending on the EventDispatcher component 2013-02-08 17:10:55 +01:00
Fabien Potencier
51857feb8b updated required versions when depending on the OptionsResolver component 2013-02-08 17:10:55 +01:00
Fabien Potencier
20dfc15de6 updated required versions when depending on the PropertyAccess component 2013-02-08 17:10:55 +01:00
Fabien Potencier
f971ccf231 updated required versions when depending on the Security component 2013-02-08 17:10:54 +01:00
Fabien Potencier
da068171bb updated required versions when depending on the Templating component 2013-02-08 17:10:54 +01:00
Fabien Potencier
108a8c0117 updated required versions when depending on the Stopwatch component 2013-02-08 17:10:54 +01:00
Fabien Potencier
155cccbe8e updated required versions when depending on the Process component 2013-02-08 17:10:53 +01:00
Fabien Potencier
b95184b834 updated required versions when depending on the Finder component 2013-02-08 17:10:53 +01:00
Fabien Potencier
a5da4a1c9a updated required versions when depending on the Dom Crawler component 2013-02-08 17:10:53 +01:00
Fabien Potencier
0d74948280 use ~2.0 when depending on the Dom Crawler component 2013-02-08 17:10:52 +01:00
Fabien Potencier
d2d4c0a9bb use ~2.1 when depending on the ClassLoader component 2013-02-08 17:10:52 +01:00
Fabien Potencier
4def2219cd use ~2.0 when depending on the CSS selector component
The API is stable and won't change.
2013-02-08 17:10:52 +01:00
Fabien Potencier
9b64be2ee8 use ~2.0 when depending on the locale component
Some methods have been added in 2.1 but none of them are used by the
Symfony components.
2013-02-08 17:10:51 +01:00
Fabien Potencier
c3906a4acb updated required versions when depending on the Yaml component
The API has not changed since 2.0 and won't until 3.0.
2013-02-08 17:10:51 +01:00
Fabien Potencier
63bfd9ef79 [Doctrine] removed usage of the deprecated LoggerInterface in some tests 2013-02-08 17:10:08 +01:00
Fabien Potencier
642c95a631 added Universal* classes in the list of deprecated classes for 3.0 2013-02-08 17:10:00 +01:00
Martijn Evers
c3c9c9ec5b exception listener, allow easier overloading of the default behavior 2013-02-08 12:43:40 +01:00
Fabien Potencier
85557619ba [Routing] fixed previous merge 2013-02-07 23:44:42 +01:00
Fabien Potencier
0f8d417fb1 merged branch canni/fix_traceable_matcher (PR #7009)
This PR was merged into the 2.2 branch.

Commits
-------

30b0c37 [Router] Fix TraceableUrlMatcher

Discussion
----------

[BugFix][Router] Fix TraceableUrlMatcher

TraceableUrlMatcher does not take care with new host route features

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6744
| License       | MIT
| Doc PR        | n/a
2013-02-07 23:44:24 +01:00
Lee McDermott
bf9a483b3e CSS3, HTML5 cleanuos 2013-02-07 22:33:28 +00:00
Lee McDermott
61aadd6304 Fix style for abbr elements in toolbar 2013-02-07 23:19:05 +01:00
Dariusz Górecki
30b0c37b68 [Router] Fix TraceableUrlMatcher 2013-02-07 17:30:00 +00:00
Fabien Potencier
8df773201a Merge branch '2.2'
* 2.2:
  [HttpFoundation] fixed Request::create() method
  [HttpKernel] fixed the creation of the Profiler directory
  [HttpKernel] fixed the hinclude fragment renderer when the template is empty
  bumped Symfony version to 2.2.0-RC2-DEV
  [DependencyInjection] enhanced some error messages
  [FrameworkBundle] fixed typo
  fixed typo
  tweaked previous merge
  [Security] fixed interface implementation (closes #6974)
  Add "'property_path' => false" deprecation message for forms
  fixed CS
  Added BCrypt password encoder.
  updated VERSION for 2.2.0-RC1
  Removed underscores from test method names to be consistent with other components.
  [Security] fixed session creation when none is needed (closes #6917)
  [FrameworkBundle] removed obsolete comment (see 2e356c1)
  Micro-optimization
  [FrameworkBundle] removed extra whitespaces
  [Security] renamed Constraint namespace to Constraints for validator classes in order to be consistent with the whole current validator API.
  [FrameworkBundle] fixed wrong indentation on route debug output
2013-02-07 17:43:41 +01:00
Fabien Potencier
f8cf1eb1a2 merged branch fabpot/fragment-fix (PR #6996)
This PR was merged into the 2.2 branch.

Commits
-------

5a2caa5 [HttpKernel] fixed the hinclude fragment renderer when the template is empty

Discussion
----------

[HttpKernel] fixed the hinclude fragment renderer when the template is empty

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

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

by lsmith77 at 2013-02-07T13:36:58Z

does it make sense to allow the template to be empty? i mean isnt this instead an error condition?

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

by fabpot at 2013-02-07T16:16:04Z

Why not? An empty template means and empty content, which you might want as this is just the fallback content displayed when the real content is not loaded yet.
2013-02-07 17:32:34 +01:00
Fabien Potencier
3c24f6e39a merged branch fabpot/request-creation-fix (PR #6995)
This PR was merged into the 2.2 branch.

Commits
-------

bc4a0e7 [HttpFoundation] fixed Request::create() method

Discussion
----------

[HttpFoundation] fixed Request::create() method

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

When creating a Request with Request::create(), some information can
come from the URI and the server variable. Until now, it was not clear
which information had precedence over the other and as a matter of fact,
this method was not consistent.

Now, information contained in the URI always take precedence over
information coming from the server array. That makes sense as the server
array is often copied from another existing Request object.

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

by vicb at 2013-02-07T14:42:15Z

You should add a note in the changelog
2013-02-07 16:27:14 +01:00
Fabien Potencier
bc4a0e751e [HttpFoundation] fixed Request::create() method
When creating a Request with Request::create(), some information can
come from the URI and the server variable. Until now, it was not clear
which information had precedence over the other and as a matter of fact,
this method was not consistent.

Now, information contained in the URI always take precedence over
information coming from the server array. That makes sense as the server
array is often copied from another existing Request object.
2013-02-07 16:26:12 +01:00
Fabien Potencier
3d43bcc540 merged branch fabpot/better-exception-messages (PR #6994)
This PR was merged into the 2.2 branch.

Commits
-------

3053194 [DependencyInjection] enhanced some error messages

Discussion
----------

[DependencyInjection] enhanced some error messages

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a
2013-02-07 14:24:42 +01:00
Fabien Potencier
ed98a5164f Merge branch '2.1' into 2.2
* 2.1:
  [HttpKernel] fixed the creation of the Profiler directory
  [Security] fixed session creation when none is needed (closes #6917)
  [FrameworkBundle] removed obsolete comment (see 2e356c1)
2013-02-07 12:58:45 +01:00
Fabien Potencier
e50d33308a [HttpKernel] fixed the creation of the Profiler directory 2013-02-07 12:58:33 +01:00
Fabien Potencier
5a2caa5e85 [HttpKernel] fixed the hinclude fragment renderer when the template is empty 2013-02-07 12:09:58 +01:00
Fabien Potencier
3446cb219a bumped Symfony version to 2.2.0-RC2-DEV 2013-02-07 12:04:45 +01:00
Fabien Potencier
3053194cd7 [DependencyInjection] enhanced some error messages 2013-02-06 16:38:36 +01:00
Fabien Potencier
1f68f40518 [FrameworkBundle] fixed typo 2013-02-05 15:39:35 +01:00