Skip to content

Commit 85dbe48

Browse files
author
mmeissonnier
committed
fix doctype, remove now useless addJoinObject from modelCriteria
1 parent 0e48855 commit 85dbe48

File tree

2 files changed

+2
-25
lines changed

2 files changed

+2
-25
lines changed

src/Propel/Runtime/ActiveQuery/Criteria.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1184,9 +1184,9 @@ public function addMultipleJoin(array $conditions, ?string $joinType = null)
11841184
* Add a join object to the Criteria
11851185
*
11861186
* @param \Propel\Runtime\ActiveQuery\Join $join A join object
1187-
* @param string $join A name for the join
1187+
* @param string|null $name
11881188
*
1189-
* @return $this A modified Criteria object
1189+
* @return $this The current object, for fluid interface
11901190
*/
11911191
public function addJoinObject(Join $join, ?string $name = null)
11921192
{

src/Propel/Runtime/ActiveQuery/ModelCriteria.php

-23
Original file line numberDiff line numberDiff line change
@@ -725,29 +725,6 @@ public function setJoinCondition(string $name, $condition)
725725
return $this;
726726
}
727727

728-
/**
729-
* Add a join object to the Criteria
730-
*
731-
* @see Criteria::addJoinObject()
732-
*
733-
* @param \Propel\Runtime\ActiveQuery\Join $join A join object
734-
* @param string|null $name
735-
*
736-
* @return $this The current object, for fluid interface
737-
*/
738-
public function addJoinObject(Join $join, ?string $name = null)
739-
{
740-
if (!in_array($join, $this->joins)) { // compare equality, NOT identity
741-
if ($name === null) {
742-
$this->joins[] = $join;
743-
} else {
744-
$this->joins[$name] = $join;
745-
}
746-
}
747-
748-
return $this;
749-
}
750-
751728
/**
752729
* Adds a JOIN clause to the query and hydrates the related objects
753730
* Shortcut for $c->join()->with()

0 commit comments

Comments
 (0)