Skip to content

Commit cbc7a97

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Update CI to php 8.1 Update service_container.rst
2 parents dc9a534 + 833f1b5 commit cbc7a97

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: "Set-up PHP"
2424
uses: shivammathur/setup-php@v2
2525
with:
26-
php-version: 8.0
26+
php-version: 8.1
2727
coverage: none
2828
tools: "composer:v2"
2929

@@ -91,7 +91,7 @@ jobs:
9191
- name: Set-up PHP
9292
uses: shivammathur/setup-php@v2
9393
with:
94-
php-version: 8.0
94+
php-version: 8.1
9595
coverage: none
9696

9797
- name: Fetch branch from where the PR started

service_container.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ service's class or interface name. Want to :doc:`log </logging>` something? No p
3232
namespace App\Controller;
3333

3434
use Psr\Log\LoggerInterface;
35+
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
3536
use Symfony\Component\HttpFoundation\Response;
3637
use Symfony\Component\Routing\Annotation\Route;
3738

38-
class ProductController
39+
class ProductController extends AbstractController
3940
{
4041
/**
4142
* @Route("/products")

0 commit comments

Comments
 (0)