Skip to content

Commit e950c78

Browse files
mringlermringler
authored
Merge pull request #125 from perplorm/develop
Remove develop branch
2 parents 6421f8f + 10581f6 commit e950c78

File tree

64 files changed

+1247
-1427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1247
-1427
lines changed

‎src/Propel/Common/Config/ConfigurationManager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public function getSection(string $section): ?array
130130
* is expressed by:
131131
* <code>'database.adapter.mysql.tableType</code>
132132
*
133-
* @psalm-return ($isRequired ? array|int|bool|string : array|scalar|null)
133+
* @psalm-return ($isRequired is true ? array|string|int|bool : array|string|int|bool|null)
134134
*
135135
* @param string $path The name of property, expressed as a dot separated level hierarchy
136136
* @param bool $isRequired
@@ -200,7 +200,7 @@ public function getConfigPropertyString(string $path, bool $isRequired = false):
200200
*/
201201
public function getConfigPropertyRequired(string $path): array|int|bool|string
202202
{
203-
return $this->getConfigProperty($path, true) ?? '';
203+
return $this->getConfigProperty($path, true);
204204
}
205205

206206
/**

‎src/Propel/Generator/Behavior/AggregateColumn/AggregateColumnRelationBehavior.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function postSave(AbstractOMBuilder $builder): string
6262
public function objectAttributes(AbstractOMBuilder $builder): string
6363
{
6464
$relationName = $this->getRelationName($builder);
65-
$relatedClass = $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($this->getForeignTable()));
65+
$relatedClass = $builder->getClassNameFromBuilder($builder->getStubObjectBuilder($this->getForeignTable()));
6666
$aggregateName = $this->getParameter('aggregate_name');
6767

6868
return "/**
@@ -112,7 +112,7 @@ public function objectFilter(string &$script, AbstractOMBuilder $builder): void
112112
$relationName = $this->getRelationName($builder);
113113
$varName = '$' . lcfirst($relationName);
114114
$aggregateName = $this->getParameter('aggregate_name');
115-
$relatedClass = $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($this->getForeignTable()));
115+
$relatedClass = $builder->getClassNameFromBuilder($builder->getStubObjectBuilder($this->getForeignTable()));
116116
$search = " public function set{$relationName}(?{$relatedClass} $varName = null)
117117
{";
118118
$replace = $search . "
@@ -205,7 +205,7 @@ public function queryAttributes(AbstractOMBuilder $builder): string
205205
$variableName = '$' . lcfirst($relationName . $this->getParameter('aggregate_name'));
206206

207207
$foreignKey = $this->getForeignKey();
208-
$aggregatedObjectCollectionBuilder = $builder->getNewObjectCollectionBuilder($foreignKey->getForeignTable());
208+
$aggregatedObjectCollectionBuilder = $builder->getObjectCollectionBuilder($foreignKey->getForeignTable());
209209
$aggregatedObjectCollectionClassName = $builder->declareClassFromBuilder($aggregatedObjectCollectionBuilder);
210210
$aggregatedObjectCollectionClassNameFq = '\\' . $aggregatedObjectCollectionBuilder->getQualifiedClassName();
211211

@@ -239,7 +239,7 @@ public function queryMethods(AbstractOMBuilder $builder): string
239239
protected function addQueryFindRelated(AbstractOMBuilder $builder): string
240240
{
241241
$foreignKey = $this->getForeignKey();
242-
$foreignQueryBuilder = $builder->getNewStubQueryBuilder($foreignKey->getForeignTable());
242+
$foreignQueryBuilder = $builder->getStubQueryBuilder($foreignKey->getForeignTable());
243243
$relationName = $this->getRelationName($builder);
244244
$foreignQueryName = $builder->declareClassFromBuilder($foreignQueryBuilder);
245245

‎src/Propel/Generator/Behavior/Archivable/ArchivableBehavior.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function getArchiveTablePhpName(AbstractOMBuilder $builder): string
128128
}
129129

130130
$archiveTable = $this->getSyncedTable();
131-
$tableStub = $builder->getNewStubObjectBuilder($archiveTable);
131+
$tableStub = $builder->getStubObjectBuilder($archiveTable);
132132

133133
return $builder->getClassNameFromBuilder($tableStub);
134134
}
@@ -144,7 +144,7 @@ public function getArchiveTableQueryName(AbstractOMBuilder $builder): string
144144
return $this->getParameter('archive_class') . 'Query';
145145
}
146146

147-
return $builder->getClassNameFromBuilder($builder->getNewStubQueryBuilder($this->getSyncedTable()));
147+
return $builder->getClassNameFromBuilder($builder->getStubQueryBuilder($this->getSyncedTable()));
148148
}
149149

150150
/**

‎src/Propel/Generator/Behavior/ConcreteInheritance/ConcreteInheritanceBehavior.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ public function parentClass($builder): ?string
201201
$parentTable = $this->getParentTable();
202202

203203
$parentBuilder = match (get_class($builder)) {
204-
'Propel\Generator\Builder\Om\ObjectBuilder' => $builder->getNewStubObjectBuilder($parentTable),
205-
'Propel\Generator\Builder\Om\QueryBuilder' => $builder->getNewStubQueryBuilder($parentTable),
204+
'Propel\Generator\Builder\Om\ObjectBuilder' => $builder->getStubObjectBuilder($parentTable),
205+
'Propel\Generator\Builder\Om\QueryBuilder' => $builder->getStubQueryBuilder($parentTable),
206206
default => null
207207
};
208208

@@ -307,7 +307,7 @@ protected function removeInheritedMethod(string $script, QueryBuilder $builder):
307307
protected function addSyncParentToChild(string &$script): void
308308
{
309309
$parentTable = $this->getParentTable();
310-
$parentClass = $this->builder->getClassNameFromBuilder($this->builder->getNewStubObjectBuilder($parentTable));
310+
$parentClass = $this->builder->getClassNameFromBuilder($this->builder->getStubObjectBuilder($parentTable));
311311

312312
$columns = $this->getCopyToChild();
313313
if ($columns === true) {
@@ -359,13 +359,13 @@ public function syncParentToChild($parentClass \$parent): void
359359
protected function addObjectGetParentOrCreate(string &$script): void
360360
{
361361
$parentTable = $this->getParentTable();
362-
$parentClass = $this->builder->getClassNameFromBuilder($this->builder->getNewStubObjectBuilder($parentTable));
362+
$parentClass = $this->builder->getClassNameFromBuilder($this->builder->getStubObjectBuilder($parentTable));
363363

364364
$descendantColumnName = $this->getParameter('descendant_column');
365365
$descendantColumnPhpName = $parentTable->getColumn($descendantColumnName)->getPhpName();
366366
$stubObjectClassNameFq = $this->builder->getStubObjectBuilder()->getQualifiedClassName();
367367
$setDescendantClassExpression = "set{$descendantColumnPhpName}('$stubObjectClassNameFq')";
368-
$parentTableStubQueryBuilder = $this->builder->getNewStubQueryBuilder($parentTable);
368+
$parentTableStubQueryBuilder = $this->builder->getStubQueryBuilder($parentTable);
369369
$parentTableStubQueryClassName = $this->builder->getClassNameFromBuilder($parentTableStubQueryBuilder);
370370

371371
$script .= "

‎src/Propel/Generator/Behavior/Delegate/DelegateBehavior.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ public function objectCall(ObjectBuilder $builder): string
162162
if ($type == self::ONE_TO_ONE) {
163163
$fks = $delegateTable->getForeignKeysReferencingTable($this->getTable()->getName());
164164
$fk = $fks[0];
165-
$ARClassName = $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($fk->getTable()));
166-
$ARFQCN = $builder->getNewStubObjectBuilder($fk->getTable())->getFullyQualifiedClassName();
165+
$ARClassName = $builder->getClassNameFromBuilder($builder->getStubObjectBuilder($fk->getTable()));
166+
$ARFQCN = $builder->getStubObjectBuilder($fk->getTable())->getFullyQualifiedClassName();
167167
$relationName = $builder->getRefFKPhpNameAffix($fk);
168168
} else {
169169
$fks = $this->getTable()->getForeignKeysReferencingTable($delegate);
170170
$fk = $fks[0];
171-
$ARClassName = $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($delegateTable));
172-
$ARFQCN = $builder->getNewStubObjectBuilder($delegateTable)->getFullyQualifiedClassName();
171+
$ARClassName = $builder->getClassNameFromBuilder($builder->getStubObjectBuilder($delegateTable));
172+
$ARFQCN = $builder->getStubObjectBuilder($delegateTable)->getFullyQualifiedClassName();
173173
$relationName = $builder->getFKPhpNameAffix($fk);
174174
}
175175
$script .= "

‎src/Propel/Generator/Behavior/I18n/I18nBehaviorObjectBuilderModifier.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ public function postDelete(ObjectBuilder $builder): ?string
5454
$i18nTable = $this->behavior->getI18nTable();
5555

5656
return $this->behavior->renderTemplate('objectPostDelete', [
57-
'i18nQueryName' => $builder->getClassNameFromBuilder($builder->getNewStubQueryBuilder($i18nTable)),
58-
'objectClassName' => $builder->getNewStubObjectBuilder($this->behavior->getTable())->getUnqualifiedClassName(),
57+
'i18nQueryName' => $builder->getClassNameFromBuilder($builder->getStubQueryBuilder($i18nTable)),
58+
'objectClassName' => $builder->getStubObjectBuilder($this->behavior->getTable())->getUnqualifiedClassName(),
5959
]);
6060
}
6161

@@ -71,7 +71,7 @@ public function objectAttributes(ObjectBuilder $builder): string
7171
{
7272
return $this->behavior->renderTemplate('objectAttributes', [
7373
'defaultLocale' => $this->behavior->getDefaultLocale(),
74-
'objectClassName' => $builder->getClassNameFromBuilder($builder->getNewStubObjectBuilder($this->behavior->getI18nTable())),
74+
'objectClassName' => $builder->getClassNameFromBuilder($builder->getStubObjectBuilder($this->behavior->getI18nTable())),
7575
]);
7676
}
7777

@@ -176,11 +176,11 @@ protected function addGetTranslation(): string
176176
$fk = $this->behavior->getI18nForeignKey();
177177

178178
return $this->behavior->renderTemplate('objectGetTranslation', [
179-
'i18nTablePhpName' => $this->builder->getClassNameFromBuilder($this->builder->getNewStubObjectBuilder($i18nTable)),
179+
'i18nTablePhpName' => $this->builder->getClassNameFromBuilder($this->builder->getStubObjectBuilder($i18nTable)),
180180
'defaultLocale' => $this->behavior->getDefaultLocale(),
181181
'i18nListVariable' => $this->builder->getRefFKCollVarName($fk),
182182
'localeColumnName' => $this->behavior->getLocaleColumn()->getPhpName(),
183-
'i18nQueryName' => $this->builder->getClassNameFromBuilder($this->builder->getNewStubQueryBuilder($i18nTable)),
183+
'i18nQueryName' => $this->builder->getClassNameFromBuilder($this->builder->getStubQueryBuilder($i18nTable)),
184184
'i18nSetterMethod' => $this->builder->getRefFKPhpNameAffix($fk),
185185
]);
186186
}
@@ -196,7 +196,7 @@ protected function addRemoveTranslation(): string
196196
return $this->behavior->renderTemplate('objectRemoveTranslation', [
197197
'objectClassName' => $this->builder->getClassNameFromBuilder($this->builder->getStubObjectBuilder()),
198198
'defaultLocale' => $this->behavior->getDefaultLocale(),
199-
'i18nQueryName' => $this->builder->getClassNameFromBuilder($this->builder->getNewStubQueryBuilder($i18nTable)),
199+
'i18nQueryName' => $this->builder->getClassNameFromBuilder($this->builder->getStubQueryBuilder($i18nTable)),
200200
'i18nCollection' => $this->builder->getRefFKCollVarName($fk),
201201
'localeColumnName' => $this->behavior->getLocaleColumn()->getPhpName(),
202202
]);
@@ -208,7 +208,7 @@ protected function addRemoveTranslation(): string
208208
protected function addGetCurrentTranslation(): string
209209
{
210210
return $this->behavior->renderTemplate('objectGetCurrentTranslation', [
211-
'i18nTablePhpName' => $this->builder->getClassNameFromBuilder($this->builder->getNewStubObjectBuilder($this->behavior->getI18nTable())),
211+
'i18nTablePhpName' => $this->builder->getClassNameFromBuilder($this->builder->getStubObjectBuilder($this->behavior->getI18nTable())),
212212
'localeColumnName' => $this->behavior->getLocaleColumn()->getPhpName(),
213213
]);
214214
}
@@ -222,7 +222,7 @@ protected function addGetCurrentTranslation(): string
222222
*/
223223
protected function addTranslatedColumnGetter(Column $column): string
224224
{
225-
$objectBuilder = $this->builder->getNewObjectBuilder($this->behavior->getI18nTable());
225+
$objectBuilder = $this->builder->getObjectBuilder($this->behavior->getI18nTable());
226226
$codeProducer = new ColumnCodeProducerAccessor($column, $objectBuilder);
227227
$comment = $codeProducer->getAccessorComment();
228228
[$functionStatement, $params] = $codeProducer->getAccessorFunctionStatement();
@@ -244,9 +244,9 @@ protected function addTranslatedColumnGetter(Column $column): string
244244
*/
245245
protected function addTranslatedColumnSetter(Column $column): string
246246
{
247-
$i18nTablePhpName = $this->builder->getClassNameFromBuilder($this->builder->getNewStubObjectBuilder($this->behavior->getI18nTable()));
247+
$i18nTablePhpName = $this->builder->getClassNameFromBuilder($this->builder->getStubObjectBuilder($this->behavior->getI18nTable()));
248248
$tablePhpName = $this->builder->getObjectClassName();
249-
$objectBuilder = $this->builder->getNewObjectBuilder($this->behavior->getI18nTable());
249+
$objectBuilder = $this->builder->getObjectBuilder($this->behavior->getI18nTable());
250250

251251
$codeProducer = new ColumnCodeProducerAccessor($column, $objectBuilder);
252252
$comment = $codeProducer->getMutatorComment($i18nTablePhpName, $tablePhpName);
@@ -269,7 +269,7 @@ protected function addTranslatedColumnSetter(Column $column): string
269269
public function objectFilter(string &$script, ObjectBuilder $builder): void
270270
{
271271
$i18nTable = $this->behavior->getI18nTable();
272-
$i18nTablePhpName = $this->builder->getNewStubObjectBuilder($i18nTable)->getUnprefixedClassName();
272+
$i18nTablePhpName = $this->builder->getStubObjectBuilder($i18nTable)->getUnprefixedClassName();
273273
$localeColumnName = $this->behavior->getLocaleColumn()->getPhpName();
274274
$pattern = '/public function add' . $i18nTablePhpName . '.*[\r\n]\s*\{/';
275275

‎src/Propel/Generator/Behavior/I18n/I18nBehaviorQueryBuilderModifier.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ protected function addUseI18nQuery(): string
8989
$fk = $this->behavior->getI18nForeignKey();
9090

9191
return $this->behavior->renderTemplate('queryUseI18nQuery', [
92-
'queryClass' => $this->builder->getClassNameFromBuilder($this->builder->getNewStubQueryBuilder($i18nTable)),
93-
'namespacedQueryClass' => $this->builder->getNewStubQueryBuilder($i18nTable)->getFullyQualifiedClassName(),
92+
'queryClass' => $this->builder->getClassNameFromBuilder($this->builder->getStubQueryBuilder($i18nTable)),
93+
'namespacedQueryClass' => $this->builder->getStubQueryBuilder($i18nTable)->getFullyQualifiedClassName(),
9494
'defaultLocale' => $this->behavior->getDefaultLocale(),
9595
'i18nRelationName' => $this->builder->getRefFKPhpNameAffix($fk),
9696
'localeColumn' => $this->behavior->getLocaleColumn()->getPhpName(),

‎src/Propel/Generator/Behavior/NestedSet/NestedSetBehaviorObjectBuilderModifier.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -857,10 +857,10 @@ protected function addNestedSetChildrenInit(string &$script): void
857857
*/
858858
public function initNestedSetChildren(): void
859859
{
860-
\$collectionClassName = " . $this->builder->getNewTableMapBuilder($this->table)->getFullyQualifiedClassName() . "::getTableMap()->getCollectionClassName();
860+
\$collectionClassName = " . $this->builder->getTableMapBuilder($this->table)->getFullyQualifiedClassName() . "::getTableMap()->getCollectionClassName();
861861
862862
\$this->collNestedSetChildren = new \$collectionClassName;
863-
\$this->collNestedSetChildren->setModel('" . $this->builder->getNewStubObjectBuilder($this->table)->getFullyQualifiedClassName() . "');
863+
\$this->collNestedSetChildren->setModel('" . $this->builder->getStubObjectBuilder($this->table)->getFullyQualifiedClassName() . "');
864864
}
865865
";
866866
}

‎src/Propel/Generator/Behavior/Util/InsertCodeBehavior.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ protected function buildStubBuilder($builder, Table $table): ?AbstractOMBuilder
255255
{
256256
switch (get_class($builder)) {
257257
case ObjectBuilder::class:
258-
return $builder->getNewStubObjectBuilder($table);
258+
return $builder->getStubObjectBuilder($table);
259259
case QueryBuilder::class:
260-
return $builder->getNewStubQueryBuilder($table);
260+
return $builder->getStubQueryBuilder($table);
261261
default:
262262
return null;
263263
}

0 commit comments

Comments
 (0)