Commit Graph

5702 Commits

Author SHA1 Message Date
Fabien Potencier 4659a99cdf Merge branch '2.x' into 3.x
* 2.x:
  Fix URLs
  Replace secure.php.net with www.php.net
2021-05-19 09:38:07 +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 82d3787f3d Merge branch '2.x' into 3.x
* 2.x:
  Fix merge
  Add a note about end of 1.x maintenance
2021-05-18 13:14:06 +02: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 4e479f140e Merge branch '2.x' into 3.x
* 2.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 2.14.6 release
  Bump version
  Prepare the 1.44.4 release
2021-05-18 13:11:52 +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 00a988fb04 Bump version 2021-05-16 14:14:57 +02:00
Fabien Potencier 21578f00e8 Prepare the 3.3.2 release v3.3.2 2021-05-16 14:14:13 +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 93f29df51b Update CHANGELOG 2021-05-16 14:08:10 +02:00
Fabien Potencier ad86c88359 Merge branch '2.x' into 3.x
* 2.x:
  Update CHANGELOG
  Update CHANGELOG
  Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
2021-05-16 14:07:50 +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
Fabien Potencier f7bfa2ec6f Update CHANGELOG 2021-05-16 14:07:12 +02:00
Fabien Potencier 124f10c27e Revert "bug #3499 Fix: A template name cannot be an absolute path (mvorisek)"
This reverts commit 83f26e402b, reversing
changes made to f5d3c704df.
2021-05-16 14:06:26 +02:00
Fabien Potencier 9e6e700f96 minor #3509 Some code style fixes (dionisvl)
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Some code style fixes

Fixes that:
- Type cast is unnecessary
- Unnecessary curly braces syntax for variable
- Operations priority might differ that except

Commits
-------

17c6371f Some code style fixes
2021-05-14 10:26:10 +02:00
Den 17c6371fb5 Some code style fixes 2021-05-14 10:26:05 +02:00
Fabien Potencier 491aa7d3fc Bump version 2021-05-12 10:06:33 +02:00
Fabien Potencier ac44433c49 Prepare the 3.3.1 release v3.3.1 2021-05-12 10:05:35 +02:00
Fabien Potencier 55f80d62c5 Update CHANGELOG 2021-05-12 10:05:14 +02:00
Fabien Potencier c0c30e7a03 Merge branch '2.x' into 3.x
* 2.x:
  Bump version
  Prepare the 2.14.5 release
  Update CHANGELOG
  Bump version
  Prepare the 1.44.3 release
  Update CHANGELOG
2021-05-12 10:04:06 +02:00
Fabien Potencier f602d0c11d Bump version 2021-05-12 10:03:33 +02:00
Fabien Potencier c9dd15b3a8 Prepare the 2.14.5 release v2.14.5 2021-05-12 10:02:35 +02:00
Fabien Potencier 40e95742e2 Update CHANGELOG 2021-05-12 10:02:19 +02:00
Fabien Potencier 2b14e73846 Merge branch '1.x' into 2.x
* 1.x:
  Bump version
  Prepare the 1.44.3 release
  Update CHANGELOG
2021-05-12 10:00:40 +02:00
Fabien Potencier 35f8b78b66 Bump version 2021-05-12 09:59:57 +02:00
Fabien Potencier 920a9b9a61 Prepare the 1.44.3 release v1.44.3 2021-05-12 09:58:47 +02:00
Fabien Potencier 18e7034b99 Update CHANGELOG 2021-05-12 09:58:27 +02:00
Fabien Potencier 73760b05a1 minor #3522 Fix CS (fabpot)
This PR was merged into the 3.x branch.

Discussion
----------

Fix CS

Commits
-------

fcbaa669 Fix CS
2021-05-12 09:51:57 +02:00
Fabien Potencier fcbaa669ab Fix CS 2021-05-12 09:47:40 +02:00
Fabien Potencier 13e360972a Merge branch '2.x' into 3.x
* 2.x:
  Fix CS
  Fix CS
  Migrate to the new PHP CS Fixer config file
  Fixing links
2021-05-12 09:45:40 +02:00
Fabien Potencier 15fba97570 minor #3521 CS fixes (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

CS fixes

Commits
-------

2dd1d909 Fix CS
2021-05-12 09:43:21 +02:00
Fabien Potencier 2dd1d909b9 Fix CS 2021-05-12 09:37:17 +02:00
Fabien Potencier 157fa56829 Merge branch '1.x' into 2.x
* 1.x:
  Fix CS
  Migrate to the new PHP CS Fixer config file
2021-05-12 09:27:30 +02:00
Fabien Potencier 87c09f6d87 minor #3520 Fix CS (fabpot)
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Fix CS

Commits
-------

59f3e8e5 Fix CS
bded3886 Migrate to the new PHP CS Fixer config file
2021-05-12 09:24:36 +02:00
Fabien Potencier 59f3e8e5dc Fix CS 2021-05-12 09:19:37 +02:00
Fabien Potencier bded388664 Migrate to the new PHP CS Fixer config file 2021-05-12 09:11:44 +02:00
Fabien Potencier 7da9b043c9 minor #3512 Fixing links (ThomasLandauer)
This PR was merged into the 2.x branch.

Discussion
----------

Fixing links

Commits
-------

cf7d50c4 Fixing links
2021-04-24 10:08:28 +02:00
Thomas Landauer cf7d50c411 Fixing links 2021-04-23 16:45:01 +02:00