Skip to content

Commit 7fde000

Browse files
committed
Merge branch 'master' into preview
* master: (34 commits) Fix missing “Copy” button on the Windows download page (#1981) composer(deps-dev): bump friendsofphp/php-cs-fixer (#1982) composer(deps-dev): bump phpstan/phpstan from 2.2.6 to 2.2.7 (#1983) Announce PHP 8.4.24 Announce PHP 8.3.33 Set cache_control to 1 month for eol Create release files with a cache timeout of 30 minutes, instead of the default month Don't rely on default cache timeout for archive Announce PHP 8.6.0alpha3 Announce PHP 8.5.9 Announce PHP 8.2.33 Add SBOM links for Windows builds (#1978) composer(deps-dev): bump friendsofphp/php-cs-fixer from 3.95.15 to 3.95.17 (#1976) composer(deps-dev): bump phpstan/phpstan from 2.2.5 to 2.2.6 (#1977) PHP CS Fixer: update usage (#1705) Do not abort cross-origin requests with an empty 200 (#1955) github-actions(deps): bump actions/setup-node from 6 to 7 (#1973) composer(deps-dev): bump friendsofphp/php-cs-fixer (#1974) Add a copy function for the SHA256 checksum (#1957) Fix category for PHP 8.6.0alpha2 ...
2 parents e39dda5 + 8e5a5eb commit 7fde000

42 files changed

Lines changed: 1369 additions & 297 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/integrate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
run: "composer install --ansi --no-interaction --no-progress"
9696

9797
- name: "Run friendsofphp/php-cs-fixer"
98-
run: "vendor/bin/php-cs-fixer fix --ansi --config=.php-cs-fixer.php --diff --dry-run --show-progress=dots --verbose"
98+
run: "vendor/bin/php-cs-fixer check --diff --show-progress=dots --verbose --ansi"
9999

100100
- name: "Get libxml2-utils"
101101
run: |

.github/workflows/preview-deploy.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ on:
55
types:
66
- completed
77

8+
# workflow_run needs explicit perms for PR comments.
9+
permissions:
10+
contents: read
11+
issues: write
12+
pull-requests: write
13+
814
jobs:
915
deploy:
1016
runs-on: "ubuntu-22.04"

.github/workflows/preview-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
php-version: "${{ matrix.php-version }}"
4949

5050
- name: Use Node.js ${{ matrix.node-version }}
51-
uses: actions/setup-node@v6
51+
uses: actions/setup-node@v7
5252
with:
5353
node-version: ${{ matrix.node-version }}
5454

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/.build/
2+
/.php-cs-fixer.php
23
/vendor/
34

45
backend/mirror.gif
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
'indentation_type' => true,
3636
'is_null' => true,
3737
'line_ending' => true,
38+
'modifier_keywords' => true,
3839
'new_with_parentheses' => true,
3940
'no_extra_blank_lines' => true,
4041
'no_mixed_echo_print' => true,
@@ -64,7 +65,6 @@
6465
],
6566
'trim_array_spaces' => true,
6667
'unary_operator_spaces' => true,
67-
'visibility_required' => true,
6868
'void_return' => true,
6969
'whitespace_after_comma_in_array' => true,
7070
]);

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ code-coverage: vendor ## Collects code coverage from running unit tests with php
1212

1313
.PHONY: coding-standards
1414
coding-standards: vendor ## Fixes code style issues with friendsofphp/php-cs-fixer
15-
vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --show-progress=dots --verbose
15+
vendor/bin/php-cs-fixer fix --diff --show-progress=dots --verbose
1616

1717
.PHONY: help
1818
help: ## Displays this list of targets with descriptions

bin/createReleaseEntry

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if (isset($opts['r'])) {
5858
file_put_contents(RELEASES_ABS . $release, "<?php
5959
\$_SERVER['BASE_PAGE'] = 'releases/$release';
6060
require_once __DIR__ . '/../../include/prepend.inc';
61-
site_header('PHP $version Release Announcement');
61+
site_header('PHP $version Release Announcement', ['cache' => true, 'cache_control' => 30 * 60]);
6262
?>
6363
<h1>PHP $version Release Announcement</h1>
6464

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"require-dev": {
1414
"ext-curl": "*",
15-
"friendsofphp/php-cs-fixer": "^3.95.11",
15+
"friendsofphp/php-cs-fixer": "^3.95.18",
1616
"phpstan/extension-installer": "^1.4",
1717
"phpstan/phpstan": "^2.2",
1818
"phpstan/phpstan-phpunit": "^2.0",

0 commit comments

Comments
 (0)