Skip to content

Commit

Permalink
Merge pull request #461 from doctrine/3.6.x
Browse files Browse the repository at this point in the history
Merge 3.6.x up into 3.7.x
  • Loading branch information
greg0ire authored Nov 28, 2024
2 parents ac54062 + 4aa5e55 commit 3004c9b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.3.0"
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
path: "reports"

- name: "Upload to Codecov"
uses: "codecov/codecov-action@v4"
uses: "codecov/codecov-action@v5"
with:
directory: reports
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-milestone-closed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
release:
name: "Git tag, release & create merge-up PR"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.3.0"
secrets:
GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:

jobs:
static-analysis:
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.2.0"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.3.0"
20 changes: 10 additions & 10 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Create a fixtures class and start adding products::

class AppFixtures extends Fixture
{
public function load(ObjectManager $manager)
public function load(ObjectManager $manager): void
{
// create 20 products! Bam!
for ($i = 0; $i < 20; $i++) {
Expand Down Expand Up @@ -102,7 +102,7 @@ injection::
}

// ...
public function load(ObjectManager $manager)
public function load(ObjectManager $manager): void
{
$user = new User();
$user->setUsername('admin');
Expand Down Expand Up @@ -148,7 +148,7 @@ exact same object via its name.
{
public const ADMIN_USER_REFERENCE = 'admin-user';
public function load(ObjectManager $manager)
public function load(ObjectManager $manager): void
{
$userAdmin = new User('admin', 'pass_1234');
$manager->persist($userAdmin);
Expand All @@ -165,7 +165,7 @@ exact same object via its name.
// ...
class GroupFixtures extends Fixture
{
public function load(ObjectManager $manager)
public function load(ObjectManager $manager): void
{
$userGroup = new Group('administrators');
// this reference returns the User object created in UserFixtures
Expand Down Expand Up @@ -197,7 +197,7 @@ an array of the fixture classes that must be loaded before this one::
// ...
class UserFixtures extends Fixture
{
public function load(ObjectManager $manager)
public function load(ObjectManager $manager): void
{
// ...
}
Expand All @@ -211,12 +211,12 @@ an array of the fixture classes that must be loaded before this one::

class GroupFixtures extends Fixture implements DependentFixtureInterface
{
public function load(ObjectManager $manager)
public function load(ObjectManager $manager): void
{
// ...
}

public function getDependencies()
public function getDependencies(): array
{
return [
UserFixtures::class,
Expand Down Expand Up @@ -304,7 +304,7 @@ You can also customize purging behavior significantly more and implement a custo
// ...
class CustomPurger implements PurgerInterface
{
public function purge() : void
public function purge(): void
{
// ...
}
Expand Down Expand Up @@ -358,7 +358,7 @@ The next step is to register our custom purger factory and specify its alias.
use App\Purger\CustomerPurgerFactory;
return function(ContainerConfigurator $configurator) : void {
return function(ContainerConfigurator $configurator): void {
$services = $configurator->services();
$services->set(CustomerPurgerFactory::class)
Expand Down Expand Up @@ -412,7 +412,7 @@ Then, enable Dependency Injection for the ``fixtures`` directory:
// config/services.php
namespace Symfony\Component\DependencyInjection\Loader\Configurator;
return function(ContainerConfigurator $container) : void {
return function(ContainerConfigurator $container): void {
$services = $container->services()
->defaults()
->autowire()
Expand Down

0 comments on commit 3004c9b

Please sign in to comment.