Skip to content

Commit 7c66cd0

Browse files
authored
Merge pull request #88 from TomHAnderson/feature/actions
Refactored continuous-integration.yml action
2 parents d24652f + 9b6f182 commit 7c66cd0

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

.github/workflows/ci.yml renamed to .github/workflows/continuous-integration.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
name: CI
1+
name: "Continuous Integration"
22
on:
3-
schedule:
4-
- cron: '0 0 * * *'
5-
push:
63
pull_request:
4+
branches:
5+
- "*.x"
6+
- "main"
7+
push:
8+
branches:
9+
- "*.x"
10+
- "main"
711
jobs:
812
tests:
913
runs-on: 'ubuntu-latest'
1014
name: PHP ${{ matrix.php }} - Doctrine ${{ matrix.doctrine }}
1115
strategy:
1216
matrix:
13-
php: ['8.0', '8.1', '8.2', '8.3', '8.4']
14-
doctrine: ['2.11', '2.12', '2.13', '2.14']
17+
php: ['8.1', '8.2', '8.3', '8.4']
18+
doctrine: ['3.1', '3.2', '3.3', '3.4', '3.5']
1519
steps:
16-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v5
1721
- name: Setup PHP
1822
uses: shivammathur/setup-php@v2
1923
with:
2024
php-version: ${{ matrix.php }}
21-
ini-values: error_reporting=E_ALL
2225
tools: phpunit, git
2326

2427
- name: Install Composer dependencies

tests/Builders/BuilderTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,8 +751,9 @@ public function test_can_override_many_to_one_association()
751751
'target_id',
752752
$this->fluent->getClassMetadata()->getAssociationMapping('manyToOne')['joinColumns'][0]['name']
753753
);
754+
754755
$this->assertEquals('source_id', $this->fluent->getClassMetadata()
755-
->getAssociationMapping('manyToOne')['joinColumns'][0]['referencedColumnName']);
756+
->getAssociationMapping('manyToOne')['joinColumns'][0]->referencedColumnName);
756757
}
757758

758759
public function test_can_override_many_to_many_association()
@@ -770,7 +771,7 @@ public function test_can_override_many_to_many_association()
770771
$this->fluent->getClassMetadata()->getAssociationMapping('manyToMany')['joinTable']['name']
771772
);
772773
$this->assertEquals('source_id', $this->fluent->getClassMetadata()
773-
->getAssociationMapping('manyToMany')['joinTable']['joinColumns'][0]['name']);
774+
->getAssociationMapping('manyToMany')['joinTable']['joinColumns'][0]['name']);
774775
}
775776

776777
public function test_can_guess_a_one_to_one_relation_name()

tests/Builders/Overrides/AssociationOverrideTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ public function test_defaults_will_be_remembered_for_many_to_many()
124124

125125
public function test_can_change_source_on_many_to_one()
126126
{
127-
$this->assertEquals('id', $this->builder->getClassMetadata()->getAssociationMapping('manyToOne')['joinColumns'][0]['referencedColumnName']);
127+
$this->assertEquals('id', $this->builder->getClassMetadata()->getAssociationMapping('manyToOne')['joinColumns'][0]->referencedColumnName);
128128

129129
$override = $this->override('manyToOne', function (ManyToOne $relation) {
130130
return $relation->source('local_key');
131131
});
132132

133133
$override->build();
134134

135-
$this->assertEquals('local_key', $this->builder->getClassMetadata()->getAssociationMapping('manyToOne')['joinColumns'][0]['referencedColumnName']);
135+
$this->assertEquals('local_key', $this->builder->getClassMetadata()->getAssociationMapping('manyToOne')['joinColumns'][0]->referencedColumnName);
136136
}
137137

138138
public function test_can_change_target_on_many_to_one()

0 commit comments

Comments
 (0)