Raise phpstan to max level #1386

VincentLanglet · 2021-04-01T21:21:39Z

Need

jordisala1991 · 2021-04-02T05:49:58Z

src/Builder/ListBuilder.php

@@ -50,6 +50,12 @@ public function buildField(?string $type, FieldDescriptionInterface $fieldDescri
    {
        if (null === $type) {
            $guessType = $this->guesser->guess($fieldDescription);
+            if (null === $guessType) {


If every time we are returning null we throw an exception, wouldnt it be better to only return non null values or throw exception inside the guesser?

I made sonata-project/SonataAdminBundle#6987 because the TypeGuesserChain could return null...

If you have a TypeGuesserChain with no guesser how can you return a type ?
And the Guesser interface from Symfony was allowing null as return type...

The Guesser from this bundle never return null, but just in case, I added the exception...

jordisala1991 · 2021-04-02T05:50:29Z

src/Block/AuditBlockService.php

@@ -39,16 +39,21 @@ public function __construct(Environment $twig, AuditReader $auditReader)

    public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
    {
+        $template = $blockContext->getTemplate();
+        \assert(null !== $template);
+        $limit = $blockContext->getSetting('limit');


maybe cast is better here?

Since there is

public function configureSettings(OptionsResolver $resolver): void { $resolver->setDefaults([ 'limit' => 10, 'template' => '@SonataDoctrineORMAdmin/Block/block_audit.html.twig', ]); }

What do you think about using allowedTypes ?

Is that a feature from the options resolver? I think it would be great but not sure if phpstan will understand it tho.

Phpstan won't understand, so I'll keep the assert, but it still a code improvement

jordisala1991 · 2021-04-02T05:50:55Z

src/Block/AuditBlockService.php

@@ -39,16 +39,21 @@ public function __construct(Environment $twig, AuditReader $auditReader)

    public function execute(BlockContextInterface $blockContext, ?Response $response = null): Response
    {
+        $template = $blockContext->getTemplate();


can a block return null here?

I assume that no because of

public function configureSettings(OptionsResolver $resolver): void { $resolver->setDefaults([ 'limit' => 10, 'template' => '@SonataDoctrineORMAdmin/Block/block_audit.html.twig', ]); }

src/Builder/ListBuilder.php

jordisala1991 · 2021-04-02T07:15:59Z

src/Datagrid/Pager.php

-        $this->getQuery()->setFirstResult(null);
-        $this->getQuery()->setMaxResults(null);
+        $query = $this->getQuery();
+        if (null === $query) {


Probably out of scope of this Pr, but wouldnt be nice if we ensure somehow that the query is never null, maybe as a parameter of this method or as a parameter of construct?

Currently the pager and the query are constructor param of the Datagrid.
In this one we're running

$this->pager->setQuery($this->query); $this->pager->init();

Maybe we could remove setQuery and use the query as a param of init indeed.

It's more a SonataAdmin change, so I'll recommend an issue.

jordisala1991 · 2021-04-02T07:20:27Z

src/DependencyInjection/SonataDoctrineORMAdminExtension.php

@@ -38,6 +38,7 @@ public function load(array $configs, ContainerBuilder $container): void
        $loader->load('doctrine_orm_filter_types.xml');

        $bundles = $container->getParameter('kernel.bundles');
+        \assert(\is_array($bundles));


seems strange having to add this around each getParameter to ensure type

getParameter is considered as returning mixed for phpstan because of the symfony phpdoc

jordisala1991 · 2021-04-02T07:22:34Z

tests/Functional/CRUDTest.php

@@ -79,7 +80,9 @@ public function testEdit(): void

    public function testDelete(): void
    {
-        $entityManager = static::bootKernel()->getContainer()->get('doctrine')->getManager();
+        $doctrine = static::bootKernel()->getContainer()->get('doctrine');


I think the container resolution can be solved warming up cache before running phpstan. (can be done executing test previously). Then you add the xml to the phpstan config and it can solve those issues

VincentLanglet · 2021-04-09T13:43:36Z

This is ready @sonata-project/contributors :)

src/Filter/ChoiceFilter.php

jordisala1991 reviewed Apr 2, 2021

View reviewed changes

src/Builder/ListBuilder.php Outdated Show resolved Hide resolved

jordisala1991 reviewed Apr 2, 2021

View reviewed changes

src/Builder/ListBuilder.php Outdated Show resolved Hide resolved

VincentLanglet force-pushed the phpstanMax branch from af7d5e3 to 431a293 Compare April 2, 2021 06:59

jordisala1991 reviewed Apr 2, 2021

View reviewed changes

VincentLanglet force-pushed the phpstanMax branch 3 times, most recently from b4f29fe to 37abc94 Compare April 5, 2021 10:23

VincentLanglet closed this Apr 8, 2021

VincentLanglet reopened this Apr 8, 2021

VincentLanglet force-pushed the phpstanMax branch from 37abc94 to 9e569d1 Compare April 8, 2021 20:53

Raise phpstan to max level

cb57898

VincentLanglet force-pushed the phpstanMax branch from 9e569d1 to cb57898 Compare April 8, 2021 21:00

VincentLanglet closed this Apr 9, 2021

VincentLanglet reopened this Apr 9, 2021

Bump doctrine

0ef688b

VincentLanglet marked this pull request as ready for review April 9, 2021 13:43

VincentLanglet requested a review from a team April 9, 2021 13:43

VincentLanglet requested a review from jordisala1991 April 9, 2021 13:43

jordisala1991 previously approved these changes Apr 10, 2021

View reviewed changes

franmomu reviewed Apr 10, 2021

View reviewed changes

src/Filter/ChoiceFilter.php Outdated Show resolved Hide resolved

src/Filter/ChoiceFilter.php Outdated Show resolved Hide resolved

Update type phpdoc

5ed40e6

VincentLanglet dismissed jordisala1991’s stale review via 5ed40e6 April 10, 2021 09:51

jordisala1991 approved these changes Apr 10, 2021

View reviewed changes

VincentLanglet requested review from franmomu and a team April 10, 2021 10:07

OskarStark merged commit 8388bfa into sonata-project:master Apr 11, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Raise phpstan to max level #1386

Raise phpstan to max level #1386

VincentLanglet commented Apr 1, 2021 •

edited

Loading

jordisala1991 Apr 2, 2021

VincentLanglet Apr 2, 2021

jordisala1991 Apr 2, 2021

VincentLanglet Apr 2, 2021

jordisala1991 Apr 2, 2021

VincentLanglet Apr 2, 2021

jordisala1991 Apr 2, 2021

VincentLanglet Apr 2, 2021

jordisala1991 Apr 2, 2021

VincentLanglet Apr 2, 2021 •

edited

Loading

jordisala1991 Apr 2, 2021

VincentLanglet Apr 2, 2021

jordisala1991 Apr 2, 2021

VincentLanglet commented Apr 9, 2021

Raise phpstan to max level #1386

Raise phpstan to max level #1386

Conversation

VincentLanglet commented Apr 1, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VincentLanglet Apr 2, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

VincentLanglet commented Apr 9, 2021

VincentLanglet commented Apr 1, 2021 •

edited

Loading

VincentLanglet Apr 2, 2021 •

edited

Loading