Skip to content
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

Applied fixes from FlintCI #6039

Closed
wants to merge 1 commit into from
Closed

Applied fixes from FlintCI #6039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 4 deletions tests/Controller/CRUDControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

namespace Sonata\AdminBundle\Tests\Controller;

use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
use Sonata\AdminBundle\Admin\AbstractAdmin;
Expand Down Expand Up @@ -149,9 +148,6 @@ class CRUDControllerTest extends TestCase
*/
private $translator;

/**
* @var LoggerInterface&MockObject
*/
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure about that one…

Copy link
Member

Choose a reason for hiding this comment

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

Looks like a bug in the php-cs-fixer version

Copy link
Contributor

Choose a reason for hiding this comment

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

Here are the rules that are applied when I apply everything but this: no_superfluous_phpdoc_tags, no_empty_phpdoc, no_whitespace_in_blank_line, no_extra_blank_lines

Copy link
Contributor

@greg0ire greg0ire Apr 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

See PHP-CS-Fixer/PHP-CS-Fixer#4913 and PHP-CS-Fixer/PHP-CS-Fixer#4915

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there is currently no way to pin a flintCI container to a specific minor or patch version of php-cs-fixer: https://hub.docker.com/r/flintci/php-cs-fixer/tags

private $logger;

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/DependencyInjection/Compiler/AddDependencyCallsCompilerPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
*/
class AddDependencyCallsCompilerPassTest extends TestCase
{
/** @var SonataAdminExtension $extension */
/** @var SonataAdminExtension */
private $extension;

/** @var array $config */
/** @var array */
private $config;

public function setUp(): void
Expand Down
4 changes: 2 additions & 2 deletions tests/DependencyInjection/Compiler/ExtensionCompilerPassTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@

class ExtensionCompilerPassTest extends TestCase
{
/** @var SonataAdminExtension $extension */
/** @var SonataAdminExtension */
private $extension;

/** @var array $config */
/** @var array */
private $config;

/**
Expand Down