Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
timeout-minutes: 15
strategy:
matrix:
php: [ '7.4', '8.0', '8.1' ]
php: [ '8.2', '8.3', '8.4' ]
dependency-version: [ '' ]
include:
- php: '7.4'
- php: '8.2'
dependency-version: '--prefer-lowest'
steps:
- name: Checkout
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.4
tools: composer:v2, cs2pr
coverage: none
- name: Cache Composer dependencies
Expand All @@ -76,7 +76,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.4
tools: composer:v2, cs2pr
coverage: none
- name: Cache Composer dependencies
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
/Vagrantfile
/.vagrant
/node_modules
.phpunit.result.cache
/.phpunit.cache/
2 changes: 1 addition & 1 deletion bin/couscous
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Output\ConsoleOutput;

if (version_compare(phpversion(), '5.4', '<')) {
die('You must use PHP >= 5.4 in order to use Couscous. Please upgrade your PHP version.');
die('You must use PHP >= 8.2 in order to use Couscous. Please upgrade your PHP version.');
}

if (!ini_get('date.timezone')) {
Expand Down
29 changes: 14 additions & 15 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,28 @@
"bin/couscous"
],
"require": {
"php": ">=7.4",
"symfony/console": "~4.0|~5.0|~6.0",
"symfony/filesystem": "~4.0|~5.0|~6.0",
"symfony/finder": "~4.0|~5.0|~6.0",
"symfony/process": "~4.0|~5.0|~6.0",
"symfony/yaml": "~4.0|~5.0|~6.0",
"twig/twig": "^1.44",
"php": "^8.2",
"symfony/console": "^7.4|^8.0",
"symfony/filesystem": "^7.4|^8.0",
"symfony/finder": "^7.4|^8.0",
"symfony/process": "^7.4|^8.0",
"symfony/yaml": "^7.4|^8.0",
"twig/twig": "^3.0",
"erusev/parsedown": "^1.7.4",
"erusev/parsedown-extra": "^0.8.1",
"phine/phar": "^1.0",
Copy link
Author

@homersimpsons homersimpsons Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TODO: replace phine/phar with box-project/box2

"mnapoli/front-yaml": "^1.5",
"php-di/php-di": "^6.0",
"psr/log": "^1.0",
"padraic/phar-updater": "^1.0"
Copy link
Author

@homersimpsons homersimpsons Feb 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

padraic/phar-updater is abandoned (removed as it does not support latest php version), what should we do?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be OK to just drop that 🤷

"mnapoli/front-yaml": "^2.0",
"php-di/php-di": "^7.0",
"psr/log": "^3.0"
},
"require-dev": {
"phpunit/phpunit": "^8.5",
"squizlabs/php_codesniffer": "^3.3",
"vimeo/psalm": "^3.16"
"phpunit/phpunit": "^11.0",
"squizlabs/php_codesniffer": "^4.0",
"vimeo/psalm": "^6.0"
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe psalm 7.0 will be released soon?

vimeo/psalm 6 requires php ~8.2.4

},
"config": {
"platform": {
"php": "7.4.0"
"php": "8.2.4"
}
}
}
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Yes. In your template directory. Add a file called `twig.php` with the following
```php
<?php

use Twig_Environment as Environment;
use Twig\Environment;

// Use "include_once" since this file may be called multiple times
include_once dirname(__DIR__).'/Twig/MyTwigExtension.php';
Expand Down
6 changes: 2 additions & 4 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<phpunit colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
beStrictAboutOutputDuringTests="true"
beStrictAboutTestsThatDoNotTestAnything="true"
forceCoversAnnotation="true"
cacheDirectory=".phpunit.cache"
requireCoverageMetadata="true"
bootstrap="./vendor/autoload.php">

<testsuites>
Expand Down
Loading