Skip to content

Commit 7ae22eb

Browse files
MyIgellocalheinz
MyIgel
and
localheinz
authored
Fix bc check (#572)
* Fix bc check * Fix: Disable void_return fixer * Fix: Remove return type declaration * Fix: Use long options * Fix: Order Co-authored-by: Andreas Möller <[email protected]>
1 parent e63e29e commit 7ae22eb

File tree

15 files changed

+37
-33
lines changed

15 files changed

+37
-33
lines changed

‎.github/workflows/bc-check.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ jobs:
1717
uses: "actions/checkout@v3"
1818

1919
- name: "Roave BC Check"
20-
uses: "docker://nyholm/roave-bc-check-ga"
20+
uses: "addnab/docker-run-action@v3"
21+
with:
22+
image: "nyholm/roave-bc-check-ga"
23+
options: "--env GITHUB_REPOSITORY=${{ github.repository }} --user 1001 --volume ${{ github.workspace }}:/app"
24+
run: "/entrypoint.sh"

‎.php-cs-fixer.dist.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,6 @@
206206
'property',
207207
],
208208
],
209-
'void_return' => true,
209+
'void_return' => false,
210210
'whitespace_after_comma_in_array' => true,
211211
]);

‎src/Faker/Generator.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ public function ext(string $id): Extension\Extension
597597
return $extension;
598598
}
599599

600-
public function addProvider($provider): void
600+
public function addProvider($provider)
601601
{
602602
array_unshift($this->providers, $provider);
603603

@@ -682,7 +682,7 @@ public function valid(?\Closure $validator = null, int $maxRetries = 10000)
682682
return new ValidGenerator($this, $validator, $maxRetries);
683683
}
684684

685-
public function seed($seed = null): void
685+
public function seed($seed = null)
686686
{
687687
if ($seed === null) {
688688
mt_srand();
@@ -966,7 +966,7 @@ public function __destruct()
966966
$this->seed();
967967
}
968968

969-
public function __wakeup(): void
969+
public function __wakeup()
970970
{
971971
$this->formatters = [];
972972
}

‎src/Faker/ORM/CakePHP/EntityPopulator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ public function __get($name)
2727
/**
2828
* @param string $name
2929
*/
30-
public function __set($name, $value): void
30+
public function __set($name, $value)
3131
{
3232
$this->{$name} = $value;
3333
}
3434

35-
public function mergeColumnFormattersWith($columnFormatters): void
35+
public function mergeColumnFormattersWith($columnFormatters)
3636
{
3737
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
3838
}
3939

40-
public function mergeModifiersWith($modifiers): void
40+
public function mergeModifiersWith($modifiers)
4141
{
4242
$this->modifiers = array_merge($this->modifiers, $modifiers);
4343
}
@@ -155,7 +155,7 @@ public function execute($class, $insertedEntities, $options = [])
155155
return $entity->{$pk[0]};
156156
}
157157

158-
public function setConnection($name): void
158+
public function setConnection($name)
159159
{
160160
$this->connectionName = $name;
161161
}

‎src/Faker/ORM/Doctrine/EntityPopulator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function getClass()
3838
return $this->class->getName();
3939
}
4040

41-
public function setColumnFormatters($columnFormatters): void
41+
public function setColumnFormatters($columnFormatters)
4242
{
4343
$this->columnFormatters = $columnFormatters;
4444
}
@@ -51,12 +51,12 @@ public function getColumnFormatters()
5151
return $this->columnFormatters;
5252
}
5353

54-
public function mergeColumnFormattersWith($columnFormatters): void
54+
public function mergeColumnFormattersWith($columnFormatters)
5555
{
5656
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
5757
}
5858

59-
public function setModifiers(array $modifiers): void
59+
public function setModifiers(array $modifiers)
6060
{
6161
$this->modifiers = $modifiers;
6262
}
@@ -69,7 +69,7 @@ public function getModifiers()
6969
return $this->modifiers;
7070
}
7171

72-
public function mergeModifiersWith(array $modifiers): void
72+
public function mergeModifiersWith(array $modifiers)
7373
{
7474
$this->modifiers = array_merge($this->modifiers, $modifiers);
7575
}

‎src/Faker/ORM/Doctrine/Populator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function __construct(Generator $generator, ObjectManager $manager = null,
6161
* @param mixed $entity A Doctrine classname, or a \Faker\ORM\Doctrine\EntityPopulator instance
6262
* @param int $number The number of entities to populate
6363
*/
64-
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [], $generateId = false): void
64+
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [], $generateId = false)
6565
{
6666
if (!$entity instanceof \Faker\ORM\Doctrine\EntityPopulator) {
6767
if (null === $this->manager) {

‎src/Faker/ORM/Mandango/EntityPopulator.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getClass()
2929
return $this->class;
3030
}
3131

32-
public function setColumnFormatters($columnFormatters): void
32+
public function setColumnFormatters($columnFormatters)
3333
{
3434
$this->columnFormatters = $columnFormatters;
3535
}
@@ -42,7 +42,7 @@ public function getColumnFormatters()
4242
return $this->columnFormatters;
4343
}
4444

45-
public function mergeColumnFormattersWith($columnFormatters): void
45+
public function mergeColumnFormattersWith($columnFormatters)
4646
{
4747
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
4848
}

‎src/Faker/ORM/Mandango/Populator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(\Faker\Generator $generator, Mandango $mandango)
2727
* @param mixed $entity A Propel ActiveRecord classname, or a \Faker\ORM\Propel\EntityPopulator instance
2828
* @param int $number The number of entities to populate
2929
*/
30-
public function addEntity($entity, $number, $customColumnFormatters = []): void
30+
public function addEntity($entity, $number, $customColumnFormatters = [])
3131
{
3232
if (!$entity instanceof \Faker\ORM\Mandango\EntityPopulator) {
3333
$entity = new \Faker\ORM\Mandango\EntityPopulator($entity);

‎src/Faker/ORM/Propel/EntityPopulator.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function getClass()
2929
return $this->class;
3030
}
3131

32-
public function setColumnFormatters($columnFormatters): void
32+
public function setColumnFormatters($columnFormatters)
3333
{
3434
$this->columnFormatters = $columnFormatters;
3535
}
@@ -42,7 +42,7 @@ public function getColumnFormatters()
4242
return $this->columnFormatters;
4343
}
4444

45-
public function mergeColumnFormattersWith($columnFormatters): void
45+
public function mergeColumnFormattersWith($columnFormatters)
4646
{
4747
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
4848
}
@@ -126,7 +126,7 @@ protected function isColumnBehavior(\ColumnMap $columnMap)
126126
return false;
127127
}
128128

129-
public function setModifiers($modifiers): void
129+
public function setModifiers($modifiers)
130130
{
131131
$this->modifiers = $modifiers;
132132
}
@@ -139,7 +139,7 @@ public function getModifiers()
139139
return $this->modifiers;
140140
}
141141

142-
public function mergeModifiersWith($modifiers): void
142+
public function mergeModifiersWith($modifiers)
143143
{
144144
$this->modifiers = array_merge($this->modifiers, $modifiers);
145145
}

‎src/Faker/ORM/Propel/Populator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function __construct(\Faker\Generator $generator)
2323
* @param mixed $entity A Propel ActiveRecord classname, or a \Faker\ORM\Propel\EntityPopulator instance
2424
* @param int $number The number of entities to populate
2525
*/
26-
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = []): void
26+
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [])
2727
{
2828
if (!$entity instanceof \Faker\ORM\Propel\EntityPopulator) {
2929
$entity = new \Faker\ORM\Propel\EntityPopulator($entity);

0 commit comments

Comments
 (0)