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.

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

Doc block fixes #7412

Merged
merged 2 commits into from
May 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions app/bundles/CampaignBundle/Event/CampaignExecutionEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ public function wasLogUpdatedByListener()
}

/**
* @param $channel
* @param null $channelId
* @param string $channel
* @param string|int|null $channelId
*
* @return $this
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,9 +312,9 @@ public function addIpAddress($nullable = false)
/**
* Add a nullable field.
*
* @param $name
* @param string $type
* @param null $columnName
* @param string $name
* @param string $type
* @param string|null $columnName
*
* @return $this
*/
Expand Down
6 changes: 3 additions & 3 deletions app/bundles/CoreBundle/Event/CustomButtonEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ public function addButtons(array $buttons, $location = null, $route = null)
/**
* Add a single button.
*
* @param array $button
* @param null $location
* @param null $route
* @param array $button
* @param string|null $location
* @param string|null $route
*
* @return $this
*/
Expand Down
10 changes: 5 additions & 5 deletions app/bundles/CoreBundle/Model/AuditLogModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public function writeToLog(array $args)
/**
* Get the audit log for specific object.
*
* @param $object
* @param $id
* @param null $afterDate
* @param int $limit
* @param null $bundle
* @param string $object
* @param string|int $id
* @param \DateTimeInterface|null $afterDate
* @param int $limit
* @param string|null $bundle
*
* @return mixed
*/
Expand Down
23 changes: 12 additions & 11 deletions app/bundles/LeadBundle/Controller/EntityContactsTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@
trait EntityContactsTrait
{
/**
* @param $entityId
* @param $page
* @param $permission
* @param $sessionVar
* @param $entityJoinTable Table to join to obtain list of related contacts or a DBAL QueryBuilder object defining custom joins
* @param null $dncChannel Channel for this entity to get do not contact records for
* @param null $entityIdColumnName If the entity ID in $joinTable is not "id", set the column name here
* @param array $contactFilter Array of additional filters for the getEntityContactsWithFields() function
* @param array $additionalJoins [ ['type' => 'join|leftJoin', 'from_alias' => '', 'table' => '', 'condition' => ''], ... ]
* @param string $contactColumnName Column of the contact in the join table
* @param string $paginationTarget DOM seletor for injecting new content when pagination is used
* @param string|int $entityId
* @param int $page
* @param string $permission
* @param string $sessionVar
* @param string $entityJoinTable Table to join to obtain list of related contacts or a DBAL QueryBuilder object defining custom joins
* @param string|null $dncChannel Channel for this entity to get do not contact records for
* @param string|null $entityIdColumnName If the entity ID in $joinTable is not "id", set the column name here
* @param array|null $contactFilter Array of additional filters for the getEntityContactsWithFields() function
* @param array|null $additionalJoins [ ['type' => 'join|leftJoin', 'from_alias' => '', 'table' => '', 'condition' => ''], ... ]
* @param string|null $contactColumnName Column of the contact in the join table
* @param array|null $routeParameters
* @param string|null $paginationTarget DOM seletor for injecting new content when pagination is used
*
* @return mixed
*/
Expand Down