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

Aggregate multiple columns behavior & parameter list support #1702

Merged
merged 6 commits into from
Mar 4, 2021
Merged

Aggregate multiple columns behavior & parameter list support #1702

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f33f2d2
added parameter-list tag to schema parser and aggregate multiple colu…
mringler Feb 25, 2021
c1a0d89
requested changes
mringler Mar 4, 2021
1839a7b
Merge branch 'master' into aggregate_multiple_columns_behavior
mringler Mar 4, 2021
1b20609
linter fixes
mringler Mar 4, 2021
347ef90
linted test
mringler Mar 4, 2021
f076d50
added return types to test
mringler Mar 4, 2021
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
Prev Previous commit
Next Next commit
linter fixes
  • Loading branch information
@mringler
mringler committed Mar 4, 2021
commit 1b206097e98aa6efe7f43ce05ac9b5b190883dfb
4 changes: 2 additions & 2 deletions src/Propel/Generator/Behavior/AggregateMultipleColumns/AggregateMultipleColumnsBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
use Propel\Generator\Behavior\AggregateColumn\AggregateColumnRelationBehavior;
use Propel\Generator\Builder\Om\ObjectBuilder;
use Propel\Generator\Model\Behavior;
use Propel\Generator\Model\Table;
use Propel\Generator\Model\ForeignKey;
use Propel\Generator\Model\Table;

/**
* Keeps an aggregate column updated with related table
Expand Down Expand Up @@ -289,7 +289,7 @@ private function getForeignTableNameFullyQualified(): string
}

/**
* @return \Propel\Generator\Model\Table|null
* @return \Propel\Generator\Model\Table
*/
protected function getForeignTable(): Table
{
Expand Down