Skip to content

Commit

Permalink
Drop php 7 support
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom32i committed Mar 28, 2024
1 parent d1370df commit c3f37f7
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 71 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: 'Setup node'
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: 'Setup PHP'
uses: shivammathur/setup-php@v2
Expand Down
35 changes: 13 additions & 22 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,28 +81,7 @@ jobs:
fail-fast: false # don't cancel other matrix jobs on failure
matrix:
include:
# Previous PHP versions
- name: 'Test Symfony 5.4 [Linux, PHP 7.4]'
os: 'ubuntu-latest'
php: '7.4'
symfony: '5.4.*'

# Most recent, non-EOL versions
- name: 'Test Symfony 5.4 [Linux, PHP 8.1]'
os: 'ubuntu-latest'
php: '8.1'
symfony: '5.4.*'

- name: 'Test Symfony 5.4 [Windows, PHP 8.0]'
os: 'windows-latest'
php: '8.0'
symfony: '5.4.*'

- name: 'Test Symfony 6.0 [Linux, PHP 8.1]'
os: 'ubuntu-latest'
php: '8.1'
symfony: '6.0.*'

- name: 'Test Symfony 6.1 [Linux, PHP 8.1]'
os: 'ubuntu-latest'
php: '8.1'
Expand All @@ -113,6 +92,11 @@ jobs:
php: '8.1'
symfony: '6.2.*'

- name: 'Test Symfony 6.3 [Linux, PHP 8.2]'
os: 'ubuntu-latest'
php: '8.2'
symfony: '6.3.*'

- name: 'Test Symfony 6.4 [Linux, PHP 8.2]'
os: 'ubuntu-latest'
php: '8.2'
Expand All @@ -126,6 +110,13 @@ jobs:
allow-unstable: true
allow-failure: true

- name: 'Test Symfony 7.1 [Linux, PHP 8.3]'
os: 'ubuntu-latest'
php: '8.3'
symfony: '7.1.*@dev'
allow-unstable: true
allow-failure: true

steps:
- name: 'Checkout'
uses: actions/checkout@v2
Expand Down Expand Up @@ -183,7 +174,7 @@ jobs:
- name: 'Setup node'
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: 'Setup PHP'
uses: shivammathur/setup-php@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dist.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: 'Setup node'
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: 'Generate dist'
run: make dist.install dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-dist-deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: 'Setup node'
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: 'Update dist dependencies'
run: make dist.update
Expand Down
32 changes: 18 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,6 @@ install:
symfony composer config minimum-stability --unset
symfony composer update --prefer-dist

## Install - Install Symfony 5.4 deps
install.54: setup
install.54: export SYMFONY_REQUIRE = 5.4.*@dev
install.54:
rm -f composer.lock
symfony composer update

## Install - Install Symfony 6.0 deps
install.60: setup
install.60: export SYMFONY_REQUIRE = 6.0.*@dev
install.60:
rm -f composer.lock
symfony composer update

## Install - Install Symfony 6.1 deps
install.61: setup
install.61: export SYMFONY_REQUIRE = 6.1.*@dev
Expand All @@ -67,6 +53,15 @@ install.62:
symfony composer update
symfony composer config minimum-stability --unset

## Install - Install Symfony 6.3 deps
install.63: setup
install.63: export SYMFONY_REQUIRE = 6.3.*@dev
install.63:
rm -f composer.lock
symfony composer config minimum-stability dev
symfony composer update
symfony composer config minimum-stability --unset

## Install - Install Symfony 6.4 deps
install.64: setup
install.64: export SYMFONY_REQUIRE = 6.4.*@dev
Expand All @@ -85,6 +80,15 @@ install.70:
symfony composer update
symfony composer config minimum-stability --unset

## Install - Install Symfony 7.1 deps
install.71: setup
install.71: export SYMFONY_REQUIRE = 7.1.*@dev
install.71:
rm -f composer.lock
symfony composer config minimum-stability dev
symfony composer update
symfony composer config minimum-stability --unset

########
# Lint #
########
Expand Down
52 changes: 26 additions & 26 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,28 +33,28 @@
},
"prefer-stable": true,
"require": {
"php": "^7.4|^8.0",
"php": "^8.1",
"ext-dom": "*",
"erusev/parsedown": "^1.7.4",
"symfony/asset": "^5.4|^6.0|^7.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/console": "^5.4|^6.0|^7.0",
"symfony/css-selector": "^5.4|^6.0|^7.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/dom-crawler": "^5.4|^6.0|^7.0",
"symfony/event-dispatcher": "^5.4|^6.0|^7.0",
"symfony/filesystem": "^5.4|^6.0|^7.0",
"symfony/finder": "^5.4|^6.0|^7.0",
"symfony/http-foundation": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0",
"symfony/mime": "^5.4|^6.0|^7.0",
"symfony/process": "^5.4|^6.0|^7.0",
"symfony/property-access": "^5.4|^6.0|^7.0",
"symfony/routing": "^5.4|^6.0|^7.0",
"symfony/serializer": "^5.4|^6.0|^7.0",
"symfony/stopwatch": "^5.4|^6.0|^7.0",
"symfony/string": "^5.4|^6.0|^7.0",
"symfony/yaml": "^5.4|^6.0|^7.0",
"symfony/asset": "^6.1|^7.0",
"symfony/config": "^6.1|^7.0",
"symfony/console": "^6.1|^7.0",
"symfony/css-selector": "^6.1|^7.0",
"symfony/dependency-injection": "^6.1|^7.0",
"symfony/dom-crawler": "^6.1|^7.0",
"symfony/event-dispatcher": "^6.1|^7.0",
"symfony/filesystem": "^6.1|^7.0",
"symfony/finder": "^6.1|^7.0",
"symfony/http-foundation": "^6.1|^7.0",
"symfony/http-kernel": "^6.1|^7.0",
"symfony/mime": "^6.1|^7.0",
"symfony/process": "^6.1|^7.0",
"symfony/property-access": "^6.1|^7.0",
"symfony/routing": "^6.1|^7.0",
"symfony/serializer": "^6.1|^7.0",
"symfony/stopwatch": "^6.1|^7.0",
"symfony/string": "^6.1|^7.0",
"symfony/yaml": "^6.1|^7.0",
"twig/twig": "^2.12|^3.0"
},
"require-dev": {
Expand All @@ -63,13 +63,13 @@
"phpstan/phpstan": "^1.6",
"phpunit/phpunit": "^9.6",
"psr/log": "^1|^2",
"symfony/browser-kit": "^5.4|^6.0|^7.0",
"symfony/expression-language": "^5.4|^6.0|^7.0",
"symfony/framework-bundle": "^5.4|^6.0|^7.0",
"symfony/browser-kit": "^6.1|^7.0",
"symfony/expression-language": "^6.1|^7.0",
"symfony/framework-bundle": "^6.1|^7.0",
"symfony/monolog-bundle": "^3.7",
"symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
"symfony/twig-bridge": "^5.4|^6.0|^7.0",
"symfony/twig-bundle": "^5.4|^6.0|^7.0"
"symfony/phpunit-bridge": "^6.1|^7.0",
"symfony/twig-bridge": "^6.1|^7.0",
"symfony/twig-bundle": "^6.1|^7.0"
},
"extra": {
"branch-alias": {
Expand Down
8 changes: 2 additions & 6 deletions doc/loading-content.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,12 @@ use Stenope\Bundle\ContentManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
/**
* @Route("/blog")
*/
#[Route('/blog')]
class BlogController extends AbstractController
{
// ...
/**
* @Route("/{slug}", name="article")
*/
#[Route('/{slug}', name: 'article')]
public function article(ContentManagerInterface $contentManager, string $slug)
{
return $this->render(
Expand Down

0 comments on commit c3f37f7

Please sign in to comment.