Skip to content

Commit

Permalink
chore(MOS-1162): Loosen constraints on Symfony packages to allow 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
fred-jan committed Feb 22, 2024
1 parent 48f6f99 commit 7268078
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Form/ChoiceList/PropelChoiceLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public function __construct($class, \ModelCriteria $queryObject, $useAsIdentifie
/**
* {@inheritdoc}
*/
public function loadChoiceList($value = null)
public function loadChoiceList(?callable $value = null): ChoiceListInterface
{
if ($this->choiceList) {
return $this->choiceList;
Expand All @@ -89,7 +89,7 @@ public function loadChoiceList($value = null)
/**
* {@inheritdoc}
*/
public function loadChoicesForValues(array $values, $value = null)
public function loadChoicesForValues(array $values, ?callable $value = null): array
{
// Performance optimization
if (empty($values)) {
Expand Down Expand Up @@ -126,7 +126,7 @@ public function loadChoicesForValues(array $values, $value = null)
/**
* {@inheritdoc}
*/
public function loadValuesForChoices(array $choices, $value = null)
public function loadValuesForChoices(array $choices, ?callable $value = null): array
{
// Performance optimization
if (empty($choices)) {
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@
"ext-simplexml": "*",
"propel/propel1": "^1.7.8",
"sensio/framework-extra-bundle": "^5.6 | ^6.2",
"symfony/console": "^5.4",
"symfony/form": "^5.4",
"symfony/security-bundle": "^5.4",
"symfony/translation": "^5.4",
"symfony/yaml": "^5.4"
"symfony/console": "^5.4 | ^6.2",
"symfony/form": "^5.4 | ^6.2",
"symfony/security-bundle": "^5.4 | ^6.2",
"symfony/translation": "^5.4 | ^6.2",
"symfony/yaml": "^5.4 | ^6.2"
},
"require-dev": {
"fakerphp/faker": "^1.20",
"myonlinestore/coding-standard": "^3.1",
"phing/phing": "^2.17",
"phpunit/phpunit": "^9.5",
"symfony/phpunit-bridge": "^5.4",
"symfony/stopwatch": "^5.4",
"symfony/validator": "^5.4",
"symfony/phpunit-bridge": "^5.4 | ^6.2",
"symfony/stopwatch": "^5.4 | ^6.2",
"symfony/validator": "^5.4 | ^6.2",
"twig/twig": "^3.4",
"vimeo/psalm": "^4.26"
},
Expand Down

0 comments on commit 7268078

Please sign in to comment.