Skip to content

Commit

Permalink
Add version to deprecations
Browse files Browse the repository at this point in the history
  • Loading branch information
dereuromark committed Nov 2, 2016
1 parent 21cddeb commit 50aef1c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions src/ORM/Association.php
Expand Up @@ -262,7 +262,7 @@ public function getName()
/**
* Sets the name for this association.
*
* @deprecated Use setName()/getName() instead.
* @deprecated 3.4.0 Use setName()/getName() instead.
* @param string|null $name Name to be assigned
* @return string
*/
Expand Down Expand Up @@ -302,7 +302,7 @@ public function getCascadeCallbacks()
* Sets whether or not cascaded deletes should also fire callbacks. If no
* arguments are passed, the current configured value is returned
*
* @deprecated Use setCascadeCallbacks()/getCascadeCallbacks() instead.
* @deprecated 3.4.0 Use setCascadeCallbacks()/getCascadeCallbacks() instead.
* @param bool|null $cascadeCallbacks cascade callbacks switch value
* @return bool
*/
Expand Down Expand Up @@ -352,7 +352,7 @@ public function getSource()
* Sets the table instance for the source side of the association. If no arguments
* are passed, the current configured table instance is returned
*
* @deprecated Use setSource()/getSource() instead.
* @deprecated 3.4.0 Use setSource()/getSource() instead.
* @param \Cake\ORM\Table|null $table the instance to be assigned as source side
* @return \Cake\ORM\Table
*/
Expand Down Expand Up @@ -409,7 +409,7 @@ public function getTarget()
* Sets the table instance for the target side of the association. If no arguments
* are passed, the current configured table instance is returned
*
* @deprecated Use setTable()/getTable() instead.
* @deprecated 3.4.0 Use setTable()/getTable() instead.
* @param \Cake\ORM\Table|null $table the instance to be assigned as target side
* @return \Cake\ORM\Table
*/
Expand Down Expand Up @@ -453,7 +453,7 @@ public function getConditions()
* Sets a list of conditions to be always included when fetching records from
* the target association. If no parameters are passed the current list is returned
*
* @deprecated Use setConditions()/getConditions() instead.
* @deprecated 3.4.0 Use setConditions()/getConditions() instead.
* @param array|null $conditions list of conditions to be used
* @see \Cake\Database\Query::where() for examples on the format of the array
* @return array
Expand Down Expand Up @@ -504,7 +504,7 @@ public function getBindingKey()
*
* If no parameters are passed the current field is returned
*
* @deprecated Use setBindingKey()/getBindingKey() instead.
* @deprecated 3.4.0 Use setBindingKey()/getBindingKey() instead.
* @param string|null $key the table field to be used to link both tables together
* @return string|array
*/
Expand Down Expand Up @@ -544,7 +544,7 @@ public function setForeignKey($key)
* Sets the name of the field representing the foreign key to the target table.
* If no parameters are passed the current field is returned
*
* @deprecated Use setForeignKey()/getForeignKey() instead.
* @deprecated 3.4.0 Use setForeignKey()/getForeignKey() instead.
* @param string|null $key the key to be used to link both tables together
* @return string|array
*/
Expand Down Expand Up @@ -596,7 +596,7 @@ public function getDependent()
*
* If no parameters are passed the current setting is returned.
*
* @deprecated Use setDependent()/getDependent() instead.
* @deprecated 3.4.0 Use setDependent()/getDependent() instead.
* @param bool|null $dependent Set the dependent mode. Use null to read the current state.
* @return bool
*/
Expand Down Expand Up @@ -649,7 +649,7 @@ public function getJoinType()
* Sets the type of join to be used when adding the association to a query.
* If no arguments are passed, the currently configured type is returned.
*
* @deprecated Use setJoinType()/getJoinType() instead.
* @deprecated 3.4.0 Use setJoinType()/getJoinType() instead.
* @param string|null $type the join type to be used (e.g. INNER)
* @return string
*/
Expand Down Expand Up @@ -704,7 +704,7 @@ public function getProperty()
* in the source table record.
* If no arguments are passed, the currently configured type is returned.
*
* @deprecated Use setProperty()/getProperty() instead.
* @deprecated 3.4.0 Use setProperty()/getProperty() instead.
* @param string|null $name The name of the association property. Use null to read the current value.
* @return string
*/
Expand Down Expand Up @@ -768,7 +768,7 @@ public function getStrategy()
* rendering any changes to this setting void.
* If no arguments are passed, the currently configured strategy is returned.
*
* @deprecated Use setStrategy()/getStrategy() instead.
* @deprecated 3.4.0 Use setStrategy()/getStrategy() instead.
* @param string|null $name The strategy type. Use null to read the current value.
* @return string
* @throws \InvalidArgumentException When an invalid strategy is provided.
Expand Down Expand Up @@ -810,7 +810,7 @@ public function setFinder($finder)
* If no parameters are passed, it will return the currently configured
* finder name.
*
* @deprecated Use setFinder()/getFinder() instead.
* @deprecated 3.4.0 Use setFinder()/getFinder() instead.
* @param string|null $finder the finder name to use
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Association/BelongsTo.php
Expand Up @@ -59,7 +59,7 @@ public function getForeignKey()
* Sets the name of the field representing the foreign key to the target table.
* If no parameters are passed current field is returned
*
* @deprecated Use setForeignKey()/getForeignKey() instead.
* @deprecated 3.4.0 Use setForeignKey()/getForeignKey() instead.
* @param string|null $key the key to be used to link both tables together
* @return string
*/
Expand Down
6 changes: 3 additions & 3 deletions src/ORM/Association/BelongsToMany.php
Expand Up @@ -187,7 +187,7 @@ public function getTargetForeignKey()
* Sets the name of the field representing the foreign key to the target table.
* If no parameters are passed current field is returned
*
* @deprecated Use setTargetForeignKey()/getTargetForeignKey() instead.
* @deprecated 3.4.0 Use setTargetForeignKey()/getTargetForeignKey() instead.
* @param string|null $key the key to be used to link both tables together
* @return string
*/
Expand Down Expand Up @@ -647,7 +647,7 @@ public function getSaveStrategy()
* Sets the strategy that should be used for saving. If called with no
* arguments, it will return the currently configured strategy
*
* @deprecated Use setSaveStrategy()/getSaveStrategy() instead.
* @deprecated 3.4.0 Use setSaveStrategy()/getSaveStrategy() instead.
* @param string|null $strategy the strategy name to be used
* @throws \InvalidArgumentException if an invalid strategy name is passed
* @return string the strategy to be used for saving
Expand Down Expand Up @@ -970,7 +970,7 @@ public function setConditions($conditions)

/**
* {@inheritDoc}
* @deprecated Use setConditions()/getConditions() instead.
* @deprecated 3.4.0 Use setConditions()/getConditions() instead.
*/
public function conditions($conditions = null)
{
Expand Down
6 changes: 3 additions & 3 deletions src/ORM/Association/HasMany.php
Expand Up @@ -134,7 +134,7 @@ public function getSaveStrategy()
* Sets the strategy that should be used for saving. If called with no
* arguments, it will return the currently configured strategy
*
* @deprecated Use setSaveStrategy()/getSaveStrategy() instead.
* @deprecated 3.4.0 Use setSaveStrategy()/getSaveStrategy() instead.
* @param string|null $strategy the strategy name to be used
* @throws \InvalidArgumentException if an invalid strategy name is passed
* @return string the strategy to be used for saving
Expand Down Expand Up @@ -565,7 +565,7 @@ public function getForeignKey()
* Sets the name of the field representing the foreign key to the source table.
* If no parameters are passed current field is returned
*
* @deprecated Use setForeignKey()/getForeignKey() instead.
* @deprecated 3.4.0 Use setForeignKey()/getForeignKey() instead.
* @param string|null $key the key to be used to link both tables together
* @return string
*/
Expand Down Expand Up @@ -605,7 +605,7 @@ public function getSort()
* Sets the sort order in which target records should be returned.
* If no arguments are passed the currently configured value is returned
*
* @deprecated Use setSort()/getSort() instead.
* @deprecated 3.4.0 Use setSort()/getSort() instead.
* @param mixed $sort A find() compatible order clause
* @return mixed
*/
Expand Down
2 changes: 1 addition & 1 deletion src/ORM/Association/HasOne.php
Expand Up @@ -59,7 +59,7 @@ public function getForeignKey()
* Sets the name of the field representing the foreign key to the target table.
* If no parameters are passed current field is returned
*
* @deprecated Use setForeignKey()/getForeignKey() instead.
* @deprecated 3.4.0 Use setForeignKey()/getForeignKey() instead.
* @param string|null $key the key to be used to link both tables together
* @return string
*/
Expand Down

0 comments on commit 50aef1c

Please sign in to comment.