Skip to content

Commit

Permalink
Merge branch '3.x' into 4.x
Browse files Browse the repository at this point in the history
* 3.x:
  Bump version to 3.9.4-DEV
  Fix a warning
  Use ::class everywhere
  Auto-close PRs on subtree-splits
  Bump version
  Prepare the 3.9.3 release
  Update CHANGELOG
  Ensure Lexer:: is always initialized
  fix: #4033 add missing unwrap call when a TemplateWrapper instance can be present
  change extended DI extension class
  fix: #4029 when use_yield is true CaptureNode use iterator_to_array preserveKeys argument to false
  • Loading branch information
fabpot committed Apr 24, 2024
2 parents de6ccd7 + 4a7de4a commit 9a11ee1
Show file tree
Hide file tree
Showing 39 changed files with 501 additions and 12 deletions.
71 changes: 71 additions & 0 deletions .github/sync-packages.php
@@ -0,0 +1,71 @@
<?php

if ('cli' !== PHP_SAPI) {
echo "This script can only be run from the command line.\n";
exit(1);
}

$mainRepo = 'https://github.com/twigphp/Twig';
exec('find extra/ -name composer.json', $packages);

foreach ($packages as $package) {
$package = dirname($package);
$c = file_get_contents($package.'/.gitattributes');
$c = preg_replace('{^/\.git.*+\n}m', '', $c);
$c .= "/.git* export-ignore\n";
file_put_contents($package.'/.gitattributes', $c);


@mkdir($package.'/.github');
file_put_contents($package.'/.github/PULL_REQUEST_TEMPLATE.md', <<<EOTXT
Please do not submit any Pull Requests here. They will be closed.
---
Please submit your PR here instead:
{$mainRepo}
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
EOTXT
);

@mkdir($package.'/.github/workflows');
file_put_contents($package.'/.github/workflows/check-subtree-split.yml', <<<EOTXT
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
{$mainRepo}
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
EOTXT
);
}
26 changes: 26 additions & 0 deletions .github/workflows/package-tests.yml
@@ -0,0 +1,26 @@
name: Verify Packages

on:
pull_request:
paths:
- extra/**

permissions:
contents: read

jobs:
verify:
name: Verify Packages
runs-on: Ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Fetch branch from where the PR started
run: git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*

- name: Verify subtree-splits are auto-closed
run: |
php .github/sync-packages.php
git add extra/
git diff --staged --exit-code || (echo '::error::Please run "php .github/sync-packages.php".' && exit 1)
1 change: 1 addition & 0 deletions extra/cache-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/cache-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
33 changes: 33 additions & 0 deletions extra/cache-extra/.github/workflows/check-subtree-split.yml
@@ -0,0 +1,33 @@
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
https://github.com/twigphp/Twig
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
1 change: 1 addition & 0 deletions extra/cssinliner-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/cssinliner-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
33 changes: 33 additions & 0 deletions extra/cssinliner-extra/.github/workflows/check-subtree-split.yml
@@ -0,0 +1,33 @@
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
https://github.com/twigphp/Twig
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
1 change: 1 addition & 0 deletions extra/html-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/html-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
33 changes: 33 additions & 0 deletions extra/html-extra/.github/workflows/check-subtree-split.yml
@@ -0,0 +1,33 @@
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
https://github.com/twigphp/Twig
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
1 change: 1 addition & 0 deletions extra/inky-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/inky-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
33 changes: 33 additions & 0 deletions extra/inky-extra/.github/workflows/check-subtree-split.yml
@@ -0,0 +1,33 @@
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
https://github.com/twigphp/Twig
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
1 change: 1 addition & 0 deletions extra/intl-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/intl-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
33 changes: 33 additions & 0 deletions extra/intl-extra/.github/workflows/check-subtree-split.yml
@@ -0,0 +1,33 @@
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
https://github.com/twigphp/Twig
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
1 change: 1 addition & 0 deletions extra/markdown-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/markdown-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
33 changes: 33 additions & 0 deletions extra/markdown-extra/.github/workflows/check-subtree-split.yml
@@ -0,0 +1,33 @@
name: Check subtree split
on:
pull_request_target:
jobs:
close-pull-request:
runs-on: ubuntu-latest
steps:
- name: Close pull request
uses: actions/github-script@v6
with:
script: |
if (context.repo.owner === "twigphp") {
github.rest.issues.createComment({
owner: "twigphp",
repo: context.repo.repo,
issue_number: context.issue.number,
body: `
Thanks for your Pull Request! We love contributions.
However, you should instead open your PR on the main repository:
https://github.com/twigphp/Twig
This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!
`
});
github.rest.pulls.update({
owner: "twigphp",
repo: context.repo.repo,
pull_number: context.issue.number,
state: "closed"
});
}
1 change: 1 addition & 0 deletions extra/string-extra/.gitattributes
@@ -1,2 +1,3 @@
/Tests export-ignore
/phpunit.xml.dist export-ignore
/.git* export-ignore
8 changes: 8 additions & 0 deletions extra/string-extra/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Please do not submit any Pull Requests here. They will be closed.
---

Please submit your PR here instead:
https://github.com/twigphp/Twig

This repository is what we call a "subtree split": a read-only subset of that main repository.
We're looking forward to your PR there!

0 comments on commit 9a11ee1

Please sign in to comment.