Skip to content

Use forks for PHP 8.2 compatibility until respective PRs merged #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saundefined merged 6 commits into from
Oct 3, 2023
Merged

Use forks for PHP 8.2 compatibility until respective PRs merged #105

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11b094e
Use forks for PHP 8.2 compatibility until respective PRs merged
pronskiy Sep 14, 2023
762016a
Update everything to PHP 8.2
pronskiy Sep 14, 2023
e1ab159
Fix build attempt
pronskiy Sep 14, 2023
e8d2d46
Try ubuntu-20.04
saundefined Sep 14, 2023
9b3749a
Upgrade sculpin to 3.3.0-alpha
saundefined Oct 3, 2023
ca1dc56
Remove repositories
saundefined Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/deploy-site.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
deploy:
name: Deploy website
runs-on: ubuntu-latest
runs-on: "ubuntu-20.04"
steps:
- name: Checkout
uses: actions/checkout@main
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: 8.2
extensions: mbstring, intl, readline
tools: composer:v2

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/netlify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request_target:
jobs:
build:
runs-on: ubuntu-latest
runs-on: "ubuntu-20.04"
if: github.repository_owner == 'ThePHPF'
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 8.0
php-version: '8.2'
extensions: mbstring, intl, readline
tools: composer:v2

Expand All @@ -57,4 +57,4 @@ jobs:
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 1
timeout-minutes: 1
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The site

To develop the website, you will need:

- PHP 8.0 or later
- PHP 8.2 or later
- Composer
- Node 14 or 16 with NPM

Expand Down
26 changes: 17 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,35 @@
"homepage": "https://thephp.foundation"
}
],
"repositories": [
{
"type": "vcs",
"url": "https://github.com/pronskiy/dflydev-canal"
},
{
"type": "vcs",
"url": "https://github.com/sculpin/sculpin"
}
],
"require": {
"php": "^8.0",
"sculpin/sculpin": "^3.1",
"twig/twig": "2.15.3",
"php": "^8.2",
"ext-gd": "*",
"ext-dom": "*"
"ext-dom": "*",
"twig/twig": "2.15.3",
"sculpin/sculpin": "dev-main#467ffd4d7d0e3b28c8b8234d7f29bb3c8caf6c44",
Comment thread
saundefined marked this conversation as resolved.
Outdated
"dflydev/canal": "dev-master"
Comment thread
saundefined marked this conversation as resolved.
Outdated
},
"require-dev": {
"roave/security-advisories": "dev-latest"
},
"scripts": {
"publish": [
"./publish.sh"
],
"sculpin-watch": [
"Composer\\Config::disableProcessTimeout",
"sculpin generate --watch --server"
],
"yarn-watch": [
"npx-watch": [
"Composer\\Config::disableProcessTimeout",
"yarn encore dev --watch"
"npx tailwind -i assets/css/app.css -o source/assets/css/app.css --watch"
]
},
"config": {
Expand Down
Loading