Skip to content

Commit

Permalink
Merge branch '1.7.x' into 1.8.x
Browse files Browse the repository at this point in the history
* 1.7.x:
  Bump Doctrine workflows (#460)
  Reference classes using current namespace in @see phpdoc
  • Loading branch information
derrabus committed Dec 16, 2023
2 parents a77f4d3 + a978451 commit c39f678
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-standards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ on:
jobs:
coding-standards:
name: "Coding Standards"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.1.0"
uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"
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@3.1.0"
uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@4.0.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:
name: "Static Analysis"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@3.1.0"
uses: "doctrine/.github/.github/workflows/static-analysis.yml@4.0.0"
8 changes: 4 additions & 4 deletions src/AbstractFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private function getReferenceRepository(): ReferenceRepository
* and referenced to managed $object. If $name
* already is set, it overrides it
*
* @see Doctrine\Common\DataFixtures\ReferenceRepository::setReference
* @see ReferenceRepository::setReference()
*
* @param object $object - managed object
*
Expand All @@ -60,7 +60,7 @@ public function setReference(string $name, object $object)
* already is set, it throws a
* BadMethodCallException exception
*
* @see Doctrine\Common\DataFixtures\ReferenceRepository::addReference
* @see ReferenceRepository::addReference()
*
* @param object $object - managed object
*
Expand All @@ -77,7 +77,7 @@ public function addReference(string $name, object $object)
* Loads an object using stored reference
* named by $name
*
* @see Doctrine\Common\DataFixtures\ReferenceRepository::getReference
* @see ReferenceRepository::getReference()
*
* @psalm-param class-string<T>|null $class
*
Expand All @@ -104,7 +104,7 @@ public function getReference(string $name, ?string $class = null)
* Check if an object is stored using reference
* named by $name
*
* @see Doctrine\Common\DataFixtures\ReferenceRepository::hasReference
* @see ReferenceRepository::hasReference()
*
* @psalm-param class-string|null $class
*
Expand Down
2 changes: 1 addition & 1 deletion src/Sorter/Vertex.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* @internal this class is to be used only by data-fixtures internals: do not
* rely on it in your own libraries/applications. This class is
* designed to work with {@see \Doctrine\Common\DataFixtures\Sorter\TopologicalSorter}
* designed to work with {@see TopologicalSorter}
* only.
*/
class Vertex
Expand Down

0 comments on commit c39f678

Please sign in to comment.