Commit Graph

5759 Commits

Author SHA1 Message Date
Fabien Potencier 7cf279d3d6 Merge branch '2.x' into 3.x
* 2.x:
  [TwigExtraBundle] Add the return type information in getConfigTreeBuilder()
2021-11-05 17:53:41 +01:00
Fabien Potencier a34f98ec59 bug #3586 [TwigExtraBundle] Add the return type information in getConfigTreeBuilder() (javiereguiluz)
This PR was merged into the 2.x branch.

Discussion
----------

[TwigExtraBundle] Add the return type information in getConfigTreeBuilder()

Moved from https://github.com/twigphp/twig-extra-bundle/pull/5

-----

This will fix the following deprecation:

```
  1x: Method "Symfony\Component\Config\Definition\ConfigurationInterface::getConfigTreeBuilder()" might add "TreeBuilder" as a native return type declaration in the future. Do the same in implementation "Twig\Extra\TwigExtraBundle\DependencyInjection\Configuration" now to avoid errors or add an explicit `@return` annotation to suppress this message.
    1x in AddUserCommandTest::testCreateUserNonInteractive from App\Tests\Command
```

Commits
-------

26654f65 [TwigExtraBundle] Add the return type information in getConfigTreeBuilder()
2021-11-05 17:53:11 +01:00
Javier Eguiluz 26654f653f [TwigExtraBundle] Add the return type information in getConfigTreeBuilder() 2021-11-05 16:54:01 +01:00
Fabien Potencier d87d6a0b6d Merge branch '2.x' into 3.x
* 2.x:
  Fix emphasis on compiler to bold styling
2021-11-04 18:53:43 +01:00
Fabien Potencier f75db68112 Merge branch '1.x' into 2.x
* 1.x:
  Fix emphasis on compiler to bold styling
2021-11-04 18:53:35 +01:00
Fabien Potencier 7e5ba95dc8 minor #3584 Fix emphasis on compiler to bold styling (jonnyeom)
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Fix emphasis on compiler to bold styling

This is just so the Lexer, Parser, and Compiler has the same styling

Commits
-------

97ae3c8e Fix emphasis on compiler to bold styling
2021-11-04 18:52:44 +01:00
Jonny Eom 97ae3c8e97 Fix emphasis on compiler to bold styling 2021-11-04 18:52:41 +01:00
Fabien Potencier e8fb1ef29b Merge branch '2.x' into 3.x
* 2.x:
  Remove license info in the README now that Github already displays it
2021-11-03 16:51:12 +01:00
Fabien Potencier 8447e8dcd5 Remove license info in the README now that Github already displays it 2021-11-03 16:48:53 +01:00
Fabien Potencier 3e4b22ce13 minor #3577 Update README.md (noniagriconomie)
This PR was merged into the 3.x branch.

Discussion
----------

Update README.md

Ref https://github.com/twigphp/cache-extra/pull/2
friendly ping `@fabpot`

Commits
-------

9286dacb Update README.md
2021-10-18 10:00:25 +02:00
Antoine Makdessi 9286dacb0b Update README.md 2021-10-18 09:47:52 +02:00
Fabien Potencier b13aa12389 Merge branch '2.x' into 3.x
* 2.x:
  Update .gitattributes to exclude non-dist files
2021-10-04 11:04:31 +02:00
Fabien Potencier 5e7ec8b53d Merge branch '1.x' into 2.x
* 1.x:
  Update .gitattributes to exclude non-dist files
2021-10-04 11:04:25 +02:00
Fabien Potencier 8bab813c86 minor #3570 Update .gitattributes to exclude non-dist files (kaznovac)
This PR was submitted for the 3.x branch but it was squashed and merged into the 1.x branch instead.

Discussion
----------

Update .gitattributes to exclude non-dist files

resolves #3503

some extra files can be excluded also:
- changelog
- license
- readme

should this be rebased to 1.x, 2.x?

Commits
-------

92766d0e Update .gitattributes to exclude non-dist files
2021-10-04 11:03:20 +02:00
Marko Kaznovac 92766d0e0c Update .gitattributes to exclude non-dist files 2021-10-04 11:03:13 +02:00
Fabien Potencier e109bbdfa3 Merge branch '2.x' into 3.x
* 2.x:
  Update markdown-to-html converter missing message
  Fix CS
  Missing Environment and LoaderInterface
2021-09-29 14:18:02 +02:00
Fabien Potencier a7d0568c90 minor #3566 Update markdown-to-html converter missing message (tobias-93)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Update markdown-to-html converter missing message

The `league/html-to-markdown` library does not support Markdown to HTML conversion (anymore?). The `league/commonmark` library is suitable for that.

Commits
-------

46d21545 Update markdown-to-html converter missing message
2021-09-29 14:16:58 +02:00
Tobias Feijten 46d21545a6 Update markdown-to-html converter missing message
The `league/html-to-markdown` library does not support Markdown to HTML conversion (anymore?). The `league/commonmark` library is suitable for that.
2021-09-29 14:16:54 +02:00
Fabien Potencier ce5f3889d8 Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
  Missing Environment and LoaderInterface
2021-09-22 17:08:32 +02:00
Fabien Potencier 3a18bb3a6b Fix CS 2021-09-22 17:05:23 +02:00
Fabien Potencier 212e49be47 minor #3563 Missing Environment and LoaderInterface (remicollet)
This PR was merged into the 1.x branch.

Discussion
----------

Missing Environment and LoaderInterface

Detected by CI...

Commits
-------

61df934a Missing Environment and LoaderInterface
2021-09-22 17:03:26 +02:00
Remi Collet 61df934a7e Missing Environment and LoaderInterface 2021-09-22 11:33:46 +02:00
Fabien Potencier 96d8b0ecd4 Bump version 2021-09-17 10:45:16 +02:00
Fabien Potencier a27fa056df Prepare the 3.3.3 release v3.3.3 2021-09-17 10:44:23 +02:00
Fabien Potencier 763c06ba50 Update CHANGELOG 2021-09-17 10:44:00 +02:00
Fabien Potencier 199e6d445f Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.7 release
  Update CHANGELOG
  Bump version
  Prepare the 1.44.5 release
  Update CHANGELOG
2021-09-17 10:42:32 +02:00
Fabien Potencier 78ac30114f Bump version 2021-09-17 10:41:05 +02:00
Fabien Potencier 8e202327ee Prepare the 2.14.7 release v2.14.7 2021-09-17 10:39:54 +02:00
Fabien Potencier 3a89404984 Update CHANGELOG 2021-09-17 10:39:28 +02:00
Fabien Potencier b7aca14933 Merge branch '1.x' into 2.x
* 1.x:
  Bump version
  Prepare the 1.44.5 release
  Update CHANGELOG
2021-09-17 10:37:45 +02:00
Fabien Potencier 803efed8ea Bump version 2021-09-17 10:36:08 +02:00
Fabien Potencier dd4353357c Prepare the 1.44.5 release v1.44.5 2021-09-17 10:35:19 +02:00
Fabien Potencier 881744313e Update CHANGELOG 2021-09-17 10:34:38 +02:00
Fabien Potencier 464842c41f Merge branch '2.x' into 3.x
* 2.x:
  Add explicit `@return` type next to `#[ReturnTypeWillChange]`
2021-08-11 09:52:24 +02:00
Fabien Potencier 50a41e48d0 minor #3554 Add explicit `@return type next to #[ReturnTypeWillChange]` (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Add explicit ``@return`` type next to `#[ReturnTypeWillChange]`

Commits
-------

1d0bab9d Add explicit ``@return`` type next to `#[ReturnTypeWillChange]`
2021-08-11 09:52:09 +02:00
Nicolas Grekas 1d0bab9d63 Add explicit @return type next to #[ReturnTypeWillChange] 2021-08-10 18:49:26 +02:00
Fabien Potencier d9ac797190 Merge branch '2.x' into 3.x
* 2.x:
  Twig2 PHP 8.1 beta compatibility
2021-07-29 09:09:30 +02:00
Fabien Potencier 5bfe5cce20 bug #3552 Twig2 PHP 8.1 beta compatibility (alexpott)
This PR was merged into the 2.x branch.

Discussion
----------

Twig2 PHP 8.1 beta compatibility

PHP 8.1 adds deprecation warnings for \IteratorAggregate \Countable and \ArrayAccess and Twig 2 (and 3) need to be updated for this.

Commits
-------

98c2233e Twig2 PHP 8.1 beta compatibility
2021-07-29 08:54:21 +02:00
Alex Pott 98c2233e47 Twig2 PHP 8.1 beta compatibility 2021-07-28 09:49:43 +01:00
Fabien Potencier 5f20d4a362 Merge branch '2.x' into 3.x
* 2.x:
  Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 13:01:29 +02:00
Fabien Potencier feeaba3fea Merge branch '1.x' into 2.x
* 1.x:
  Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 13:01:04 +02:00
Fabien Potencier 9ba72f1b82 bug #3548 Explicitly specify the encoding for mb_ord in JS escaper (oleg-st)
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.

Discussion
----------

Explicitly specify the encoding for mb_ord in JS escaper

`mb_ord` should be called with the specified UTF-8 encoding to make it independent of `mb_internal_encoding`.

Related to https://github.com/twigphp/Twig/pull/3397

Commits
-------

da24c934 Explicitly specify the encoding for mb_ord in JS escaper
2021-07-08 12:58:51 +02:00
Oleg Stepanischev da24c9340e Explicitly specify the encoding for mb_ord in JS escaper
Explicitly specify the encoding for mb_ord in JS escaper - fix
2021-07-08 12:58:33 +02:00
Fabien Potencier 6ae5ae5c7d Merge branch '2.x' into 3.x
* 2.x:
  Update Markdown packages
2021-07-07 09:08:18 +02:00
Fabien Potencier 760532fdba minor #3547 Update Markdown packages (noniagriconomie)
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.

Discussion
----------

Update Markdown packages

Hi,

Small PR to update the order of markdown packages related to their recent activities and releases :)
Feel free to close, cheers

Commits
-------

479336e0 Update Markdown packages
2021-07-07 09:07:54 +02:00
noniagriconomie 479336e09f Update Markdown packages 2021-07-07 09:07:49 +02:00
Fabien Potencier b8cd4d4032 minor #3543 Fix typo in CacheTokenParser.php (pulzarraider)
This PR was merged into the 3.x branch.

Discussion
----------

Fix typo in CacheTokenParser.php

Commits
-------

49bac0b1 Fix typo in CacheTokenParser.php
2021-06-22 15:52:55 +02:00
Andrej Hudec 49bac0b137 Fix typo in CacheTokenParser.php 2021-06-21 21:48:00 +02:00
Fabien Potencier ed29f0010f Merge branch '2.x' into 3.x
* 2.x:
  Add ReturnTypeWillChange to JsonSerializable implementation
  Fix implicit flot to int casts
2021-06-06 18:31:44 +02:00
Fabien Potencier 7926399e0a Merge branch '1.x' into 2.x
* 1.x:
  Fix implicit flot to int casts
2021-06-06 18:31:25 +02:00