Skip to content

Commit

Permalink
Apply CS to tests
Browse files Browse the repository at this point in the history
  • Loading branch information
pspanja committed Sep 16, 2020
1 parent 5cca6f0 commit c8738f4
Show file tree
Hide file tree
Showing 19 changed files with 6 additions and 143 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ public function providerForTestValid(): array

/**
* @dataProvider providerForTestValid
*
* @param array $configurationValues
*/
public function testValid(array $configurationValues): void
{
Expand Down Expand Up @@ -250,9 +248,6 @@ public function providerForTextExtends(): array
/**
* @group xxx
* @dataProvider providerForTextExtends
*
* @param array $configurationValues
* @param array $expectedValues
*/
public function testExtends(array $configurationValues, array $expectedValues): void
{
Expand Down Expand Up @@ -423,10 +418,6 @@ public function providerForTestInvalid(): array

/**
* @dataProvider providerForTestInvalid
*
* @param array $configurationValues
* @param string $exceptionClass
* @param string $exceptionMessage
*/
public function testInvalid(array $configurationValues, string $exceptionClass, string $exceptionMessage): void
{
Expand Down Expand Up @@ -563,9 +554,6 @@ public function providerForTestDefaultValues(): array

/**
* @dataProvider providerForTestDefaultValues
*
* @param array $configurationValues
* @param array $expectedConfigurationValues
*/
public function testDefaultValues(array $configurationValues, array $expectedConfigurationValues): void
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

declare(strict_types=1);

namespace Netgen\Bundle\EzPlatformSiteApiBundle\Tests\DependencyInjection\Configuration\Parser;

use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension;
use eZ\Bundle\EzPublishCoreBundle\Tests\DependencyInjection\Configuration\Parser\AbstractParserTestCase;
use Netgen\Bundle\EzPlatformSiteApiBundle\DependencyInjection\Configuration\Parser\BaseOptions;
use Netgen\Bundle\EzPlatformSiteApiBundle\DependencyInjection\Configuration\Parser\SiteApi;
use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
Expand All @@ -17,7 +17,7 @@
*
* @internal
*/
class SiteApiTest extends AbstractParserTestCase
final class SiteApiTest extends AbstractParserTestCase
{
public function getBooleanConfigurationNames(): array
{
Expand Down Expand Up @@ -64,10 +64,6 @@ public function providerForTestBooleanConfigurationValid(): \Generator

/**
* @dataProvider providerForTestBooleanConfigurationValid
*
* @param string $name
* @param mixed $config
* @param mixed $expectedValue
*/
public function testBooleanConfigurationValid(string $name, $config, $expectedValue): void
{
Expand Down Expand Up @@ -116,9 +112,6 @@ public function providerForTestBooleanConfigurationInvalid(): \Generator

/**
* @dataProvider providerForTestBooleanConfigurationInvalid
*
* @param string $name
* @param mixed $config
*/
public function testBooleanConfigurationInvalid(string $name, $config): void
{
Expand Down Expand Up @@ -242,10 +235,6 @@ public function providerForTestNamedObjectConfigurationValid(): \Generator

/**
* @dataProvider providerForTestNamedObjectConfigurationValid
*
* @param string $name
* @param array $configuration
* @param mixed $expectedValue
*/
public function testNamedObjectConfigurationValid(string $name, array $configuration, $expectedValue): void
{
Expand Down Expand Up @@ -318,9 +307,6 @@ public function providerForTestNamedObjectConfigurationInvalid(): \Generator

/**
* @dataProvider providerForTestNamedObjectConfigurationInvalid
*
* @param string $name
* @param array $configuration
*/
public function testNamedObjectConfigurationInvalid(string $name, array $configuration): void
{
Expand Down Expand Up @@ -361,9 +347,6 @@ public function providerForTestNamedObjectDefaultValues(): array

/**
* @dataProvider providerForTestNamedObjectDefaultValues
*
* @param mixed $configurationValues
* @param array $expectedConfigurationValues
*/
public function testNamedObjectDefaultValues($configurationValues, array $expectedConfigurationValues): void
{
Expand Down Expand Up @@ -427,8 +410,6 @@ public function providerForTestNamedQueryConfigurationValid(): array

/**
* @dataProvider providerForTestNamedQueryConfigurationValid
*
* @param array $configurationValues
*/
public function testNamedQueryConfigurationValid(array $configurationValues): void
{
Expand Down Expand Up @@ -521,9 +502,6 @@ public function providerForTestNamedQueryConfigurationInvalid(): array

/**
* @dataProvider providerForTestNamedQueryConfigurationInvalid
*
* @param array $configurationValues
* @param string $message
*/
public function testNamedQueryConfigurationInvalid(array $configurationValues, string $message): void
{
Expand Down Expand Up @@ -566,9 +544,6 @@ public function providerForTestNamedQueryConfigurationDefaultValues(): array

/**
* @dataProvider providerForTestNamedQueryConfigurationDefaultValues
*
* @param array $configurationValues
* @param array $expectedConfigurationValues
*/
public function testNamedQueryConfigurationDefaultValues(array $configurationValues, array $expectedConfigurationValues): void
{
Expand Down
4 changes: 2 additions & 2 deletions tests/bundle/NamedObject/LoadingProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ protected function getTagServiceMock(): MockObject

$mock
->method('loadTag')
->willReturnCallback(function ($id) {
->willReturnCallback(static function ($id) {
if ($id === 42) {
return new Tag(['id' => 42]);
}
Expand All @@ -316,7 +316,7 @@ protected function getTagServiceMock(): MockObject

$mock
->method('loadTagByRemoteId')
->willReturnCallback(function ($id) {
->willReturnCallback(static function ($id) {
if ($id === 'abc') {
return new Tag(['remoteId' => 'abc']);
}
Expand Down
3 changes: 0 additions & 3 deletions tests/bundle/QueryType/ParameterProcessorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,6 @@ public function providerForTestProcess(): array

/**
* @dataProvider providerForTestProcess
*
* @param mixed $parameter
* @param mixed $expectedProcessedParameter
*/
public function testProcess($parameter, $expectedProcessedParameter): void
{
Expand Down
12 changes: 0 additions & 12 deletions tests/bundle/QueryType/QueryDefinitionMapperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,6 @@ public function providerForTestMap(): array

/**
* @dataProvider providerForTestMap
*
* @param array $configuration
* @param \Netgen\Bundle\EzPlatformSiteApiBundle\QueryType\QueryDefinition $expectedQueryDefinition
*/
public function testMap(array $configuration, QueryDefinition $expectedQueryDefinition): void
{
Expand Down Expand Up @@ -252,17 +249,11 @@ protected function getQueryTypeRegistryMock(): MockObject
return $queryTypeRegistryMock;
}

/**
* @return \PHPUnit\Framework\MockObject\MockObject
*/
protected function getQueryTypeMock(): MockObject
{
return $this->getMockBuilder(QueryType::class)->getMock();
}

/**
* @return \PHPUnit\Framework\MockObject\MockObject
*/
protected function getSiteQueryTypeMock(): MockObject
{
$queryTypeMock = $this->getMockBuilder(SiteQueryType::class)->getMock();
Expand All @@ -276,9 +267,6 @@ protected function getSiteQueryTypeMock(): MockObject
return $queryTypeMock;
}

/**
* @return \Netgen\Bundle\EzPlatformSiteApiBundle\QueryType\ParameterProcessor
*/
protected function getParameterProcessor(): ParameterProcessor
{
/** @var \Symfony\Component\HttpFoundation\RequestStack $requestStack */
Expand Down
9 changes: 0 additions & 9 deletions tests/bundle/QueryType/QueryExecutorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,6 @@ public function testExecuteLocationPagedFindQuery(): void
$this->assertTrue($result->getNormalizeOutOfRangePages());
}

/**
* @return \Netgen\Bundle\EzPlatformSiteApiBundle\QueryType\QueryExecutor
*/
protected function getQueryExecutorUnderTest(): QueryExecutor
{
return new QueryExecutor(
Expand Down Expand Up @@ -280,9 +277,6 @@ protected function getQueryTypeRegistryMock(): MockObject
return $queryTypeRegistryMock;
}

/**
* @return \PHPUnit\Framework\MockObject\MockObject
*/
protected function getContentQueryTypeMock(): MockObject
{
$mock = $this->getMockBuilder(QueryType::class)->getMock();
Expand All @@ -293,9 +287,6 @@ protected function getContentQueryTypeMock(): MockObject
return $mock;
}

/**
* @return \PHPUnit\Framework\MockObject\MockObject
*/
protected function getLocationQueryTypeMock(): MockObject
{
$mock = $this->getMockBuilder(QueryType::class)->getMock();
Expand Down
5 changes: 0 additions & 5 deletions tests/lib/Integration/BaseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ public function getData(string $languageCode): array
}

/**
* @param string $name
* @param mixed $value
*
* @throws \ReflectionException
* @throws \ErrorException
*/
Expand All @@ -94,8 +91,6 @@ protected function overrideSettings(string $name, $value): void

/**
* @throws \ErrorException
*
* @return \Netgen\EzPlatformSiteApi\API\Site
*/
protected function getSite(): Site
{
Expand Down
12 changes: 0 additions & 12 deletions tests/lib/Integration/PrepareFixturesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ final class PrepareFixturesTest extends APIBaseTest
* @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
* @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
* @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
*
* @return array
*/
public function testPrepareTestFixtures(): array
{
Expand Down Expand Up @@ -81,22 +79,14 @@ public function testPrepareTestFixtures(): array
}

/**
* @param \eZ\Publish\API\Repository\Values\ContentType\ContentType $contentType
* @param $parentLocationId
* @param string $contentRemoteId
* @param string $locationRemoteId
* @param string $mainLanguageCode
* @param array $languageCodes
* @param bool $alwaysAvailable
*
* @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
* @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
* @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
* @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
* @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
* @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
*
* @return \eZ\Publish\API\Repository\Values\Content\Content
*/
protected function createContent(
ContentType $contentType,
Expand Down Expand Up @@ -148,8 +138,6 @@ protected function createContent(
* @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
* @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
* @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
*
* @return \eZ\Publish\API\Repository\Values\ContentType\ContentType
*/
protected function createContentType(): ContentType
{
Expand Down
2 changes: 0 additions & 2 deletions tests/lib/Integration/RelationServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ public function testLoadFieldRelationsForNonexistentField(): void
* @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
* @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
* @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
*
* @return array
*/
protected function prepareTestContent(): array
{
Expand Down
6 changes: 0 additions & 6 deletions tests/lib/Integration/Traits/SearchResultExtractorStub.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ class SearchResultExtractorStub
use SearchResultExtractorTrait;

/**
* @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult
*
* @return \eZ\Publish\API\Repository\Values\ValueObject[]
*/
public function doExtractValueObjects(SearchResult $searchResult): array
Expand All @@ -22,8 +20,6 @@ public function doExtractValueObjects(SearchResult $searchResult): array
}

/**
* @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult
*
* @return \eZ\Publish\API\Repository\Values\ValueObject[]
*/
public function doExtractContentItems(SearchResult $searchResult): array
Expand All @@ -32,8 +28,6 @@ public function doExtractContentItems(SearchResult $searchResult): array
}

/**
* @param \eZ\Publish\API\Repository\Values\Content\Search\SearchResult $searchResult
*
* @return \eZ\Publish\API\Repository\Values\ValueObject[]
*/
public function doExtractLocations(SearchResult $searchResult): array
Expand Down
7 changes: 1 addition & 6 deletions tests/lib/Unit/Core/Site/ContentFieldsMockTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Netgen\EzPlatformSiteApi\Tests\Unit\Core\Site;

use eZ\Publish\API\Repository\ContentTypeService;
use eZ\Publish\API\Repository\FieldType;
use eZ\Publish\API\Repository\FieldTypeService;
use eZ\Publish\API\Repository\Values\Content\ContentInfo as RepoContentInfo;
use eZ\Publish\API\Repository\Values\ContentType\FieldDefinitionCollection;
Expand All @@ -13,7 +14,6 @@
use eZ\Publish\Core\Repository\Values\Content\Content as RepoContent;
use eZ\Publish\Core\Repository\Values\Content\VersionInfo;
use eZ\Publish\Core\Repository\Values\ContentType\ContentType;
use eZ\Publish\API\Repository\FieldType;
use Netgen\EzPlatformSiteApi\API\Site;
use Netgen\EzPlatformSiteApi\Core\Site\DomainObjectMapper;
use PHPUnit\Framework\MockObject\MockBuilder;
Expand Down Expand Up @@ -99,11 +99,6 @@ protected function getSiteMock(): MockObject
return $this->siteMock;
}

/**
* @param bool $failOnMissingField
*
* @return \Netgen\EzPlatformSiteApi\Core\Site\DomainObjectMapper
*/
protected function getDomainObjectMapper(bool $failOnMissingField = true): DomainObjectMapper
{
if (isset($this->domainObjectMapper[$failOnMissingField])) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ public function providerForTestGetQuery(): array

/**
* @dataProvider providerForTestGetQuery
*
* @param array $parameters
* @param \eZ\Publish\API\Repository\Values\Content\Query $expectedQuery
*/
public function testGetQuery(array $parameters, Query $expectedQuery): void
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
use eZ\Publish\API\Repository\Values\Content\Query\Criterion\Operator;
use eZ\Publish\API\Repository\Values\Content\Query\SortClause\ContentName;
use eZ\Publish\API\Repository\Values\Content\Query\SortClause\DatePublished;
use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection;
use eZ\Publish\Core\FieldType\Relation\Value as RelationValue;
use eZ\Publish\Core\FieldType\RelationList\Value as RelationListValue;
use eZ\Publish\Core\FieldType\TextLine\Value;
use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinition;
use eZ\Publish\Core\Repository\Values\ContentType\FieldDefinitionCollection;
use Netgen\EzPlatformSiteApi\Core\Site\Plugins\FieldType\RelationResolver\Registry;
use Netgen\EzPlatformSiteApi\Core\Site\Plugins\FieldType\RelationResolver\Resolver\Relation;
use Netgen\EzPlatformSiteApi\Core\Site\Plugins\FieldType\RelationResolver\Resolver\RelationList;
Expand Down
3 changes: 0 additions & 3 deletions tests/lib/Unit/Core/Site/QueryType/CriteriaBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -437,9 +437,6 @@ public function testBuildDateMetadataThrowsException(): void
]);
}

/**
* @return \Netgen\EzPlatformSiteApi\Core\Site\QueryType\CriteriaBuilder
*/
protected function getCriteriaBuilderUnderTest(): CriteriaBuilder
{
if ($this->criteriaBuilder === null) {
Expand Down

0 comments on commit c8738f4

Please sign in to comment.