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

chore(phpunit): upgrade phpunit to ^8.5 #46

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore(phpunit): upgrade phpunit to ^8.5 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
238f51c
chore(phpunit): upgrade phpunit to ^8.5
Dec 24, 2019
eac9a8c
Merge branch 'master' into upgrade-phpunit-to-8
Mar 2, 2020
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: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
],
"require": {
"liip/monitor-bundle": "^2.8",
"php": "^7.1",
"php": "^7.2",
"sonata-project/admin-bundle": "^3.1",
"sonata-project/doctrine-orm-admin-bundle": "^3.0",
"sonata-project/media-bundle": "^3.0",
Expand All @@ -24,7 +24,7 @@
"ekino/phpstan-banned-code": "^0.2",
"friendsofphp/php-cs-fixer": "^2.16",
"phpstan/phpstan-phpunit": "^0.11",
"phpunit/phpunit": "^7.2",
"phpunit/phpunit": "^8.5",
"sensiolabs/security-checker": "^5.0",
"symfony/phpunit-bridge": "^5.0.3"
},
Expand Down
11 changes: 5 additions & 6 deletions src/Block/Dashboard/MonitorBlockService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@

use Liip\MonitorBundle\Helper\PathHelper;
use Sonata\BlockBundle\Block\BlockContextInterface;
use Sonata\BlockBundle\Block\Service\AbstractAdminBlockService;
use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
use Sonata\BlockBundle\Block\Service\AbstractBlockService;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Twig\Environment;

/**
* Class MonitorBlockService.
*
* @author Quentin Belot <[email protected]>
*/
class MonitorBlockService extends AbstractAdminBlockService
class MonitorBlockService extends AbstractBlockService
{
/**
* @var PathHelper
Expand All @@ -39,12 +39,11 @@ class MonitorBlockService extends AbstractAdminBlockService
* MonitorBlockService constructor.
*/
public function __construct(
string $name,
EngineInterface $templating,
Environment $twig,
PathHelper $pathHelper,
string $liipMonitorDefaultGroup
) {
parent::__construct($name, $templating);
parent::__construct($twig);

$this->pathHelper = $pathHelper;
$this->liipMonitorDefaultGroup = $liipMonitorDefaultGroup;
Expand Down
27 changes: 14 additions & 13 deletions src/TestHelpers/Admin/AdminTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

use Doctrine\Common\Inflector\Inflector;
use Knp\Menu\FactoryInterface;
use PHPUnit\Framework\MockObject\MockObject;
use Sonata\AdminBundle\Admin\AdminInterface;
use Sonata\AdminBundle\Admin\Pool;
use Sonata\AdminBundle\Builder\DatagridBuilderInterface;
Expand All @@ -37,67 +38,67 @@
abstract class AdminTestCase extends \PHPUnit\Framework\TestCase
{
/**
* @var ModelManager|\PHPUnit_Framework_MockObject_MockObject
* @var ModelManager|MockObject
*/
protected $modelManagerMock;

/**
* @var FormContractorInterface|\PHPUnit_Framework_MockObject_MockObject
* @var FormContractorInterface|MockObject
*/
protected $formContractorMock;

/**
* @var ShowBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
* @var ShowBuilderInterface|MockObject
*/
protected $showBuilderMock;

/**
* @var ListBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
* @var ListBuilderInterface|MockObject
*/
protected $listBuilderMock;

/**
* @var DatagridBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
* @var DatagridBuilderInterface|MockObject
*/
protected $datagridBuilderMock;

/**
* @var TranslatorInterface|\PHPUnit_Framework_MockObject_MockObject
* @var TranslatorInterface|MockObject
*/
protected $translatorMock;

/**
* @var Pool|\PHPUnit_Framework_MockObject_MockObject
* @var Pool|MockObject
*/
protected $poolMock;

/**
* @var RouteGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
* @var RouteGeneratorInterface|MockObject
*/
protected $routeGeneratorMock;

/**
* @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject
* @var ValidatorInterface|MockObject
*/
protected $validatorMock;

/**
* @var SecurityHandlerInterface|\PHPUnit_Framework_MockObject_MockObject
* @var SecurityHandlerInterface|MockObject
*/
protected $securityHandlerMock;

/**
* @var FactoryInterface|\PHPUnit_Framework_MockObject_MockObject
* @var FactoryInterface|MockObject
*/
protected $menuFactoryMock;

/**
* @var RouteBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
* @var RouteBuilderInterface|MockObject
*/
protected $routeBuilderMock;

/**
* @var LabelTranslatorStrategyInterface|\PHPUnit_Framework_MockObject_MockObject
* @var LabelTranslatorStrategyInterface|MockObject
*/
protected $labelTranslatorStrategyMock;

Expand Down
6 changes: 3 additions & 3 deletions tests/Block/BlockFilter/BlockFilterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ public function getBlockCategoriesDataProvider(): \Generator
];

yield 'Everything empty' => [[0 => null], '', ['' => 'Default'], []];
yield 'Default' => [[0 => 'foo', 1 => 'bar'], 'Bravo', $defaultCategories, $defaultBlockConfig];
yield 'Default' => [[0 => 'bar'], 'Delta', $defaultCategories, $defaultBlockConfig];
yield 'Default' => [[0 => null], 'Alpha', $defaultCategories, $defaultBlockConfig];
yield 'Default Bravo' => [[0 => 'foo', 1 => 'bar'], 'Bravo', $defaultCategories, $defaultBlockConfig];
yield 'Default Delta' => [[0 => 'bar'], 'Delta', $defaultCategories, $defaultBlockConfig];
yield 'Default Alpha' => [[0 => null], 'Alpha', $defaultCategories, $defaultBlockConfig];
}

/**
Expand Down
18 changes: 3 additions & 15 deletions tests/Block/Dashboard/MonitorBlockServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
use Liip\MonitorBundle\Helper\PathHelper;
use PHPUnit\Framework\TestCase;
use Sonata\BlockBundle\Block\BlockContext;
use Sonata\BlockBundle\Test\FakeTemplating;
use Sonata\HelpersBundle\Block\Dashboard\MonitorBlockService;
use Sonata\PageBundle\Entity\BaseBlock;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Twig\Environment;

/**
* Class MonitorBlockServiceTest.
Expand All @@ -26,26 +26,14 @@
*/
class MonitorBlockServiceTest extends TestCase
{
/**
* Test Get Name.
*/
public function testGetName(): void
{
$pathHelper = $this->createMock(PathHelper::class);
$templating = new FakeTemplating();
$block = new MonitorBlockService(MonitorBlockService::class, $templating, $pathHelper, 'defaultGroup');

$this->assertSame(MonitorBlockService::class, $block->getName());
}

/**
* Test Execute.
*/
public function testExecute(): void
{
$pathHelper = $this->createMock(PathHelper::class);
$templating = new FakeTemplating();
$service = new MonitorBlockService(MonitorBlockService::class, $templating, $pathHelper, 'defaultGroup');
$twig = $this->createMock(Environment::class);
$service = new MonitorBlockService($twig, $pathHelper, 'defaultGroup');
$block = new Block();
$optionResolver = new OptionsResolver();

Expand Down