Commit Graph

286 Commits

Author SHA1 Message Date
Fabien Potencier
c7f9baf8f4 Merge branch '2.7' into 2.8
* 2.7:
  do not try to register incomplete definitions
2016-12-17 19:00:59 +01:00
Fabien Potencier
3e874dc878 bug #20799 [TwigBundle] do not try to register incomplete definitions (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] do not try to register incomplete definitions

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

Commits
-------

2c9dc66 do not try to register incomplete definitions
2016-12-17 18:59:13 +01:00
Christian Flothmann
2c9dc66665 do not try to register incomplete definitions 2016-12-15 08:06:17 +01:00
Fabien Potencier
c9d08b61c3 Merge branch '2.7' into 2.8
* 2.7:
  Write an exception message in a one heading line
  [Finder] Refine phpdoc about argument for NumberComparator
  Fix unresolved parameters from default bundle configs in debug:config
  [github] Tweak PR template
2016-12-13 10:38:12 +01:00
Victor Bocharsky
21925da88b Write an exception message in a one heading line 2016-12-09 17:28:59 +02:00
Nicolas Grekas
ab1fab2911 Merge branch '2.7' into 2.8
* 2.7:
  [Console] Add missing `@require` annotation in test
  Fix merge
  [appveyor] Fix failure reporting
  [#17634] move DebugBundle license file
  backport GlobTest from 2.7 branch
  Move licenses according to new best practices
  [FrameworkBundle] Remove unused code in test
  [2.3] Fixed an undefined variable in Glob::toRegex
  simplified a test
  fix container cache key generation
  [Form] fix option name in changelog
  [Translation] Add resources from fallback locale
  [DependencyInjection] enforce tags to have a name
  [YAML] Refine the return value of Yaml::parse()

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
2016-02-02 10:49:18 +01:00
Christian Flothmann
10c17f8589 Merge branch '2.3' into 2.7
* 2.3:
  Move licenses according to new best practices
2016-02-01 20:38:55 +01:00
Kévin Dunglas
aab5decc5b Move licenses according to new best practices 2016-01-31 22:16:42 +01:00
Fabien Potencier
dc6645593e Merge branch '2.7' into 2.8
* 2.7:
  Ability to set empty version strategy in packages
  CLI: use request context to generate absolute URLs
  [SecurityBundle] Optimize dependency injection tests
  Sort bundles in config commands
  [HttpFoundation] Do not overwrite the Authorization header if it is already set
  tag for dumped PHP objects must be a local one
2016-01-24 12:06:16 +01:00
Christian Flothmann
766a648ded CLI: use request context to generate absolute URLs 2016-01-23 11:02:39 +01:00
Nicolas Grekas
111f51dfa5 Merge branch '2.7' into 2.8
* 2.7:
  [Process] Fix potential race condition
  [PhpUnitBridge] Re-enable the garbage collector
  typo
  [FrameworkBundle] Set the kernel.name properly after a cache warmup
  Removed spaces before semicolon
2016-01-06 10:59:23 +01:00
Nicolas Grekas
6cd79e92f6 Merge branch '2.3' into 2.7
* 2.3:
  [Process] Fix potential race condition
  typo
  [FrameworkBundle] Set the kernel.name properly after a cache warmup
  Removed spaces before semicolon
2016-01-06 10:57:37 +01:00
Fabien Potencier
5a9c1b5a0f minor #17243 Removed spaces before semicolon (dereckson)
This PR was merged into the 2.3 branch.

Discussion
----------

Removed spaces before semicolon

'lorem ; ipsum' → 'lorem; ipsum'

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

Commits
-------

169d551 Removed spaces before semicolon
2016-01-04 17:52:03 +01:00
Fabien Potencier
0606d9c8b4 Merge branch '2.7' into 2.8
* 2.7:
  updated copyright year
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:33:41 +01:00
Fabien Potencier
d6f503660f Merge branch '2.3' into 2.7
* 2.3:
  Update copyright year
  [2.3] Static Code Analysis for Components
2016-01-03 16:32:00 +01:00
Diego Saint Esteben
ce067e6460 Update copyright year 2016-01-01 23:53:47 -03:00
Sébastien Santoro
169d5513a6 Removed spaces before semicolon
'lorem ; ipsum' → 'lorem; ipsum'
2016-01-01 15:10:52 +00:00
Fabien Potencier
bd3701b30f [TwigBundle] added a Twig templates warmer when templating is disabled 2015-10-19 11:33:50 +02:00
Fabien Potencier
6f48ec5be6 Merge branch '2.7' into 2.8
* 2.7:
  [TwigBundle] Fix Twig cache is not properly warmed
  [Security] Use SessionAuthenticationStrategy on RememberMe login
2015-10-17 17:40:24 +02:00
Tugdual Saunier
e704ee4d6c [TwigBundle] Fix Twig cache is not properly warmed 2015-10-17 14:09:51 +01:00
Fabien Potencier
ff3c107f14 [TwigBundle] removed usage of Templating classes 2015-09-28 16:10:19 +02:00
Javier Eguiluz
5a571b6eca Reordered the toolbar elements via service priorities 2015-07-31 17:06:53 +02:00
Kevin Bond
96cce38b00 Warmup twig templates in non-standard paths (closes #12507) 2015-06-30 13:50:17 +02:00
Fabien Potencier
42e3ecbe78 Merge branch '2.6' into 2.7
* 2.6: (25 commits)
  [2.6] link to https://symfony.com where possible
  Do not override PHP constants, only use when available
  link to https://symfony.com where possible
  [FrameworkBundle] Added missing log in server:run command
  [Finder] Only use GLOB_BRACE when available
  [HttpFoundation] Allow curly braces in trusted host patterns
  Fix merge
  Fix typo in variable name
  [profiler][security] check authenticated user by tokenClass instead of username.
  [WebProfiler] fix html syntax for input types
  [TwigBundle] Fix deprecated use of FlattenException
  [DependencyInjection] Removed extra strtolower calls
  Use https://symfony.com/search for searching
  [Debug] PHP7 compatibility with BaseException
  [Validator] Fixed Choice when an empty array is used in the "choices" option
  Fixed tests
  [StringUtil] Fixed singularification of 'selfies'
  Fix Portuguese (Portugal) translation for Security
  improved exception when missing required component
  [DependencyInjection] resolve circular reference
  ...

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
	src/Symfony/Component/Form/README.md
	src/Symfony/Component/Intl/README.md
	src/Symfony/Component/Security/README.md
	src/Symfony/Component/Translation/README.md
	src/Symfony/Component/Validator/README.md
2015-05-02 17:21:08 +02:00
Fabien Potencier
b8cd3ca3f8 Merge branch '2.3' into 2.6
* 2.3:
  link to https://symfony.com where possible
  [FrameworkBundle] Added missing log in server:run command
  [HttpFoundation] Allow curly braces in trusted host patterns
  [profiler][security] check authenticated user by tokenClass instead of username.
  Use https://symfony.com/search for searching

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
	src/Symfony/Component/Form/README.md
	src/Symfony/Component/Intl/README.md
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/README.md
	src/Symfony/Component/Translation/README.md
	src/Symfony/Component/Validator/README.md
2015-05-02 17:18:45 +02:00
Johnny Robeson
74983d7fd7 Use https://symfony.com/search for searching
Using https for symfony.com/search stops chrome (and eventually firefox)
from warning us about "Mixed Content" when developing sites that use SSL
for the entire site.
2015-04-26 17:52:15 -04:00
Christian Flothmann
e9bc23b54a make date formats and number formats configurable
This adds new Twig configuration options that make it possible to
configure the format of both numbers and dates as well as timezones
without the need to write custom code.

For example, using the new configuration options can look like this:

```yaml
twig:
    date:
        format: d.m.Y, H:i:s
        interval_format: %%d days
        timezone: Europe/Berlin
    number_format:
        decimals: 2
        decimal_point: ,
        thousands_separator: .
```
2015-04-03 10:30:44 +02:00
Fabien Potencier
6d605a7d3e Merge branch '2.6' into 2.7
* 2.6:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  Changed visibility of setUp() and tearDown to protected
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  Added default button class
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	.travis.yml
2015-03-12 15:31:07 +01:00
Fabien Potencier
43efb1ac1c Merge branch '2.3' into 2.6
* 2.3:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2015-03-12 15:30:42 +01:00
Bilal Amarni
cbd0525f8f used HTML5 meta charset tag and removed hardcoded ones
Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
2015-03-11 16:27:03 +01:00
Fabien Potencier
ddf5ac4429 made the assets optional 2015-02-12 13:06:55 +01:00
Fabien Potencier
0750d02025 removed usage of the deprecated forms of asset() in the core framework 2015-02-10 13:59:19 +01:00
Fabien Potencier
f74a1f2dc3 renamed asset_path() to asset() and added a BC layer 2015-02-10 13:45:46 +01:00
Fabien Potencier
d33c41d436 [Asset] added the component 2015-02-10 13:45:00 +01:00
Fabien Potencier
d5e8ee3219 bug #13476 [TwigBundle] fixed Twig options (removed the parameter as it cannot contain service references) (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] fixed Twig options (removed the parameter as it cannot contain service references)

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

The new `autoescape_service` option is used to set the `autoescape` Twig option, which can be a callable. The Twig options are stored in a parameter (`twig.options`), but as parameters cannot have references, that does not work well.

So, this PR removed the parameter as it is not needed.

Commits
-------

69748a1 [TwigBundle] fixed Twig options (removed the parameter as it cannot contain service references)
2015-01-30 09:56:14 +01:00
Fabien Potencier
daad64fa54 added a Twig panel to the WebProfiler 2015-01-25 19:12:34 +01:00
Fabien Potencier
ef0c9679cb integrated the Twig profiler 2015-01-25 19:10:07 +01:00
Fabien Potencier
bf066dace2 [TwigBundle] made AppVariable compatible with 3.0 2015-01-25 03:38:09 +01:00
Fabien Potencier
69748a1595 [TwigBundle] fixed Twig options (removed the parameter as it cannot contain service references) 2015-01-21 05:17:19 +01:00
Fabien Potencier
09ed9b5495 removed deprecated notices when using the security service 2015-01-20 01:43:09 +01:00
Fabien Potencier
1067cc5815 Revert "minor #13434 fixed some deprecated notices (fabpot)"
This reverts commit 564ae34dd7, reversing
changes made to df76faaa39.
2015-01-19 23:27:25 +01:00
Fabien Potencier
84f3753b33 fixed some deprecated notices 2015-01-16 19:08:37 +01:00
Fabien Potencier
293765ab36 moved AppVariable to the bridge 2015-01-13 12:17: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
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
91d01d83f5 [Security] removed usage of the deprecated SecurityContextInterface 2015-01-08 16:48:25 +01:00
Fabien Potencier
ee27ed8376 added an absolute_url() Twig function 2015-01-05 20:09:57 +01:00
Hugo Hamon
86b9f6b0c6 Adds deprecation notices for structures to be removed in 3.0. 2015-01-05 15:57:15 +01:00
Fabien Potencier
76abf98bff [TwigBundle] removed the Container dependency on ActionsExtension 2015-01-04 11:30:17 +01:00