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.

Sign up for GitHub

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

Jump to bottom

Add psalm.xml to .gitattributes #484

Merged
merged 2 commits into from
Jul 29, 2023
Merged

Add psalm.xml to .gitattributes #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
523bc8e
Add psalm.xml to .gitattributes
VincentLanglet Jul 29, 2023
ae6170f
Address coding standard issues
greg0ire Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
/phpcs.xml.dist export-ignore
/phpstan.neon export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml export-ignore
4 changes: 3 additions & 1 deletion tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,9 @@ class TestImportWithConcreteAnnotation
class DummyClass2
{
/**
* @DummyId @DummyColumn(type="integer") @DummyGeneratedValue
* @DummyId
* @DummyColumn(type="integer")
* @DummyGeneratedValue
* @var int
*/
public $id;
Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/Common/Annotations/DummyClass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class DummyClass
public $field1;

/**
* @var mixed;
* @var mixed
* @DummyJoinTable(name="join_table",
* joinColumns={@DummyJoinColumn(name="col1", referencedColumnName="col2")},
* inverseJoinColumns={
Expand Down
3 changes: 2 additions & 1 deletion tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Doctrine\Common\Annotations\AnnotationReader;
use PHPUnit\Framework\TestCase;
use ReflectionClass;
use SimpleXMLElement;

/**
* @group
Expand Down Expand Up @@ -44,7 +45,7 @@ class DCOM141Annotation
}

/**
* @DCOM141Annotation(\SimpleXMLElement::class)
* @DCOM141Annotation(SimpleXMLElement::class)
*/
class DCOM141ConsumerPrefixed
{
Expand Down
Loading