Commit Graph

19054 Commits

Author SHA1 Message Date
Nicolas Grekas edd705716a [DependencyInjection] make paths relative to __DIR__ in the generated container 2014-12-02 11:32:16 +01:00
Fabien Potencier 1c8bfeaa6c minor #12794 [FrameworkBundle][Router Cmd] Use debug namespace. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle][Router Cmd] Use debug namespace.

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

Commits
-------

408df7c [FrameworkBundle][Router Cmd] use debug namespace.
2014-12-01 18:53:46 +01:00
Fabien Potencier 619acd252d minor #12787 [FrameworkBundle] Update deprecated service call (lrlopez)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] Update deprecated service call

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | none, but related to #11593 and #11690
| License       | MIT
| Doc PR        | none

Service `security.context` is now deprecated due to PR #11690. This commit updates PR #11593 replacing `security.context` with `security.authorization_checker` in the `isGranted()` controller shortcut introduced in Symfony 2.6.

Commits
-------

2625193 [FrameworkBundle] Update deprecated service call
2014-12-01 18:52:16 +01:00
Abdellatif AitBoudad 408df7c1ce [FrameworkBundle][Router Cmd] use debug namespace. 2014-12-01 14:24:26 +00:00
Luis Ramón López 2625193bd1 [FrameworkBundle] Update deprecated service call
The service `security.context` is now deprecated due to PR #11690.

This commit updates PR #11593 replacing `security.context` with
`security.authorization_checker` in the `isGranted()` controller
shortcut.
2014-11-30 20:51:37 +01:00
Fabien Potencier 9e0dff5a91 minor #12781 Fixed the symfony/config version constraint (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the symfony/config version constraint

| 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

##### This pull request fixes the `symfony/config` version constraint in the proxy manager bridge.

Before this pull, composer was only allowing `v2.3.0` to be downloaded. This surely was not the intention. I've updated the version constraint from `"2.3"` to `"~2.3"` thus allowing all 2.x versions that are equal to or greater than `v2.3.0`.

Commits
-------

ec14f0f Fixed the symfony/config version constraint
2014-11-30 18:00:27 +01:00
Fabien Potencier c68ff54aac minor #12774 Docblock Fixes (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Docblock Fixes

| 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

##### This pull request fixes the docblock alignment as requested in #12760.

It was also necessary for me to ensure the `@return` annotations were correctly separated in order to accurately align the `@param` annotations.

Commits
-------

443307e Docblock fixes
2014-11-30 17:59:09 +01:00
Fabien Potencier b4a8655020 minor #12777 Tweaked the password-compat version constraint (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Tweaked the password-compat version constraint

| 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

##### This pull request tweaks the `"ircmaxell/password-compat` version constraint in the 2.3 branch.

I've updated the version constraint to `"~1.0"` match the way we require all "stable" releases. Note that this version constraint is technically different, but I consider it safe still.

Commits
-------

f703e56 Tweaked the password-compat version constraint
2014-11-30 17:56:53 +01:00
Fabien Potencier b788a08f50 minor #12783 Fixed the syntax of a composer.json file (GrahamCampbell)
This PR was merged into the 2.3 branch.

Discussion
----------

Fixed the syntax of a composer.json file

| 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

##### This pull request fixes the syntax of a composer.json file.

There should not be a space before a colon following a double quote. This is not bad syntax, but it just an inconsistency.

Commits
-------

0f8547a Fixed the syntax of a composer.json file
2014-11-30 17:54:43 +01:00
Fabien Potencier 5b6a95c4c2 minor #12785 Removed a dev annotation from a version constraint (GrahamCampbell)
This PR was merged into the 2.6 branch.

Discussion
----------

Removed a dev annotation from a version constraint

| 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

##### This pull request removes an unneeded dev annotation from a version constraint.

This annotation is no longer required because the stable tag is now sufficient, and also, even if we did want the dev version, we still wouldn't need this annotation because it's a dev-dependency, and the minimum stability is set to dev anyway.

Commits
-------

5e35fff Removed a dev annotation from a version constraint
2014-11-30 17:54:03 +01:00
Graham Campbell 5e35fffa70 Removed a dev annotation from a version constraint 2014-11-30 15:16:06 +00:00
Graham Campbell 0f8547af4b Fixed the syntax of a composer.json file 2014-11-30 15:11:35 +00:00
Graham Campbell ec14f0f007 Fixed the symfony/config version constraint
Fixes the symfony/config version constraint in the proxy manager bridge
2014-11-30 15:06:19 +00:00
Graham Campbell f703e5661a Tweaked the password-compat version constraint 2014-11-30 14:39:13 +00:00
Graham Campbell 443307edc1 Docblock fixes 2014-11-30 13:33:44 +00:00
Nicolas Grekas ceecb502f8 [Filesystem] fix lock file permissions 2014-11-30 11:30:45 +01:00
Fabien Potencier a0703cff9a minor #12767 [Console] Remove dialog helper usage (blanchonvincent)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] Remove dialog helper usage

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

Because the dialog helper is deprecated, we should use question helper instead.

Commits
-------

844aa54 Remove dialog usage
2014-11-30 11:12:31 +01:00
blanchonvincent 844aa54aa2 Remove dialog usage 2014-11-30 09:03:32 +01:00
Fabien Potencier 6945a2a15a bug #12716 [ClassLoader] define constant only if it wasn't defined before (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] define constant only if it wasn't defined before

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

Commits
-------

388229b define constant only if it wasn't defined before
2014-11-29 13:55:31 +01:00
Christian Flothmann 388229b55c define constant only if it wasn't defined before 2014-11-29 13:36:20 +01:00
Fabien Potencier 309de6dd61 minor #12632 Fixed a docblock (GrahamCampbell)
This PR was merged into the 2.6 branch.

Discussion
----------

Fixed a docblock

Commits
-------

e130a29 Fixed a docblock
2014-11-29 13:09:38 +01:00
Fabien Potencier 2c4d0ca6ff minor #12638 [Hackday][2.3] Fixed typos (pborreli)
This PR was merged into the 2.3 branch.

Discussion
----------

[Hackday][2.3] Fixed typos

Commits
-------

7a67e8c Fixed typos
2014-11-29 12:52:41 +01:00
Fabien Potencier facdd9082b minor #12644 Fix incorrect spanish translation (alfonso)
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #12644).

Discussion
----------

Fix incorrect spanish translation

SymfonyCon Madrid 2014 Hackday

Commits
-------

28b07ba Fix incorrect spanish translation
2014-11-29 12:13:57 +01:00
alfonso 28b07bad90 Fix incorrect spanish translation 2014-11-29 12:13:56 +01:00
Pascal Borreli 7a67e8c444 Fixed typos 2014-11-29 11:42:24 +01:00
Graham Campbell e130a298db Fixed a docblock 2014-11-29 10:41:07 +00:00
Fabien Potencier c6fe3c0d4a minor #12552 [FrameworkBundle] removed unneeded check (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] removed unneeded check

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

It is already checked in the `isEnabled()` method of the parent
`ServerCommand` class if the current PHP build is HHVM and the
`server:start` command is never enabled then. Thus, it's not needed
to check for HHVM on every command execution.

This was pointed out by @stof in #12489 for the `server:run` command.

Commits
-------

ce2adfa removed unneeded check
2014-11-29 11:34:59 +01:00
Fabien Potencier 1ef9cf6dc7 bumped Symfony version to 2.6.1 2014-11-29 11:21:18 +01:00
Fabien Potencier 645bb3248d updated VERSION for 2.6.0 2014-11-28 16:59:01 +01:00
Fabien Potencier 9b30ec0d78 updated CHANGELOG for 2.6.0 2014-11-28 16:58:51 +01:00
Fabien Potencier 18c4ac1f6e Merge branch '2.5' into 2.6
* 2.5:
  [Debug] fix error message on double exception
  Fix initialized() with aliased services
  Rename Symfony2 to Symfony
  compare version using PHP_VERSION_ID
  backport #12489
  remove an unneeded check
2014-11-28 11:00:40 +01:00
Fabien Potencier 402e18321e Merge branch '2.3' into 2.5
* 2.3:
  [Debug] fix error message on double exception
  Fix initialized() with aliased services
  Rename Symfony2 to Symfony
  backport #12489

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
	src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
2014-11-28 11:00:29 +01:00
Fabien Potencier 0dfa7d549e minor #12554 compare version using PHP_VERSION_ID (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

compare version using PHP_VERSION_ID

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

This continues the work started in #12497 on the `2.3` branch.

Commits
-------

d2f846b compare version using PHP_VERSION_ID
2014-11-28 10:43:41 +01:00
Fabien Potencier efbf588ed0 bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
This PR was submitted for the 2.6 branch but it was merged into the 2.3 branch instead (closes #12553).

Discussion
----------

[Debug] fix error message on double exception

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

Commits
-------

1ed7606 [Debug] fix error message on double exception
2014-11-28 10:40:13 +01:00
Nicolas Grekas 1ed7606c32 [Debug] fix error message on double exception 2014-11-28 10:40:13 +01:00
Fabien Potencier 155fa96bff minor #12551 remove an unneeded check (xabbuh)
This PR was merged into the 2.5 branch.

Discussion
----------

remove an unneeded check

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

It is already checked in the `isEnabled()` method if the current PHP
build is HHVM and the `server:run` command is never enabled then.
Thus, it's not needed to check for HHVM on every command execution.

Commits
-------

2035fea remove an unneeded check
2014-11-28 10:36:33 +01:00
Fabien Potencier 819280fbbc bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] backport #12489

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

Commits
-------

556eff1 backport #12489
2014-11-28 10:32:58 +01:00
Fabien Potencier 4f05279edd minor #12565 Rename Symfony2 to Symfony (romainneutron)
This PR was merged into the 2.3 branch.

Discussion
----------

Rename Symfony2 to Symfony

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

Replaces #12563

Commits
-------

0a76b7e Rename Symfony2 to Symfony
2014-11-28 10:25:39 +01:00
Fabien Potencier c4902d8342 minor #12579 [Translation] [2.6] Upgrade information for LoggingTranslator (derrabus)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translation] [2.6] Upgrade information for LoggingTranslator

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

When upgrading a Symfony 2.5 project to the 2.6 branch, I noticed that the `@translator` service was changed. In the affected project, we've had a service that depends on the `@translator` service and uses a type hint to ensure that a `Translator` instance is passed to the constructor. With the introduction of the `LoggingTranslator` class (PR #10887), this type hint now fails.

I have added a small note to ` UPGRADE-2.6.md` in case more people stumble across this changed behavior.

Commits
-------

cd55a81 Upgrade information for the Translation component regarding the new LoggingTranslator class.
2014-11-28 10:16:35 +01:00
Fabien Potencier 48e6f7ad6d bug #12437 [2.6] [Validator] make DateTime objects represented as strings in the violation message (hhamon)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #12437).

Discussion
----------

[2.6] [Validator] make DateTime objects represented as strings in the violation message

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

Commits
-------

b753218 [Validator] make DateTime objects represented as strings in the violation message.
2014-11-28 10:08:04 +01:00
Hugo Hamon b753218ff5 [Validator] make DateTime objects represented as strings in the violation message. 2014-11-28 10:08:04 +01:00
Fabien Potencier 79c7849750 minor #12566 [Security][Http] fix data type in docblock (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Security][Http] fix data type in docblock

| Q             | A
| ------------- | ---
| Fixed tickets | #12564
| License       | MIT

Commits
-------

1c6f5a1 fix data type in docblock
2014-11-28 10:05:18 +01:00
Nicolas Grekas f8b1e68f1e minor #12584 [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener (jeromemacias)
This PR was squashed before being merged into the 2.6 branch (closes #12584).

Discussion
----------

[RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener

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

Usage of the `container` service as dependency avoid using the listener outside of a Symfony project.

I don't know if the lazy loading of the dumper service is really required. We should only use the `DebugBundle` in `dev` environment.
If it break performance, maybe we can consider using the `lazy="true"` parameter in services definition.

I currently working on a Silex [`DebugServiceProvider`](https://github.com/jeromemacias/Silex-Debug) which use the `DebugBundle` to avoid duplicating the dump profiler view (like it's done by the `WebProfilerServiceProvider`).
Those modifications are required by the provider to be usable.

Commits
-------

680fe7a [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener
2014-11-27 17:54:54 +01:00
Jérôme Macias 680fe7acb2 [RFC] [DebugBundle] [HttpKernel] Avoid using container as dependency for DumpListener 2014-11-27 17:54:39 +01:00
Alexander M. Turek cd55a81df7 Upgrade information for the Translation component regarding the new LoggingTranslator class. 2014-11-26 14:42:19 +01:00
Fabien Potencier 6a59db5a08 bug #12575 [WebProfilerBundle] Remove usage of app.request in search bar template (jeromemacias)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfilerBundle] Remove usage of app.request in search bar template

This PR removes the last usage of the global Twig variable `app.request` in Symfony.

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

Commits
-------

d3451fc [WebProfilerBundle] Remove usage of app.request in search bar template
2014-11-26 09:17:16 +01:00
Jérôme Macias d3451fc938 [WebProfilerBundle] Remove usage of app.request in search bar template 2014-11-26 00:05:04 +01:00
Fabien Potencier 1ce8f03040 bug #12570 Fix initialized() with aliased services (Daniel Wehner)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12570).

Discussion
----------

Fix initialized() with aliased services

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

Commits
-------

a18b6d1 Fix initialized() with aliased services
2014-11-25 12:27:34 +01:00
Daniel Wehner a18b6d17e3 Fix initialized() with aliased services 2014-11-25 12:27:34 +01:00
Christian Flothmann 1c6f5a1c89 fix data type in docblock 2014-11-24 19:24:01 +01:00