Skip to content

Commit

Permalink
fix-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
@jockos
jockos committed Dec 31, 2020
1 parent fa99626 commit a9c70bf
Show file tree
Hide file tree
Showing 104 changed files with 125 additions and 125 deletions.
2 changes: 1 addition & 1 deletion src/Bridge/Doctrine/EventListener/PublishMercureUpdatesListener.php
View file
Expand Up @@ -256,7 +256,7 @@ private function getGraphQlSubscriptionUpdates($object, array $options, string $
}

/**
* @var string|string[] $iri
* @param string|string[] $iri
*/
private function buildUpdate($iri, string $data, array $options): Update
{
Expand Down
10 changes: 4 additions & 6 deletions src/Swagger/Serializer/DocumentationNormalizer.php
View file
Expand Up @@ -697,13 +697,11 @@ private function computeDoc(bool $v3, Documentation $documentation, \ArrayObject
$security[] = [$key => []];
}

if ($v3) {
if ($securityDefinitions && $security) {
$docs['security'] = $security;
}
} elseif ($securityDefinitions && $security) {
$docs['securityDefinitions'] = $securityDefinitions;
if ($securityDefinitions && $security) { // @phpstan-ignore-line
$docs['security'] = $security;
if (!$v3) {
$docs['securityDefinitions'] = $securityDefinitions;
}
}

if ($v3) {
Expand Down
6 changes: 4 additions & 2 deletions src/Util/ClassInfoTrait.php
View file
Expand Up @@ -39,8 +39,10 @@ private function getRealClassName(string $className): string
{
// __CG__: Doctrine Common Marker for Proxy (ODM < 2.0 and ORM < 3.0)
// __PM__: Ocramius Proxy Manager (ODM >= 2.0)
if ((false === $positionCg = strrpos($className, '\\__CG__\\')) &&
(false === $positionPm = strrpos($className, '\\__PM__\\'))) {
$positionCg = strrpos($className, '\\__CG__\\');
$positionPm = strrpos($className, '\\__PM__\\');

if (false === $positionCg && false === $positionPm) {
return $className;
}

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/AbsoluteUrlDummy.php
View file
Expand Up @@ -24,7 +24,7 @@
class AbsoluteUrlDummy
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/AbsoluteUrlRelationDummy.php
View file
Expand Up @@ -26,7 +26,7 @@
class AbsoluteUrlRelationDummy
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/AbstractDummy.php
View file
Expand Up @@ -37,7 +37,7 @@ abstract class AbstractDummy
/**
* @var int The id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/Address.php
View file
Expand Up @@ -28,7 +28,7 @@ class Address
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
* @Groups({"order_read"})
*/
private $id;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/Answer.php
View file
Expand Up @@ -30,7 +30,7 @@
class Answer
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
* @Serializer\Groups({"foobar"})
*/
private $id;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/ArrayFilterValidator.php
View file
Expand Up @@ -36,7 +36,7 @@ class ArrayFilterValidator
/**
* @var int The id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/Book.php
View file
Expand Up @@ -30,7 +30,7 @@
class Book
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CircularReference.php
View file
Expand Up @@ -29,7 +29,7 @@
class CircularReference
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
public $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CompositeItem.php
View file
Expand Up @@ -26,7 +26,7 @@
class CompositeItem
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CompositeLabel.php
View file
Expand Up @@ -26,7 +26,7 @@
class CompositeLabel
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/CompositePrimitiveItem.php
View file
Expand Up @@ -25,7 +25,7 @@
class CompositePrimitiveItem
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand All @@ -35,7 +35,7 @@ class CompositePrimitiveItem
private $name;

/**
* @ODM\Field(type="integer")
* @ODM\Field(type="int")
*/
private $year;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CompositeRelation.php
View file
Expand Up @@ -26,7 +26,7 @@
class CompositeRelation
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/ContainNonResource.php
View file
Expand Up @@ -34,7 +34,7 @@
class ContainNonResource
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*
* @Groups("contain_non_resource")
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/Content.php
View file
Expand Up @@ -34,7 +34,7 @@ class Content implements \JsonSerializable
/**
* @var int|null
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/ConvertedBoolean.php
View file
Expand Up @@ -28,14 +28,14 @@ class ConvertedBoolean
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

/**
* @var bool
*
* @ODM\Field(type="boolean")
* @ODM\Field(type="bool")
*/
public $nameConverted;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/ConvertedDate.php
View file
Expand Up @@ -28,7 +28,7 @@ class ConvertedDate
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/ConvertedInteger.php
View file
Expand Up @@ -32,14 +32,14 @@ class ConvertedInteger
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

/**
* @var int
*
* @ODM\Field(type="integer")
* @ODM\Field(type="int")
*/
public $nameConverted;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/ConvertedOwner.php
View file
Expand Up @@ -28,7 +28,7 @@ class ConvertedOwner
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/ConvertedRelated.php
View file
Expand Up @@ -26,7 +26,7 @@ class ConvertedRelated
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/ConvertedString.php
View file
Expand Up @@ -28,7 +28,7 @@ class ConvertedString
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CustomActionDummy.php
View file
Expand Up @@ -38,7 +38,7 @@ class CustomActionDummy
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CustomIdentifierDummy.php
View file
Expand Up @@ -27,7 +27,7 @@ class CustomIdentifierDummy
/**
* @var int The custom identifier
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $customId;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/CustomMultipleIdentifierDummy.php
View file
Expand Up @@ -28,15 +28,15 @@ class CustomMultipleIdentifierDummy
/**
* @var int The custom identifier
*
* @ODM\Id(strategy="NONE", type="integer")
* @ODM\Id(strategy="NONE", type="int")
*/
private $firstId;

/**
* @var int The custom identifier
*
* @ApiProperty(identifier=true)
* @ODM\Field(type="integer")
* @ODM\Field(type="int")
*/
private $secondId;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/CustomNormalizedDummy.php
View file
Expand Up @@ -35,7 +35,7 @@ class CustomNormalizedDummy
/**
* @var int The id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
* @Groups({"input", "output"})
*/
private $id;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/Customer.php
View file
Expand Up @@ -29,7 +29,7 @@ class Customer
/**
* @var int
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
* @Groups({"order_read"})
*/
private $id;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/DeprecatedResource.php
View file
Expand Up @@ -26,7 +26,7 @@
class DeprecatedResource
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
public $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/DisableItemOperation.php
View file
Expand Up @@ -35,7 +35,7 @@
class DisableItemOperation
{
/**
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/Dummy.php
View file
Expand Up @@ -50,7 +50,7 @@ class Dummy
/**
* @var int The id
*
* @ODM\Id(strategy="INCREMENT", type="integer", nullable=true)
* @ODM\Id(strategy="INCREMENT", type="int", nullable=true)
*/
private $id;

Expand Down Expand Up @@ -94,7 +94,7 @@ class Dummy
/**
* @var bool A dummy boolean
*
* @ODM\Field(type="boolean", nullable=true)
* @ODM\Field(type="bool", nullable=true)
*/
public $dummyBoolean;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/DummyAggregateOffer.php
View file
Expand Up @@ -32,7 +32,7 @@ class DummyAggregateOffer
/**
* @var int The id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand All @@ -54,7 +54,7 @@ class DummyAggregateOffer
/**
* @var int The dummy aggregate offer value
*
* @ODM\Field(type="integer")
* @ODM\Field(type="int")
*/
private $value;

Expand Down
4 changes: 2 additions & 2 deletions tests/Fixtures/TestBundle/Document/DummyCar.php
View file
Expand Up @@ -44,7 +44,7 @@ class DummyCar
/**
* @var int The entity Id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down Expand Up @@ -99,7 +99,7 @@ class DummyCar
/**
* @var bool
*
* @ODM\Field(type="boolean")
* @ODM\Field(type="bool")
*/
private $canSell;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/DummyCarColor.php
View file
Expand Up @@ -29,7 +29,7 @@ class DummyCarColor
/**
* @var int The entity Id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/TestBundle/Document/DummyCustomFormat.php
View file
Expand Up @@ -26,7 +26,7 @@ class DummyCustomFormat
/**
* @var int The id
*
* @ODM\Id(strategy="INCREMENT", type="integer")
* @ODM\Id(strategy="INCREMENT", type="int")
*/
private $id;

Expand Down

0 comments on commit a9c70bf

Please sign in to comment.