Skip to content
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.

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

Enhancement: Enable void_return fixer #554

Merged
merged 2 commits into from
Dec 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,5 +200,6 @@
'property',
],
],
'void_return' => true,
'whitespace_after_comma_in_array' => true,
]);
2 changes: 1 addition & 1 deletion src/Faker/Calculator/Isbn.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static function checksum(string $input): string
$digits = str_split($input);
array_walk(
$digits,
static function (&$digit, $position) {
static function (&$digit, $position): void {
$digit = (10 - $position) * $digit;
}
);
Expand Down
6 changes: 3 additions & 3 deletions src/Faker/Generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ public function ext(string $id): Extension\Extension
return $extension;
}

public function addProvider($provider)
public function addProvider($provider): void
{
array_unshift($this->providers, $provider);

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

public function seed($seed = null)
public function seed($seed = null): void
{
if ($seed === null) {
mt_srand();
Expand Down Expand Up @@ -966,7 +966,7 @@ public function __destruct()
$this->seed();
}

public function __wakeup()
public function __wakeup(): void
{
$this->formatters = [];
}
Expand Down
8 changes: 4 additions & 4 deletions src/Faker/ORM/CakePHP/EntityPopulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ public function __get($name)
/**
* @param string $name
*/
public function __set($name, $value)
public function __set($name, $value): void
{
$this->{$name} = $value;
}

public function mergeColumnFormattersWith($columnFormatters)
public function mergeColumnFormattersWith($columnFormatters): void
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}

public function mergeModifiersWith($modifiers)
public function mergeModifiersWith($modifiers): void
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down Expand Up @@ -155,7 +155,7 @@ public function execute($class, $insertedEntities, $options = [])
return $entity->{$pk[0]};
}

public function setConnection($name)
public function setConnection($name): void
{
$this->connectionName = $name;
}
Expand Down
12 changes: 6 additions & 6 deletions src/Faker/ORM/Doctrine/EntityPopulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function getClass()
return $this->class->getName();
}

public function setColumnFormatters($columnFormatters)
public function setColumnFormatters($columnFormatters): void
{
$this->columnFormatters = $columnFormatters;
}
Expand All @@ -51,12 +51,12 @@ public function getColumnFormatters()
return $this->columnFormatters;
}

public function mergeColumnFormattersWith($columnFormatters)
public function mergeColumnFormattersWith($columnFormatters): void
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}

public function setModifiers(array $modifiers)
public function setModifiers(array $modifiers): void
{
$this->modifiers = $modifiers;
}
Expand All @@ -69,7 +69,7 @@ public function getModifiers()
return $this->modifiers;
}

public function mergeModifiersWith(array $modifiers)
public function mergeModifiersWith(array $modifiers): void
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down Expand Up @@ -193,7 +193,7 @@ public function execute(ObjectManager $manager, $insertedEntities, $generateId =
return $obj;
}

private function fillColumns($obj, $insertedEntities)
private function fillColumns($obj, $insertedEntities): void
{
foreach ($this->columnFormatters as $field => $format) {
if (null !== $format) {
Expand All @@ -220,7 +220,7 @@ private function fillColumns($obj, $insertedEntities)
}
}

private function callMethods($obj, $insertedEntities)
private function callMethods($obj, $insertedEntities): void
{
foreach ($this->getModifiers() as $modifier) {
$modifier($obj, $insertedEntities);
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Doctrine/Populator.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function __construct(Generator $generator, ObjectManager $manager = null,
* @param mixed $entity A Doctrine classname, or a \Faker\ORM\Doctrine\EntityPopulator instance
* @param int $number The number of entities to populate
*/
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [], $generateId = false)
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [], $generateId = false): void
{
if (!$entity instanceof \Faker\ORM\Doctrine\EntityPopulator) {
if (null === $this->manager) {
Expand Down
4 changes: 2 additions & 2 deletions src/Faker/ORM/Mandango/EntityPopulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function getClass()
return $this->class;
}

public function setColumnFormatters($columnFormatters)
public function setColumnFormatters($columnFormatters): void
{
$this->columnFormatters = $columnFormatters;
}
Expand All @@ -42,7 +42,7 @@ public function getColumnFormatters()
return $this->columnFormatters;
}

public function mergeColumnFormattersWith($columnFormatters)
public function mergeColumnFormattersWith($columnFormatters): void
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Mandango/Populator.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function __construct(\Faker\Generator $generator, Mandango $mandango)
* @param mixed $entity A Propel ActiveRecord classname, or a \Faker\ORM\Propel\EntityPopulator instance
* @param int $number The number of entities to populate
*/
public function addEntity($entity, $number, $customColumnFormatters = [])
public function addEntity($entity, $number, $customColumnFormatters = []): void
{
if (!$entity instanceof \Faker\ORM\Mandango\EntityPopulator) {
$entity = new \Faker\ORM\Mandango\EntityPopulator($entity);
Expand Down
12 changes: 6 additions & 6 deletions src/Faker/ORM/Propel/EntityPopulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function getClass()
return $this->class;
}

public function setColumnFormatters($columnFormatters)
public function setColumnFormatters($columnFormatters): void
{
$this->columnFormatters = $columnFormatters;
}
Expand All @@ -42,7 +42,7 @@ public function getColumnFormatters()
return $this->columnFormatters;
}

public function mergeColumnFormattersWith($columnFormatters)
public function mergeColumnFormattersWith($columnFormatters): void
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}
Expand Down Expand Up @@ -126,7 +126,7 @@ protected function isColumnBehavior(\ColumnMap $columnMap)
return false;
}

public function setModifiers($modifiers)
public function setModifiers($modifiers): void
{
$this->modifiers = $modifiers;
}
Expand All @@ -139,7 +139,7 @@ public function getModifiers()
return $this->modifiers;
}

public function mergeModifiersWith($modifiers)
public function mergeModifiersWith($modifiers): void
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand All @@ -157,7 +157,7 @@ public function guessModifiers(\Faker\Generator $generator)
foreach ($tableMap->getBehaviors() as $name => $params) {
switch ($name) {
case 'nested_set':
$modifiers['nested_set'] = static function ($obj, $inserted) use ($class, $generator) {
$modifiers['nested_set'] = static function ($obj, $inserted) use ($class, $generator): void {
if (isset($inserted[$class])) {
$queryClass = $class . 'Query';
$parent = $queryClass::create()->findPk($generator->randomElement($inserted[$class]));
Expand All @@ -170,7 +170,7 @@ public function guessModifiers(\Faker\Generator $generator)
break;

case 'sortable':
$modifiers['sortable'] = static function ($obj, $inserted) use ($class, $generator) {
$modifiers['sortable'] = static function ($obj, $inserted) use ($class, $generator): void {
$obj->insertAtRank($generator->numberBetween(1, count($inserted[$class] ?? []) + 1));
};

Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Propel/Populator.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct(\Faker\Generator $generator)
* @param mixed $entity A Propel ActiveRecord classname, or a \Faker\ORM\Propel\EntityPopulator instance
* @param int $number The number of entities to populate
*/
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [])
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = []): void
{
if (!$entity instanceof \Faker\ORM\Propel\EntityPopulator) {
$entity = new \Faker\ORM\Propel\EntityPopulator($entity);
Expand Down
12 changes: 6 additions & 6 deletions src/Faker/ORM/Propel2/EntityPopulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function getClass()
return $this->class;
}

public function setColumnFormatters($columnFormatters)
public function setColumnFormatters($columnFormatters): void
{
$this->columnFormatters = $columnFormatters;
}
Expand All @@ -43,7 +43,7 @@ public function getColumnFormatters()
return $this->columnFormatters;
}

public function mergeColumnFormattersWith($columnFormatters)
public function mergeColumnFormattersWith($columnFormatters): void
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}
Expand Down Expand Up @@ -129,7 +129,7 @@ protected function isColumnBehavior(ColumnMap $columnMap)
return false;
}

public function setModifiers($modifiers)
public function setModifiers($modifiers): void
{
$this->modifiers = $modifiers;
}
Expand All @@ -142,7 +142,7 @@ public function getModifiers()
return $this->modifiers;
}

public function mergeModifiersWith($modifiers)
public function mergeModifiersWith($modifiers): void
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand All @@ -160,7 +160,7 @@ public function guessModifiers(\Faker\Generator $generator)
foreach ($tableMap->getBehaviors() as $name => $params) {
switch ($name) {
case 'nested_set':
$modifiers['nested_set'] = static function ($obj, $inserted) use ($class, $generator) {
$modifiers['nested_set'] = static function ($obj, $inserted) use ($class, $generator): void {
if (isset($inserted[$class])) {
$queryClass = $class . 'Query';
$parent = $queryClass::create()->findPk($generator->randomElement($inserted[$class]));
Expand All @@ -173,7 +173,7 @@ public function guessModifiers(\Faker\Generator $generator)
break;

case 'sortable':
$modifiers['sortable'] = static function ($obj, $inserted) use ($class, $generator) {
$modifiers['sortable'] = static function ($obj, $inserted) use ($class, $generator): void {
$obj->insertAtRank($generator->numberBetween(1, count($inserted[$class] ?? []) + 1));
};

Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Propel2/Populator.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function __construct(\Faker\Generator $generator)
* @param mixed $entity A Propel ActiveRecord classname, or a \Faker\ORM\Propel2\EntityPopulator instance
* @param int $number The number of entities to populate
*/
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [])
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = []): void
{
if (!$entity instanceof \Faker\ORM\Propel2\EntityPopulator) {
$entity = new \Faker\ORM\Propel2\EntityPopulator($entity);
Expand Down
12 changes: 6 additions & 6 deletions src/Faker/ORM/Spot/EntityPopulator.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function getMapper()
return $this->mapper;
}

public function setColumnFormatters($columnFormatters)
public function setColumnFormatters($columnFormatters): void
{
$this->columnFormatters = $columnFormatters;
}
Expand All @@ -73,12 +73,12 @@ public function getColumnFormatters()
return $this->columnFormatters;
}

public function mergeColumnFormattersWith($columnFormatters)
public function mergeColumnFormattersWith($columnFormatters): void
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}

public function setModifiers(array $modifiers)
public function setModifiers(array $modifiers): void
{
$this->modifiers = $modifiers;
}
Expand All @@ -91,7 +91,7 @@ public function getModifiers()
return $this->modifiers;
}

public function mergeModifiersWith(array $modifiers)
public function mergeModifiersWith(array $modifiers): void
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down Expand Up @@ -180,7 +180,7 @@ public function execute($insertedEntities)
return $obj;
}

private function fillColumns($obj, $insertedEntities)
private function fillColumns($obj, $insertedEntities): void
{
foreach ($this->columnFormatters as $field => $format) {
if (null !== $format) {
Expand All @@ -190,7 +190,7 @@ private function fillColumns($obj, $insertedEntities)
}
}

private function callMethods($obj, $insertedEntities)
private function callMethods($obj, $insertedEntities): void
{
foreach ($this->getModifiers() as $modifier) {
$modifier($obj, $insertedEntities);
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Spot/Populator.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function addEntity(
$customColumnFormatters = [],
$customModifiers = [],
$useExistingData = false
) {
): void {
$mapper = $this->locator->mapper($entityName);

if (null === $mapper) {
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/Provider/DateTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private static function setTimezone(\DateTime $dt, $timezone)
*
* @param string $timezone
*/
public static function setDefaultTimezone($timezone = null)
public static function setDefaultTimezone($timezone = null): void
{
static::$defaultTimezone = $timezone;
}
Expand Down