Skip to content

Upgrade the Negotiation library #1104

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

Merged
soyuka merged 2 commits into from
May 15, 2017
Merged

Upgrade the Negotiation library #1104

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
548f577
Upgrade the Negotiation library
dunglas May 8, 2017
babe7bb
fix phpstan errors
May 15, 2017
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"symfony/property-access": "^2.7 || ^3.0",
"symfony/property-info": "^3.1",
"symfony/serializer": "^3.1",
"willdurand/negotiation": "^2.0.3 <2.3"
"willdurand/negotiation": "^2.3.1"
},
"require-dev": {
"behat/behat": "^3.1",
Expand Down
4 changes: 1 addition & 3 deletions phpstan.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,5 @@ parameters:
- '#Call to an undefined method PHPUnit_Framework_MockObject_MockObject::[a-zA-Z0-9_]+\(\)#'

# False positives
- '#scalar#' # Fixed in PHPStan 0.7
- '#Parameter \#2 \$dqlPart of method Doctrine\\ORM\\QueryBuilder::add\(\) expects Doctrine\\ORM\\Query\\Expr\\Base, Doctrine\\ORM\\Query\\Expr\\Join\[\] given#' # Fixed in Doctrine's master
- '#Parameter \#1 \$rootNode of method ApiPlatform\\Core\\Bridge\\Symfony\\Bundle\\DependencyInjection\\Configuration::[a-zA-Z0-9]+\(\) expects Symfony\\Component\\Config\\Definition\\Builder\\ArrayNodeDefinition, Symfony\\Component\\Config\\Definition\\Builder\\ArrayNodeDefinition|Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition given#'
- '#Parameter \#1 \$source of static method ApiPlatform\\Core\\Util\\RequestParser::parseRequestParams\(\) expects string, string\|resource given#'
- '#Parameter \#1 \$callable of static method Doctrine\\Common\\Annotations\\AnnotationRegistry::registerLoader\(\) expects callable, mixed\[\] given#'
2 changes: 1 addition & 1 deletion src/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ final class FilterEagerLoadingExtension implements QueryCollectionExtensionInter
{
use EagerLoadingTrait;

public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, $forceEager = true)
public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, bool $forceEager = true)
{
$this->resourceMetadataFactory = $resourceMetadataFactory;
$this->forceEager = $forceEager;
Expand Down
2 changes: 1 addition & 1 deletion src/Bridge/Doctrine/Orm/Util/EagerLoadingTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ private function shouldOperationForceEager(string $resourceClass, array $options
$forceEager = $resourceMetadata->getAttribute('force_eager');
}

return is_bool($forceEager) ? $forceEager : $this->forceEager;
return is_bool($forceEager) ? $forceEager : (bool) $this->forceEager;
}

/**
Expand Down