@@ -7,9 +7,8 @@ |
||
| 7 | 7 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests; |
| 8 | 8 | |
| 9 | 9 | use eZ\Publish\Core\MVC\Symfony\SiteAccess; |
| 10 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement; |
|
| 11 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router; |
|
| 12 | 10 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher; |
| 11 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router; |
|
| 13 | 12 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest; |
| 14 | 13 | use Psr\Log\LoggerInterface; |
| 15 | 14 | |
@@ -7,9 +7,8 @@ |
||
| 7 | 7 | namespace eZ\Publish\Core\MVC\Symfony\SiteAccess\Tests; |
| 8 | 8 | |
| 9 | 9 | use eZ\Publish\Core\MVC\Symfony\SiteAccess; |
| 10 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement; |
|
| 11 | -use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router; |
|
| 12 | 10 | use eZ\Publish\Core\MVC\Symfony\SiteAccess\Matcher\URIElement as URIElementMatcher; |
| 11 | +use eZ\Publish\Core\MVC\Symfony\SiteAccess\Router; |
|
| 13 | 12 | use eZ\Publish\Core\MVC\Symfony\Routing\SimplifiedRequest; |
| 14 | 13 | use Psr\Log\LoggerInterface; |
| 15 | 14 | |
@@ -18,7 +18,6 @@ |
||
| 18 | 18 | use eZ\Publish\Core\Repository\Mapper\ContentDomainMapper; |
| 19 | 19 | use eZ\Publish\Core\Repository\Values\Content\Content; |
| 20 | 20 | use eZ\Publish\Core\Repository\Values\Content\VersionInfo; |
| 21 | -use eZ\Publish\SPI\Persistence\Content\ContentInfo; |
|
| 22 | 21 | use eZ\Publish\SPI\Persistence\Content\ContentInfo as SPIContentInfo; |
| 23 | 22 | use eZ\Publish\SPI\Persistence\Content\Location; |
| 24 | 23 | use eZ\Publish\API\Repository\Values\Content\Location as APILocation; |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | use eZ\Publish\SPI\Persistence\Content\Location; |
| 12 | 12 | use eZ\Publish\SPI\Persistence\Content\Location\UpdateStruct; |
| 13 | 13 | use eZ\Publish\SPI\Persistence\Content\Location\CreateStruct; |
| 14 | -use Doctrine\DBAL\DBALException; |
|
| 15 | 14 | use PDOException; |
| 16 | 15 | |
| 17 | 16 | /** |
@@ -1966,6 +1966,4 @@ |
||
| 1966 | 1966 | $alwaysAvailable ? 1 : self::REMOVE_ALWAYS_AVAILABLE_LANG_MASK_OPERAND |
| 1967 | 1967 | ); |
| 1968 | 1968 | |
| 1969 | - return $query; |
|
| 1970 | - } |
|
| 1971 | -} |
|
| 1969 | + return $query |
|
| 1972 | 1970 | \ No newline at end of file |
@@ -11,11 +11,10 @@ |
||
| 11 | 11 | use eZ\Publish\API\Repository\PermissionCriterionResolver; |
| 12 | 12 | use eZ\Publish\API\Repository\PermissionResolver; |
| 13 | 13 | use eZ\Publish\API\Repository\Values\Content\Language; |
| 14 | -use eZ\Publish\API\Repository\Values\Content\Location; |
|
| 14 | +use eZ\Publish\API\Repository\Values\Content\Location as APILocation; |
|
| 15 | 15 | use eZ\Publish\API\Repository\Values\Content\LocationUpdateStruct; |
| 16 | 16 | use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct; |
| 17 | 17 | use eZ\Publish\API\Repository\Values\Content\ContentInfo; |
| 18 | -use eZ\Publish\API\Repository\Values\Content\Location as APILocation; |
|
| 19 | 18 | use eZ\Publish\API\Repository\Values\Content\LocationList; |
| 20 | 19 | use eZ\Publish\API\Repository\Values\Content\VersionInfo; |
| 21 | 20 | use eZ\Publish\Core\Repository\Mapper\ContentDomainMapper; |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use DateTimeImmutable; |
| 10 | 10 | use eZ\Publish\API\Repository\Values\ContentType\FieldDefinition; |
| 11 | 11 | use eZ\Publish\Core\Base\Exceptions\NotFoundException; |
| 12 | -use eZ\Publish\Core\FieldType\User\Type; |
|
| 13 | 12 | use eZ\Publish\Core\FieldType\User\Type as UserType; |
| 14 | 13 | use eZ\Publish\Core\FieldType\User\Value as UserValue; |
| 15 | 14 | use eZ\Publish\Core\Base\Exceptions\InvalidArgumentException; |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use eZ\Publish\Core\Base\Exceptions\DatabaseException; |
| 10 | 10 | use eZ\Publish\Core\Search\Legacy\Content\Gateway; |
| 11 | 11 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 12 | -use Doctrine\DBAL\DBALException; |
|
| 13 | 12 | use PDOException; |
| 14 | 13 | |
| 15 | 14 | /** |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use eZ\Publish\API\Repository\Values\Content\Query\Criterion; |
| 10 | 10 | use eZ\Publish\Core\Base\Exceptions\DatabaseException; |
| 11 | 11 | use eZ\Publish\Core\Search\Legacy\Content\Location\Gateway; |
| 12 | -use Doctrine\DBAL\DBALException; |
|
| 13 | 12 | use PDOException; |
| 14 | 13 | |
| 15 | 14 | /** |