Commit Graph

21074 Commits

Author SHA1 Message Date
Nicolas Grekas
60b1c5b5aa Added CHANGELOG entries, cleanups 2015-06-02 16:18:00 -07:00
Sébastien Lavoie
73f0ee2413 [DI][Routing] recursive directory loading
Issue #11045

For now, the Routing DirectoryLoader requires the type `directory`
to be specified so it does not conflict with `AnnotationDirectoryLoader`.
However, this could be refactored.
2015-06-02 16:17:59 -07:00
Fabien Potencier
78cf382aa2 feature #14733 [Security] Add setVoters() on AccessDecisionManager (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Add setVoters() on AccessDecisionManager

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

Alternative for #14550

Commits
-------

3fd7cea [Security] Add setVoters() on AccessDecisionManager
2015-06-01 17:31:50 +02:00
Kévin Dunglas
2983ecbf3d feature #14756 [Serializer] Support for array denormalization (derrabus)
This PR was merged into the 2.8 branch.

Discussion
----------

[Serializer] Support for array denormalization

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

This is a rebase of #14343 against the 2.8 branch.

I had to implement a couple of API endpoints that receive data as JSON-serialized arrays of objects. The current implementation of the Serializer component is capable of serializing such arrays, but so far this operation is a one-way-road. This PR is an attempt to change this.

## Demo
```php
class Dummy
{
    public $foo;
    public $bar;

    public function __construct($foo = null, $bar = null)
    {
        $this->foo = $foo;
        $this->bar = $bar;
    }
}

$serializer = new \Symfony\Component\Serializer\Serializer(
    array(
        new \Symfony\Component\Serializer\Normalizer\PropertyNormalizer(),
        new \Symfony\Component\Serializer\Normalizer\ArrayDenormalizer()
    ),
    array(
        new \Symfony\Component\Serializer\Encoder\JsonEncoder()
    )
);

$json = $serializer->serialize(
    array(
        new Dummy('one', 'two'),
        new Dummy('three', 'four')
    ),
    'json'
);

echo $json . "\n\n";

// Deserialize the JSON string, so we get back to where we started from.
$data = $serializer->deserialize($json, 'Dummy[]', 'json');

var_dump($data);
```

By appending `[]` to the type parameter, you indicate that you expect to deserialize an array of objects of the given type. This is the same notation that phpDocumentor uses to indicate collections. The denormalization of the array is implemented recursively: The denormalizer simply calls `Serializer::denormalize()` on each element of the array. This way, the ArrayDenormalizer can be combined with any other denormalizer.

## Side effects

For this implementation, I had to touch `GetSetMethodNormalizer`, `PropertyNormalizer` and `CustomNormalizer`. Those classes expected `supportsDenormalization` to be called with a valid class in the `$type` parameter. Instead of throwing a reflection exception, they now simply return false. I'm not exactly sure, if this is should be considered to be a BC break.

This implementation violates the `SerializerInterface` which declared `deserialize()` to always return an object. But imho, the assumption that serialized data always represents an object is too restrictive anyway. Also, this declaration is not consistent with the `serialize()` method which accepts `mixed` as input type for the data to serialize.

## Other PRs

I've found an older PR adressing this issue, #12066. That PR was closed because the contributor did not reply to feedback.

Commits
-------

0573f28d Support for array denormalization.
2015-05-27 13:35:50 +02:00
Alexander M. Turek
0573f28d9b Support for array denormalization. 2015-05-26 22:25:23 +02:00
Nicolas Grekas
3fd7ceaa81 [Security] Add setVoters() on AccessDecisionManager 2015-05-23 12:08:33 -07:00
Abdellatif Ait boudad
a57ce907be feature #14630 [Translator] Dump translation constants as tree instead of simple list (gepo)
This PR was merged into the 2.8 branch.

Discussion
----------

[Translator] Dump translation constants as tree instead of simple list

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

PR #14434 for 2.8 branch

Commits
-------

29ec5ca [Translation] add options 'as_tree', 'inline' to YamlFileDumper to dump messages as tree instead of simple list.
2015-05-20 20:39:24 +00:00
Gennady Telegin
29ec5caf8a [Translation] add options 'as_tree', 'inline' to YamlFileDumper to dump messages as tree instead of simple list.
Dump messages as tree based on '.' character as a delimeter in path.
For example this rray('foo.bar' => 'value') will be converted to array('foo' => array('bar' => 'value')).

Correctly process cases like this ['foo.bar' => 'test1', 'foo' => 'test2'].
2015-05-20 12:35:10 +03:00
Fabien Potencier
791e583b40 feature #14403 [Form] deprecate read_only option (Tobion)
This PR was squashed before being merged into the 2.8 branch (closes #14403).

Discussion
----------

[Form] deprecate read_only option

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #10658
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/3782

Replaces #10676 with a slightly different implementation.
- fixes BC break when 'read_only' => true option and at the same time custom attributes are used by using a normalizer
- adds deprecation notice
- keeps legacy tests

Commits
-------

53330e1 [Form] deprecate read_only option
2015-05-20 10:44:53 +02:00
Tobias Schultze
53330e1f69 [Form] deprecate read_only option 2015-05-20 10:44:46 +02:00
Fabien Potencier
65d4ae0429 feature #13324 [WebProfilerBundle] Improved page for logs (hason)
This PR was submitted for the 2.7 branch but it was merged into the 2.8 branch instead (closes #13324).

Discussion
----------

[WebProfilerBundle] Improved page for logs

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

*Before*
![logs-before](https://cloud.githubusercontent.com/assets/288535/5661713/3942c530-972f-11e4-89cb-2e185a6d07ac.png)
*After*
![logs-after](https://cloud.githubusercontent.com/assets/288535/5661681/d02b50da-972e-11e4-96e8-0572428ba82f.png)

Commits
-------

5fdc650 [WebProfilerBundle] Improved page for logs
2015-05-17 04:16:56 +02:00
Martin Hasoň
5fdc650dfe [WebProfilerBundle] Improved page for logs 2015-05-17 04:16:55 +02:00
Fabien Potencier
4b71fe0310 Merge branch '2.7' into 2.8
* 2.7:
  fixed CS
  fixed CS
  fixed CS
  Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
  [Validator] Deprecated PHP7-incompatible constraints and related validators
  [DebugBundle] Allow alternative destination for dumps
  [DebugBundle] Use output mechanism of dumpers instead of echoing
  [DebugBundle] Always collect dumps
  [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-05-15 16:11:12 +02:00
Fabien Potencier
0c613fbcea bug #14645 [WebProfilerBundle] Fix compatiblity with HttpKernel < 2.7 (GromNaN)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Fix compatiblity with HttpKernel < 2.7

The WebProfilerBundle version 2.7 is supposed to be compatible with HttpKernel 2.4, but the template of the config profile uses a property `symfonyState` that has been added in Symfony 2.7 by #13626.

> Twig_Error_Runtime: Method "symfonyState" for object "Symfony\Component\HttpKernel\DataCollector\ConfigDataCollector" does not exist in "@WebProfiler/Collector/config.html.twig" at line 12

This fix makes the property optional.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/silexphp/Silex-WebProfiler/pull/63
| License       | MIT

Commits
-------

700fcf1 Fix WebProfilerBundle compatiblity with HttpKernel < 2.7
2015-05-15 16:03:58 +02:00
Fabien Potencier
d883ba0984 fixed CS 2015-05-15 16:02:48 +02:00
Fabien Potencier
c658fcdbca Merge branch '2.6' into 2.7
* 2.6:
  fixed CS
  fixed CS

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-05-15 15:53:44 +02:00
Fabien Potencier
0678b3e6f8 fixed CS 2015-05-15 15:53:19 +02:00
Fabien Potencier
e83db434a2 Merge branch '2.3' into 2.6
* 2.3:
  fixed CS
2015-05-15 15:45:20 +02:00
Fabien Potencier
34d83a70b3 fixed CS 2015-05-15 15:45:10 +02:00
Fabien Potencier
c5fe926f40 minor #14591 [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands

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

Min dependency on `symfony/console` is changed to `~2.7` in the FrameworkBundle, as it will be a requirement in order to update each command provided in this bundle.

Commits
-------

e56a619 [FrameworkBundle] Applied new styles to the config:debug & config:dump-reference commands
2015-05-15 15:35:53 +02:00
Fabien Potencier
e13373ec11 Merge branch '2.6' into 2.7
* 2.6:
  [DebugBundle] Allow alternative destination for dumps
  [DebugBundle] Use output mechanism of dumpers instead of echoing
  [DebugBundle] Always collect dumps
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Component/Finder/Expression/Glob.php
2015-05-15 15:33:16 +02:00
Fabien Potencier
fcfc876c5b Merge branch '2.3' into 2.6
* 2.3:
  Fix tests in HHVM
  CS: Pre incrementation/decrementation should be used if possible

Conflicts:
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
	src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php
	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
2015-05-15 15:32:45 +02:00
Jérôme Tamarelle
700fcf1871 Fix WebProfilerBundle compatiblity with HttpKernel < 2.7 2015-05-15 15:29:11 +02:00
Fabien Potencier
984d82cbe5 minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Pre incrementation/decrementation should be used if possible

| 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

Fixes provided by new fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1113

If this pr is merged I would change the level of the fixer to `symfony`.

Commits
-------

c5123d6 CS: Pre incrementation/decrementation should be used if possible
2015-05-15 15:28:34 +02:00
Fabien Potencier
fcebef3f8a minor #14642 [Validator] Deprecated PHP7-incompatible constraints and related validators (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Deprecated PHP7-incompatible constraints and related validators

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

Commits
-------

a3fc6b9 [Validator] Deprecated PHP7-incompatible constraints and related validators
2015-05-15 15:21:56 +02:00
Fabien Potencier
525c149f92 bug #14640 [DebugBundle] Allow alternative destination for dumps (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[DebugBundle] Allow alternative destination for dumps

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

This PR fixes #14608 by adding a new `debug.dump_destination` configuration option to give users control over a stream destination where dumps will be written to.
In HTTP mode, dumps are still/also collected in the toolbar.
This supersedes #14627, #14631 and #14373

Commits
-------

5f255e5 [DebugBundle] Allow alternative destination for dumps
5368483 [DebugBundle] Use output mechanism of dumpers instead of echoing
8cb2abb [DebugBundle] Always collect dumps
2015-05-15 15:19:37 +02:00
Fabien Potencier
ebe78bb9ef minor #14598 [Security] Fix tests in HHVM (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Fix tests in HHVM

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

This PR fixes the tests in the Security components when run in HHVM. The failing tests are related to sebastianbergmann/phpunit-mock-objects#207

Commits
-------

139bae7 Fix tests in HHVM
2015-05-15 15:13:27 +02:00
Nicolas Grekas
2119bf387b Merge branch '2.7' into 2.8
* 2.7:
  [EventDispatcher] make listeners removable from an executed listener
  [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface"
  [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
  bumped Symfony version to 2.7.0
  updated VERSION for 2.7.0-BETA2
  updated CHANGELOG for 2.7.0-BETA2
  Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
  [Console] SymfonyStyle: fix block rpadding when escaping '<'
  [Console] fix code style

Conflicts:
	src/Symfony/Component/Form/composer.json
2015-05-15 13:18:22 +02:00
Nicolas Grekas
c477c5b395 bug #14600 [Console] SymfonyStyle: fix block rpadding when escaping '<' (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] SymfonyStyle: fix block rpadding when escaping '<'

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

![screenshot 2015-05-10 a 20 37 46](https://cloud.githubusercontent.com/assets/2211145/7555745/4dfbfd58-f755-11e4-98c4-3c42bb71abd3.PNG)

Commits
-------

80fc341 [Console] SymfonyStyle: fix block rpadding when escaping '<'
2015-05-15 12:18:14 +02:00
Nicolas Grekas
a88103b6e2 minor #14620 [Console] fix code style (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] fix code style

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

Prevent fabbot from complaining when the `SymfonyStyle` class or the `StyleInterface` are modified (like, for example, [here](a144667d5f)).

Commits
-------

314901e [Console] fix code style
2015-05-15 12:15:13 +02:00
Nicolas Grekas
a3fc6b9fa9 [Validator] Deprecated PHP7-incompatible constraints and related validators 2015-05-15 12:10:43 +02:00
Nicolas Grekas
8622a7b22a Merge branch '2.6' into 2.7
* 2.6:
  [EventDispatcher] make listeners removable from an executed listener
  [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
  Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)

Conflicts:
	src/Symfony/Component/Validator/Constraints/FalseValidator.php
	src/Symfony/Component/Validator/Constraints/NullValidator.php
	src/Symfony/Component/Validator/Constraints/TrueValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidatorLegacyApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidatorLegacyApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidatorLegacyApiTest.php
2015-05-15 11:56:16 +02:00
Nicolas Grekas
1688b2ef4f Merge branch '2.3' into 2.6
* 2.3:
  Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)

Conflicts:
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/Validator/CHANGELOG.md
	src/Symfony/Component/Validator/Constraints/FalseValidator.php
	src/Symfony/Component/Validator/Constraints/NullValidator.php
	src/Symfony/Component/Validator/Constraints/TrueValidator.php
	src/Symfony/Component/Validator/Tests/Constraints/IsFalseValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsNullValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/IsTrueValidatorTest.php
2015-05-15 11:48:50 +02:00
Christophe Coevoet
da58ad74d5 minor #14228 Add PHP7 compatible versions for the Null/True/False constraints as they are reserved words in PHP7 (stefan.r)
This PR was merged into the 2.3 branch.

Discussion
----------

Add PHP7 compatible versions for the Null/True/False constraints as they are reserved words in PHP7

| Q             | A
| ------------- | ---
| Bug fix?      |  PHP7 compatibility
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | N/A
| Fixed tickets | N/A - helps towards https://github.com/symfony/symfony/issues/14086
| License       | MIT

Null, True and False are reserved words in PHP7:

https://wiki.php.net/rfc/reserve_more_types_in_php_7

Commits
-------

44edbdf Fixed compatibility with PHP7 and up by introducing new constraints (IsNull, IsTrue, IsFalse) and related validators (IsNullValidator, IsTrueValidator, IsFalseValidator)
2015-05-15 11:24:48 +02:00
Nicolas Grekas
5f255e5059 [DebugBundle] Allow alternative destination for dumps 2015-05-15 10:09:58 +02:00
Nicolas Grekas
5368483d9a [DebugBundle] Use output mechanism of dumpers instead of echoing 2015-05-15 10:09:57 +02:00
Nicolas Grekas
8cb2abbd26 [DebugBundle] Always collect dumps 2015-05-15 09:50:22 +02:00
Fabien Potencier
ba719d18dd minor #14637 [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Lo… (vincentaubert)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Lo…

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

Commits
-------

5e8864d [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface"
2015-05-14 19:44:26 +02:00
Fabien Potencier
a7019ced63 Merge branch '2.3' into 2.6
* 2.3:
  [EventDispatcher] make listeners removable from an executed listener
  [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()

Conflicts:
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php
2015-05-14 19:42:48 +02:00
Fabien Potencier
291cf61616 bug #14633 [2.3][EventDispatcher] make listeners removable from an executed listener (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][EventDispatcher] make listeners removable from an executed listener

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

This fixes #13972 for Symfony 2.3. On Symfony 2.6 and higher, this has already been fixed with #14355.

Commits
-------

54bb399 [EventDispatcher] make listeners removable from an executed listener
2015-05-14 19:40:02 +02:00
Christian Flothmann
54bb3995ab [EventDispatcher] make listeners removable from an executed listener 2015-05-14 17:38:12 +02:00
Vincent AUBERT
5e8864d44a [2.7][DoctrineBridge] change Logger interface in tests to use Psr\\Log\\LoggerInterface instead of Symfony\\Component\\HttpKernel\\Log\\LoggerInterface" 2015-05-14 17:18:08 +02:00
Fabien Potencier
52c78b9cb4 minor #14632 [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead() (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()

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

Commits
-------

57571a9 [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead()
2015-05-14 17:09:07 +02:00
Nicolas Grekas
57571a9612 [HttpFoundation] Fix volatile MongoDbSessionHandlerTest::testRead() 2015-05-14 10:16:30 +02:00
Fabien Potencier
ec2df34115 bumped Symfony version to 2.7.0 2015-05-14 00:19:47 +02:00
Fabien Potencier
5cfcce37fa updated VERSION for 2.7.0-BETA2 2015-05-13 22:25:22 +02:00
Fabien Potencier
d0c07f3b7d updated CHANGELOG for 2.7.0-BETA2 2015-05-13 22:25:11 +02:00
Nicolas Grekas
aef24cb87f Merge branch '2.7' into 2.8
* 2.7:
  fix missing links to https://symfony.com
  fix missing links to https://symfony.com
  [travis] Don't use the cache
  [DebugBundle] Remove inlined dumps on XHR

Conflicts:
	src/Symfony/Component/Security/Acl/README.md
	src/Symfony/Component/Security/Core/README.md
	src/Symfony/Component/Security/Csrf/README.md
	src/Symfony/Component/Security/Http/README.md
2015-05-13 13:36:16 +02:00
Nicolas Grekas
b47b51187e Merge branch '2.6' into 2.7
* 2.6:
  fix missing links to https://symfony.com
  fix missing links to https://symfony.com
  [travis] Don't use the cache
  [DebugBundle] Remove inlined dumps on XHR

Conflicts:
	src/Symfony/Component/Security/Acl/README.md
	src/Symfony/Component/Security/Core/README.md
	src/Symfony/Component/Security/Csrf/README.md
	src/Symfony/Component/Security/Http/README.md
2015-05-13 13:34:46 +02:00
Nicolas Grekas
70e6a145c8 fix missing links to https://symfony.com 2015-05-13 13:33:56 +02:00