Commit Graph

16306 Commits

Author SHA1 Message Date
Fabien Potencier
84f3753b33 fixed some deprecated notices 2015-01-16 19:08:37 +01:00
Fabien Potencier
d752f74161 Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] fix routing descriptor for options
  exit when Twig environment is not set
  [Routing] fix misleading test for condition
  [Debug] fix test
  [Debug] add missing conflict dep rules
  [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle
  [HttpFoundation] Make use of isEmpty() method
  fix missing comma in YamlDumper
  [VarDumper] fix very special vars handling
  [Console] Helper\Table->addRow optimization
  [Console] Helper\Table->addRow optimization

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
2015-01-15 13:16:13 +01:00
Fabien Potencier
e87d4f7110 Merge branch '2.5' into 2.6
* 2.5:
  [FrameworkBundle] fix routing descriptor for options
  exit when Twig environment is not set
  [Routing] fix misleading test for condition
2015-01-15 13:15:12 +01:00
Tobias Schultze
b0c29a0c18 [FrameworkBundle] fix routing descriptor for options 2015-01-15 12:18:50 +01:00
Fabien Potencier
8d12652162 feature #13401 [TwigBundle] use the new Twig autoescaping strategy (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] use the new Twig autoescaping strategy

| 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

Commits
-------

55c4b41 [TwigBundle] use the new Twig autoescaping strategy
2015-01-14 11:54:20 +01:00
Fabien Potencier
52e18c51ed bug #13403 [TwigBridge] exit when Twig environment is not set in the DebugCommand (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] exit when Twig environment is not set in the DebugCommand

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

The `DebugCommand` from the TwigBridge requires the `Twig_Environment`
to be set. Thus, if the `setTwigEnvironment()` were not called, the
command execution would have been aborted with a PHP error.

Commits
-------

1cfc1b7 exit when Twig environment is not set
2015-01-14 10:26:03 +01:00
Fabien Potencier
ec6793ca72 [TwigBundle] added some missing deprecation notices 2015-01-14 07:07:14 +01:00
Fabien Potencier
55c4b41c29 [TwigBundle] use the new Twig autoescaping strategy 2015-01-14 06:59:05 +01:00
Fabien Potencier
98243180df minor #13402 [HttpKernel] fixed missing use cases (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] fixed missing use cases

| 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

Commits
-------

969c5d9 [HttpKernel] fixed missing use cases
2015-01-14 06:58:16 +01:00
Fabien Potencier
59270de161 minor #13392 moved AppVariable to the bridge (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

moved AppVariable to the bridge

| 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

Commits
-------

293765a moved AppVariable to the bridge
2015-01-14 06:56:32 +01:00
Christian Flothmann
05a4602450 exit when Twig environment is not set
The `LintCommand` from the TwigBridge requires the `Twig_Environment`
to be set. Thus, if the `setTwigEnvironment()` were not called, the
command execution would have been aborted with a PHP error.
2015-01-13 20:56:15 +01:00
Christian Flothmann
1cfc1b7fe7 exit when Twig environment is not set
The `DebugCommand` from the TwigBridge requires the `Twig_Environment`
to be set. Thus, if the `setTwigEnvironment()` were not called, the
command execution would have been aborted with a PHP error.
2015-01-13 20:54:23 +01:00
Fabien Potencier
969c5d92b3 [HttpKernel] fixed missing use cases 2015-01-13 18:52:06 +01:00
Tobias Schultze
d687a885a4 [Routing] fix misleading test for condition 2015-01-13 15:58:43 +01:00
Nicolas Grekas
df9bb2674e [Debug] fix test 2015-01-13 15:49:42 +01:00
Fabien Potencier
40854edb1f fixed typo 2015-01-13 13:55:31 +01:00
Tobias Schultze
9f85517645 feature #13361 [Routing] apply deprecation triggers and fix tests (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] apply deprecation triggers and fix tests

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [#12641, #12640, #12719]
| License       | MIT
| Doc PR        |

Correctly add deprecation for _scheme and _method requirements and fix code to not trigger deprecations itself. And fix test so that they either explicitly test deprecated functionality or alternatively refactor tests to use new style.

It also fixes the deprecation triggers for "pattern" which was not correctly done for YAML/XML loading.

Commits
-------

9af0ff2 [FrameworkBundle] fix routing container param resolving to not access deprecated requirements while maintaining BC
bd91867 [FrameworkBundle] remove superfluous test that is already covered in routing
bc1c5c8 [Routing] apply deprecation triggers and fix tests
2015-01-13 13:45:06 +01:00
Tobias Schultze
9af0ff2fb2 [FrameworkBundle] fix routing container param resolving to not access deprecated requirements while maintaining BC 2015-01-13 13:22:41 +01:00
Tobias Schultze
bd91867225 [FrameworkBundle] remove superfluous test that is already covered in routing 2015-01-13 13:22:41 +01:00
Tobias Schultze
bc1c5c841f [Routing] apply deprecation triggers and fix tests 2015-01-13 13:22:39 +01:00
Fabien Potencier
293765ab36 moved AppVariable to the bridge 2015-01-13 12:17:07 +01:00
Fabien Potencier
c2f2fe518e Merge branch '2.5' into 2.6
* 2.5:
  [Debug] add missing conflict dep rules
2015-01-13 11:55:35 +01:00
Fabien Potencier
d7e9448353 Merge branch '2.3' into 2.5
* 2.3:
  [Debug] add missing conflict dep rules
2015-01-13 11:55:30 +01:00
Fabien Potencier
c6695d1e8b bug #13351 [VarDumper] fix very special vars handling (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] fix very special vars handling

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

Commits
-------

e26dc2c [VarDumper] fix very special vars handling
2015-01-13 11:55:05 +01:00
Fabien Potencier
760ad3306f minor #13386 [Debug] add missing conflict dep rules (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] add missing conflict dep rules

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

Commits
-------

a4be610 [Debug] add missing conflict dep rules
2015-01-13 11:52:51 +01:00
Fabien Potencier
bd01a29eb4 moved the logic from debug:twig to the Twig bridge 2015-01-13 11:05:58 +01:00
Nicolas Grekas
a4be6103d4 [Debug] add missing conflict dep rules 2015-01-13 10:04:07 +01:00
Fabien Potencier
66b6e79ed2 Merge branch '2.5' into 2.6
* 2.5:
  [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle
  [HttpFoundation] Make use of isEmpty() method
  fix missing comma in YamlDumper
  [Console] Helper\Table->addRow optimization
  [Console] Helper\Table->addRow optimization

Conflicts:
	src/Symfony/Bundle/SecurityBundle/composer.json
2015-01-13 08:22:24 +01:00
Fabien Potencier
bf3e882a0c Merge branch '2.3' into 2.5
* 2.3:
  [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle
  [HttpFoundation] Make use of isEmpty() method
  fix missing comma in YamlDumper
  [Console] Helper\Table->addRow optimization

Conflicts:
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
2015-01-13 08:22:00 +01:00
Fabien Potencier
cc359a6798 [TwigBundle] allowed SecurityBundle to use the latest versions of FrameworkBundle 2015-01-13 08:01:38 +01:00
Fabien Potencier
c7ae71d6da [FrameworkBundle] bumped deps for HttpKernel 2015-01-13 07:07:41 +01:00
Fabien Potencier
fa03bd59ba [TwigBundle] bumped deps for HttpKernel 2015-01-12 22:48:35 +01:00
Fabien Potencier
faf7db1b8a bug #13371 fix missing comma in YamlDumper (garak)
This PR was merged into the 2.3 branch.

Discussion
----------

fix missing comma in YamlDumper

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

The YamlDumper were missing commas between tag attributes.
See https://github.com/rosstuck/TuckConverterBundle/issues/6

Commits
-------

f600d1a fix missing comma in YamlDumper
2015-01-12 17:43:29 +01:00
Alexander Schwenn
fc51d544b5 [HttpFoundation] Make use of isEmpty() method 2015-01-12 17:40:49 +01:00
Fabien Potencier
2be8b6e2ea [TwigBundle] optimized the hinclude fragement renderer when only Twig is used 2015-01-12 16:31:03 +01:00
Fabien Potencier
6148652d05 [FrameworkBundle] removed obsolete ContainerAwareHIncludeFragmentRenderer class 2015-01-12 16:31:03 +01:00
Fabien Potencier
e620cbfce2 lazy-load fragment renderers 2015-01-12 16:31:01 +01:00
Massimiliano Arione
f600d1a557 fix missing comma in YamlDumper 2015-01-11 18:40:41 +01:00
Fabien Potencier
80b097094c bug #13355 [Console] Helper\Table->addRow optimization (boekkooi)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] Helper\Table->addRow optimization

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

Commits
-------

5d3a1fc [Console] Helper\Table->addRow optimization
2015-01-10 18:09:02 +01:00
Fabien Potencier
76de7006d5 bug #13347 [Console] Helper\TableHelper->addRow optimization (boekkooi)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Helper\TableHelper->addRow optimization

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

Commits
-------

9ea59ac [Console] Helper\Table->addRow optimization
2015-01-10 18:05:09 +01:00
Nicolas Grekas
e26dc2c958 [VarDumper] fix very special vars handling 2015-01-10 17:01:14 +01:00
Fabien Potencier
18d4c4163c [TwigBundle] added some tests 2015-01-10 16:37:07 +01:00
Fabien Potencier
0d537c4e4d decoupled Twig from the Templating system 2015-01-10 16:22:08 +01:00
Fabien Potencier
be5a208c39 decoupled global variables system in Twig from the Templating one 2015-01-10 16:20:07 +01:00
Warnar Boekkooi
5d3a1fc4c5 [Console] Helper\Table->addRow optimization 2015-01-10 13:50:07 +01:00
Fabien Potencier
861804be5f feature #13264 URL manipulations as a Twig extension (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

URL manipulations as a Twig extension

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

While working on the new asset component, I realized that the "absolute URL" feature was misplaced and would benefit from being exposed as a Twig function (composition is always a good thing). Then, I wondered if having a Twig function to generate a relative path (like done by the Routing component would also make sense). And here is the corresponding PR.

```jinja
{# generate an absolute URL for the given absolute path #}
{{ absolute_url('/me.png') }}

{# generate a relative path for the given absolute path (based on the current Request) #}
{{ relative_path('/foo/me.png') }}

{# compose as you see fit #}
{{ absolute_url(asset('me.png')) }}
```

As you can see, we require an absolute path for both functions (and we even add the leading slash if it is omitted), not sure if we want to do otherwise.

ping @tobion

Commits
-------

0ec852d added a relative_path Twig function
ee27ed8 added an absolute_url() Twig function
2015-01-10 08:28:57 +01:00
Fabien Potencier
545e1a4bc1 minor #13349 [2.7] Fix deprecations on TwigBundle and FrameworkBundle semantic configurations (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Fix deprecations on TwigBundle and FrameworkBundle semantic configurations

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

Commits
-------

8d60396 [FrameworkBundle|TwigBundle] update functional tests configuration files to not use deprecated config keys anymore.
2015-01-09 21:00:04 +01:00
Hugo Hamon
8d60396e0e [FrameworkBundle|TwigBundle] update functional tests configuration files to not use deprecated config keys anymore. 2015-01-09 19:19:37 +01:00
Fabien Potencier
7a4c5fcd78 Merge branch '2.6' into 2.7
* 2.6:
  [PropertyAccessor] Added test to allow null value for a array
  [Yaml] Fixed #10597: Improved Yaml directive parsing
  [Form] Fixed check of violation constraint #12792
  [Form] Set a child type to text if added to the form without a type.
2015-01-09 19:07:24 +01:00
Fabien Potencier
aed787878f Merge branch '2.5' into 2.6
* 2.5:
  [PropertyAccessor] Added test to allow null value for a array
  [Yaml] Fixed #10597: Improved Yaml directive parsing
  [Form] Set a child type to text if added to the form without a type.
2015-01-09 19:07:16 +01:00