Commit Graph

17407 Commits

Author SHA1 Message Date
umpirsky
ab003619b7 Added return type to Stopwatch::getSections() 2014-06-06 12:36:27 +02:00
Fabien Potencier
97750f7b02 feature #10427 Username in UsernameNotFoundException message data (maryo)
This PR was squashed before being merged into the 2.6-dev branch (closes #10427).

Discussion
----------

Username in UsernameNotFoundException message data

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

Added username in UsernameNotFoundException message data

Commits
-------

3dfaa19 Username in UsernameNotFoundException message data
2014-06-06 05:53:34 +02:00
Marek Štípek
3dfaa19518 Username in UsernameNotFoundException message data 2014-06-06 05:53:30 +02:00
Fabien Potencier
5925780d5f feature #10660 [RFC][WebProfilerBundle] Add simple placeholders into search form (stloyd)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[RFC][WebProfilerBundle] Add simple placeholders into search form

This is an RFC mostly, it's not a real feature, it's more like little helper for the profiler form, I guess that would mostly useful for _newcomers_, but sometimes even _old dogs_ could find it useful sometimes =)

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | kinda
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

![form](https://cloud.githubusercontent.com/assets/67402/2655386/4637aa0c-bfe5-11e3-958e-84308217b52e.png)

Commits
-------

be65226 [WebProfilerBundle] Add simple placeholders into search form
2014-06-06 05:49:45 +02:00
Fabien Potencier
12d44bcf6c feature #10851 Added retrieval of sections (umpirsky)
This PR was squashed before being merged into the 2.3-dev branch (closes #10851).

Discussion
----------

Added retrieval of sections

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10145
| License       | MIT

Commits
-------

7928767 Added retrieval of sections
2014-06-06 05:26:07 +02:00
umpirsky
7928767b3e Added retrieval of sections 2014-06-06 05:26:05 +02:00
Fabien Potencier
36d144b090 feature #10552 [YAML] Added support for object-maps (polyfractal, nicolas-grekas)
This PR was merged into the 2.5-dev branch.

Discussion
----------

 [YAML] Added support for object-maps

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

Proposal for https://github.com/symfony/symfony/pull/10114

Commits
-------

0cee604 [Yaml] Cleanups for object maps
e2d5468 [Yaml] Added support for object maps
2014-06-04 19:22:16 +02:00
Joseph Bielawski
be652260d1 [WebProfilerBundle] Add simple placeholders into search form 2014-06-04 09:22:48 +02:00
Nicolas Grekas
0cee60429e [Yaml] Cleanups for object maps 2014-06-04 08:43:44 +02:00
Zachary Tong
e2d5468b4a [Yaml] Added support for object maps
Previously, the parser treated maps ( {} ) the same as sets ( [] ).
Both were returned as PHP associative arrays. Since
these are distinct entities, this can cause considerably problems for
the users, especially when YAML is being serialized into another
format such as JSON.

This commit allows the user to enable object-map support via a third
parameter on the Parse method.  It defaults to `false`, which means
that this commit does not break backwards compatibility.

If the user enables object-map support, maps are represented
by stdClass() objects.  Sets remain as arrays.
2014-06-04 08:30:39 +02:00
Fabien Potencier
4c12b7b9ff feature #9990 [SecurityBundle] added acl:set command (dunglas)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[SecurityBundle] added acl:set command

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

This new command allows to set ACL directly from the command line. This useful to quickly set up an environment and for debugging / maintenance purpose.

This PR also includes a functional test system for the ACL component. As an example, it is used to test the `acl:set` command.
The provided entity class is not mandatory (tests will still be green without it) but can be useful to test other ACL related things. I can remove it if necessary.

The instantiation of the `MaskBuilder` object is done in a separate method to be easily overridable to use a custom one (e.g. the SonataAdmin one).

Commits
-------

a702124 [SecurityBundle] added acl:set command
2014-06-03 23:19:40 +02:00
Fabien Potencier
e8146810e7 feature #10667 [HttpFoundation] Add a way to match a specific scheme in RequestMatcher #10556 (ProPheT777)
This PR was squashed before being merged into the 2.6-dev branch (closes #10667).

Discussion
----------

[HttpFoundation] Add a way to match a specific scheme in RequestMatcher #10556

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

Commits
-------

787ae07 [HttpFoundation] Add a way to match a specific scheme in RequestMatcher #10556
2014-06-03 23:09:10 +02:00
prophet777
787ae070ae [HttpFoundation] Add a way to match a specific scheme in RequestMatcher #10556 2014-06-03 23:09:07 +02:00
Fabien Potencier
4b7e7ad271 feature #10699 [DomCrawler] Added support for slicing nodes (Berat Doğan, beratdogan)
This PR was squashed before being merged into the 2.6-dev branch (closes #10699).

Discussion
----------

[DomCrawler] Added support for slicing nodes

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

There are no easy way to slice nodes in specific range. I created a method using \LimitIterator. Works fine for me.

An example using is:
```php
     $crawler->filter('h1')->slice(5, 10)->each(function ($node, $i) {
         return $node->text();
     });

Commits
-------

1181bdc [DomCrawler] Added support for slicing nodes
2014-06-03 23:06:30 +02:00
Berat Doğan
1181bdc63b [DomCrawler] Added support for slicing nodes 2014-06-03 23:05:08 +02:00
Fabien Potencier
be6aac252e feature #10792 [Security] Allow overloading ContextListener::refreshUser() (lstrojny)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Security] Allow overloading ContextListener::refreshUser()

Allow overloading refreshUser() for the use case of doing something special with user providers.

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

Commits
-------

b67ed43 Allow overloading ContextListener::refreshUser()
2014-06-03 22:56:38 +02:00
Fabien Potencier
df3d3f70d3 minor #10980 error.html.twig should contain a email value (clemens-tolboom)
This PR was squashed before being merged into the 2.3-dev branch (closes #10980).

Discussion
----------

error.html.twig should contain a email value

When getting an exception on env PROD it would be nice to have an email to report to.

Current code has [email] instead of a value.

I'm not sure how to fix this as the email value should come from exception.html.twig

```html
<div id="logs">
    {% include 'TwigBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %}
</div>
```

Some hints are welcome.

Commits
-------

030b8c0 error.html.twig should contain a email value
2014-06-03 22:41:36 +02:00
Clemens Tolboom
030b8c05ea error.html.twig should contain a email value 2014-06-03 22:41:34 +02:00
Fabien Potencier
dac3305979 feature #11034 [Debug] enhanced error messages for uncaught exceptions (nicolas-grekas)
This PR was merged into the 2.6-dev branch.

Discussion
----------

[Debug] enhanced error messages for uncaught exceptions

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

Before:

![capture du 2014-06-02 10 56 42](https://cloud.githubusercontent.com/assets/243674/3145281/3f8c4d24-ea34-11e3-948c-78898fb79a75.png)

After:

![capture du 2014-06-02 10 55 57](https://cloud.githubusercontent.com/assets/243674/3145283/44167a86-ea34-11e3-9786-f77f2f001638.png)

A double-click on the file name switches between short/full path name.

Commits
-------

ce66442 [Debug] enhanced error messages for uncaught exceptions
2014-06-03 17:19:38 +02:00
Nicolas Grekas
ce6644280e [Debug] enhanced error messages for uncaught exceptions 2014-06-03 08:31:36 +00:00
Fabien Potencier
5c782607ad Merge branch '2.5'
* 2.5:
  [Validator] Remove property and method targets from the optional and required constraints.
  fixed CHANGELOG for 2.5
  bumped Symfony version to 2.5.0
  updated VERSION for 2.5.0-RC1
  updated CHANGELOG for 2.5.0-RC1
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:03:04 +02:00
Fabien Potencier
af10b106b4 Merge branch '2.4' into 2.5
* 2.4:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:56 +02:00
Fabien Potencier
f1970a76ae Merge branch '2.3' into 2.4
* 2.3:
  [Validator] Remove property and method targets from the optional and required constraints.
  [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-31 04:02:48 +02:00
Fabien Potencier
b8247a3fc6 bug #11014 [Validator] Remove property and method targets from the optional and required constraints (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Remove property and method targets from the optional and required constraints

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

At the moment both constraints can only be defined on other annotations. Both constraints are [only mentioned in the docs in the context of the Collection](http://symfony.com/doc/current/reference/constraints/Collection.html#required-and-optional-field-constraints).

Defining the required or optional annotation directly on a field or method
throws a ClassNotFoundException, since the constraint validator factory tries to load the validator (which does not exist):

```
ClassNotFoundException: Attempted to load class "OptionalValidator"
from namespace "Symfony\Component\Validator\Constraints"
in /var/www/server/vendor/symfony/symfony/src/Symfony/Bundle/FrameworkBundle/Validator/ConstraintValidatorFactory.php line 71.
Do you need to "use" it from another namespace?
```

By applying this patch the end user will get a more helpful error message:

```
[Semantical Error] Annotation @Assert\Optional is not allowed to be declared on property Acme\DemoBundle\Entity\Contact::$message.
You may only use this annotation on these code elements: ANNOTATION.
```

Commits
-------

9c2616e [Validator] Remove property and method targets from the optional and required constraints.
2014-05-31 03:59:25 +02:00
Jakub Zalas
9c2616e788 [Validator] Remove property and method targets from the optional and required constraints.
At the moment both constraints can only be defined on other annotations (specifically, the Collection annotation). Defining the required or optional annotation directly on a field or method throws a ClassNotFoundException, since the constraint validator factory tries to load the validator (which does not exist).
2014-05-29 08:58:28 +01:00
Fabien Potencier
6b3be67d3e fixed CHANGELOG for 2.5 2014-05-29 01:38:22 +02:00
Fabien Potencier
082006278c bumped Symfony version to 2.5.0 2014-05-29 01:33:40 +02:00
Fabien Potencier
515fbe9d95 updated VERSION for 2.5.0-RC1 2014-05-28 03:21:58 +02:00
Fabien Potencier
ffe53a31a3 updated CHANGELOG for 2.5.0-RC1 2014-05-28 03:21:47 +02:00
Fabien Potencier
cff410507f bug #10983 [DomCrawler] Fixed charset detection in html5 meta charset tag (77web)
This PR was squashed before being merged into the 2.3 branch (closes #10983).

Discussion
----------

[DomCrawler] Fixed charset detection in html5 meta charset tag

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

It may be minor to folks with ascii-charactered language, but is critical for us Japanese.
Many Japanese websites with SJIS encoding have "Shift_JIS" as their encoding declaration.

Commits
-------

172e752 [DomCrawler] Fixed charset detection in html5 meta charset tag
2014-05-27 00:15:18 +02:00
77web
172e75208a [DomCrawler] Fixed charset detection in html5 meta charset tag 2014-05-27 00:15:16 +02:00
Tobias Schultze
76ccb280fb [HttpFoundation] implement session locking for PDO 2014-05-26 21:03:08 +02:00
Fabien Potencier
5761e6a125 Merge branch '2.5'
* 2.5:
  Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
2014-05-26 21:02:51 +02:00
Fabien Potencier
682f0a34fe Revert "bug #10908 [HttpFoundation] implement session locking for PDO (Tobion)"
This reverts commit 8c71454f47, reversing
changes made to 735e9a4768.
2014-05-26 21:02:40 +02:00
Fabien Potencier
c6947d006e Merge branch '2.5'
* 2.5:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy
2014-05-26 18:43:36 +02:00
Fabien Potencier
6cee250b55 Merge branch '2.4' into 2.5
* 2.4:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy
2014-05-26 18:43:24 +02:00
Fabien Potencier
53d5ecaa00 Merge branch '2.3' into 2.4
* 2.3:
  Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
  Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
  Revert "fixed CS"
  Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
  Revert "[HttpKernel] simplified some tests"
  [HttpKernel] simplified some tests
  Make rootPath part of regex greedy

Conflicts:
	src/Symfony/Component/HttpKernel/Tests/KernelTest.php
2014-05-26 18:43:09 +02:00
Fabien Potencier
5d13be7c71 Revert "bug #10894 [HttpKernel] removed absolute paths from the generated container (fabpot)"
This reverts commit 735e9a4768, reversing
changes made to 5c91dc1a3a.
2014-05-26 18:42:04 +02:00
Fabien Potencier
55888299be Revert "bug #10937 [HttpKernel] Fix "absolute path" when we look to the cache directory (BenoitLeveque)"
This reverts commit 7dc8931969, reversing
changes made to 309046a207.
2014-05-26 18:42:01 +02:00
Fabien Potencier
d1f77c6d0d Revert "fixed CS"
This reverts commit 11816c5e51.
2014-05-26 18:41:58 +02:00
Fabien Potencier
af1c41c2fc Revert "bug #10979 Make rootPath part of regex greedy (artursvonda)"
This reverts commit 9766c72324, reversing
changes made to 168174af08.
2014-05-26 18:41:54 +02:00
Fabien Potencier
8d29ca160d Revert "[HttpKernel] simplified some tests"
This reverts commit ccacd8d2af.
2014-05-26 18:41:51 +02:00
Fabien Potencier
ccacd8d2af [HttpKernel] simplified some tests 2014-05-26 18:12:56 +02:00
Fabien Potencier
9766c72324 bug #10979 Make rootPath part of regex greedy (artursvonda)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #10979).

Discussion
----------

Make rootPath part of regex greedy

- Fixes #10977
- Also replaced `isset() && true` with simple `!empty()` which is equivalent.

Commits
-------

31da839 Make rootPath part of regex greedy
2014-05-26 18:03:54 +02:00
Arturs Vonda
31da839447 Make rootPath part of regex greedy
- Fixes #10977
2014-05-26 18:03:48 +02:00
Fabien Potencier
b62d4592ad Merge branch '2.5'
* 2.5:
  [TwigBridge][Trans]set %count% only on transChoice
  [Debug] throw even in stacking mode to preserve code paths
  [Debug] preserve modified error level
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15
2014-05-26 17:36:48 +02:00
Fabien Potencier
487e6ed466 Merge branch '2.4' into 2.5
* 2.4:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.4.6
  updated VERSION for 2.4.5
  updated CHANGELOG for 2.4.5
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:38 +02:00
Fabien Potencier
4ba44a786c Merge branch '2.3' into 2.4
* 2.3:
  [TwigBridge][Trans]set %count% only on transChoice
  [DomCrawler] Fixed a forgotten case of complex XPath queries
  bumped Symfony version to 2.3.16
  updated VERSION for 2.3.15
  updated CHANGELOG for 2.3.15

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-05-26 17:36:05 +02:00
Fabien Potencier
168174af08 bug #10995 [TwigBridge][Trans]set %count% only on transChoice from the current context. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[TwigBridge][Trans]set %count% only on transChoice from the current context.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8408
| License       | MIT

Commits
-------

d176ffc [TwigBridge][Trans]set %count% only on transChoice
2014-05-26 16:50:09 +02:00
Abdellatif AitBoudad
d176ffca51 [TwigBridge][Trans]set %count% only on transChoice 2014-05-26 14:22:36 +01:00