Commit Graph

5357 Commits

Author SHA1 Message Date
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 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 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 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 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 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 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 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 7926399e0a Merge branch '1.x' into 2.x
* 1.x:
  Fix implicit flot to int casts
2021-06-06 18:31:25 +02:00
Fabien Potencier 4fe3a98928 bug #3535 Fix implicit float to int casts (derrabus)
This PR was merged into the 1.x branch.

Discussion
----------

Fix implicit float to int casts

PHP 8.1 is picky about implicit float-to-int casts if we lose precision because of that cast. This PR attempts to fix all issues on the 1.x branch.

Commits
-------

de9cd76d Fix implicit flot to int casts
2021-06-06 18:31:09 +02:00
Fabien Potencier b06cd707b1 bug #3536 Add ReturnTypeWillChange to JsonSerializable implementation (derrabus)
This PR was merged into the 2.x branch.

Discussion
----------

Add ReturnTypeWillChange to JsonSerializable implementation

On PHP 8.1, implementations of `JsonSerializable` should declare a return type.

In order to avoid a deprecation warning and maintain backwards compatibility, I've added the `ReturnTypeWillChange` attribute to declare that our implementation will add the necessary return type in a future release.

Commits
-------

507f78d9 Add ReturnTypeWillChange to JsonSerializable implementation
2021-06-06 18:30:46 +02:00
Alexander M. Turek 507f78d9c4 Add ReturnTypeWillChange to JsonSerializable implementation
Signed-off-by: Alexander M. Turek <me@derrabus.de>
2021-06-06 00:40:16 +02:00
Alexander M. Turek de9cd76d7c Fix implicit flot to int casts 2021-06-06 00:32:22 +02:00
Nicolas Grekas 019d6554d2 minor #3527 Allow Symfony 6 (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Allow Symfony 6

Commits
-------

ea5de7e6 Allow Symfony 6
2021-05-20 16:27:11 +02:00
Nicolas Grekas ea5de7e626 Allow Symfony 6 2021-05-20 16:22:31 +02:00
Fabien Potencier c2fc988fd7 Fix URLs 2021-05-19 09:15:15 +02:00
Fabien Potencier 398487c101 Merge branch '1.x' into 2.x
* 1.x:
  Replace secure.php.net with www.php.net
2021-05-19 09:14:37 +02:00
Fabien Potencier b8026c8907 minor #3525 Replace secure.php.net with www.php.net (mauriciofauth)
This PR was merged into the 1.x branch.

Discussion
----------

Replace secure.php.net with www.php.net

It is no longer necessary to use the _secure_ subdomain.

See: https://news-web.php.net/php.internals/104533.

> Instead of having mirrors, we are moving all of PHP.net to HTTPS (and get rid of https://secure.php.net)

Commits
-------

1783298b Replace secure.php.net with www.php.net
2021-05-19 09:12:00 +02:00
Maurício Meneghini Fauth 1783298bb8 Replace secure.php.net with www.php.net
See: https://news-web.php.net/php.internals/104533

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2021-05-18 16:07:51 -03:00
Fabien Potencier 51f3cbe312 Fix merge 2021-05-18 13:13:59 +02:00
Fabien Potencier 6f3a8a2a38 Merge branch '1.x' into 2.x
* 1.x:
  Add a note about end of 1.x maintenance
2021-05-18 13:13:43 +02:00
Fabien Potencier 9a7f3c8d0e Add a note about end of 1.x maintenance 2021-05-18 13:13:36 +02:00
Fabien Potencier 66fa6d37f7 Merge branch '1.x' into 2.x
* 1.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 1.44.4 release
2021-05-18 13:10:20 +02:00
Fabien Potencier 2fa8bce914 Move Drupal test file to tests/ 2021-05-18 13:09:01 +02:00
Fabien Potencier 589d6a5514 minor #3524 fix file permissions (romainmenke)
This PR was submitted for the 3.x branch but it was squashed and merged into the 1.x branch instead.

Discussion
----------

fix file permissions

`drupal_test.sh` was executable and when installing the plugin with `composer` it retains these permissions.

Better to call this script as `bash ./drupal_test.sh` and have `100644` as permissions.

I could only find one reference to this script and it was commented out.
Updated it anyway as it might be revived at some point.

Commits
-------

bd706520 fix file permissions
2021-05-18 13:06:55 +02:00
romainmenke bd70652057 fix file permissions 2021-05-18 13:06:51 +02:00
Fabien Potencier 80de1a14c0 Bump version 2021-05-16 14:13:42 +02:00
Fabien Potencier 27e5cf2b05 Prepare the 2.14.6 release v2.14.6 2021-05-16 14:12:47 +02:00
Fabien Potencier 577c5423d6 Bump version 2021-05-16 14:11:59 +02:00
Fabien Potencier 4d40042152 Prepare the 1.44.4 release v1.44.4 2021-05-16 14:11:20 +02:00
Fabien Potencier ba86601f7c Update CHANGELOG 2021-05-16 14:07:41 +02:00
Fabien Potencier ceb4de0448 Merge branch '1.x' into 2.x
* 1.x:
  Update CHANGELOG
  Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
2021-05-16 14:07:24 +02:00