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

Fix bc check #572

Merged
merged 5 commits into from Dec 13, 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
6 changes: 5 additions & 1 deletion .github/workflows/bc-check.yaml
Expand Up @@ -17,4 +17,8 @@ jobs:
uses: "actions/checkout@v3"

- name: "Roave BC Check"
uses: "docker://nyholm/roave-bc-check-ga"
uses: "addnab/docker-run-action@v3"
with:
image: "nyholm/roave-bc-check-ga"
options: "--env GITHUB_REPOSITORY=${{ github.repository }} --user 1001 --volume ${{ github.workspace }}:/app"
run: "/entrypoint.sh"
2 changes: 1 addition & 1 deletion .php-cs-fixer.dist.php
Expand Up @@ -206,6 +206,6 @@
'property',
],
],
'void_return' => true,
'void_return' => false,
'whitespace_after_comma_in_array' => true,
]);
6 changes: 3 additions & 3 deletions src/Faker/Generator.php
Expand Up @@ -597,7 +597,7 @@ public function ext(string $id): Extension\Extension
return $extension;
}

public function addProvider($provider): void
public function addProvider($provider)
{
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): void
public function seed($seed = null)
{
if ($seed === null) {
mt_srand();
Expand Down Expand Up @@ -966,7 +966,7 @@ public function __destruct()
$this->seed();
}

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

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

public function mergeModifiersWith($modifiers): void
public function mergeModifiersWith($modifiers)
{
$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): void
public function setConnection($name)
{
$this->connectionName = $name;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Faker/ORM/Doctrine/EntityPopulator.php
Expand Up @@ -38,7 +38,7 @@ public function getClass()
return $this->class->getName();
}

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

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

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

public function mergeModifiersWith(array $modifiers): void
public function mergeModifiersWith(array $modifiers)
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Doctrine/Populator.php
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): void
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [], $generateId = false)
{
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
Expand Up @@ -29,7 +29,7 @@ public function getClass()
return $this->class;
}

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

public function mergeColumnFormattersWith($columnFormatters): void
public function mergeColumnFormattersWith($columnFormatters)
{
$this->columnFormatters = array_merge($this->columnFormatters, $columnFormatters);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Mandango/Populator.php
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 = []): void
public function addEntity($entity, $number, $customColumnFormatters = [])
{
if (!$entity instanceof \Faker\ORM\Mandango\EntityPopulator) {
$entity = new \Faker\ORM\Mandango\EntityPopulator($entity);
Expand Down
8 changes: 4 additions & 4 deletions src/Faker/ORM/Propel/EntityPopulator.php
Expand Up @@ -29,7 +29,7 @@ public function getClass()
return $this->class;
}

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

public function mergeColumnFormattersWith($columnFormatters): void
public function mergeColumnFormattersWith($columnFormatters)
{
$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): void
public function setModifiers($modifiers)
{
$this->modifiers = $modifiers;
}
Expand All @@ -139,7 +139,7 @@ public function getModifiers()
return $this->modifiers;
}

public function mergeModifiersWith($modifiers): void
public function mergeModifiersWith($modifiers)
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Propel/Populator.php
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 = []): void
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [])
{
if (!$entity instanceof \Faker\ORM\Propel\EntityPopulator) {
$entity = new \Faker\ORM\Propel\EntityPopulator($entity);
Expand Down
8 changes: 4 additions & 4 deletions src/Faker/ORM/Propel2/EntityPopulator.php
Expand Up @@ -30,7 +30,7 @@ public function getClass()
return $this->class;
}

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

public function mergeColumnFormattersWith($columnFormatters): void
public function mergeColumnFormattersWith($columnFormatters)
{
$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): void
public function setModifiers($modifiers)
{
$this->modifiers = $modifiers;
}
Expand All @@ -142,7 +142,7 @@ public function getModifiers()
return $this->modifiers;
}

public function mergeModifiersWith($modifiers): void
public function mergeModifiersWith($modifiers)
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Propel2/Populator.php
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 = []): void
public function addEntity($entity, $number, $customColumnFormatters = [], $customModifiers = [])
{
if (!$entity instanceof \Faker\ORM\Propel2\EntityPopulator) {
$entity = new \Faker\ORM\Propel2\EntityPopulator($entity);
Expand Down
8 changes: 4 additions & 4 deletions src/Faker/ORM/Spot/EntityPopulator.php
Expand Up @@ -60,7 +60,7 @@ public function getMapper()
return $this->mapper;
}

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

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

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

public function mergeModifiersWith(array $modifiers): void
public function mergeModifiersWith(array $modifiers)
{
$this->modifiers = array_merge($this->modifiers, $modifiers);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Faker/ORM/Spot/Populator.php
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
Expand Up @@ -356,7 +356,7 @@ private static function setTimezone(\DateTime $dt, $timezone)
*
* @param string $timezone
*/
public static function setDefaultTimezone($timezone = null): void
public static function setDefaultTimezone($timezone = null)
{
static::$defaultTimezone = $timezone;
}
Expand Down