"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/Database/Expression/QueryExpression.php" between
cakephp-4.2.2.tar.gz and cakephp-4.2.3.tar.gz

About: CakePHP is a rapid development framework for PHP applications. Source code.

QueryExpression.php  (cakephp-4.2.2):QueryExpression.php  (cakephp-4.2.3)
skipping to change at line 446 skipping to change at line 446
*/ */
public function or($conditions, $types = []) public function or($conditions, $types = [])
{ {
if ($conditions instanceof Closure) { if ($conditions instanceof Closure) {
return $conditions(new static([], $this->getTypeMap()->setTypes($typ es), 'OR')); return $conditions(new static([], $this->getTypeMap()->setTypes($typ es), 'OR'));
} }
return new static($conditions, $this->getTypeMap()->setTypes($types), 'O R'); return new static($conditions, $this->getTypeMap()->setTypes($types), 'O R');
} }
// phpcs:disable // phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
/** /**
* Returns a new QueryExpression object containing all the conditions passed * Returns a new QueryExpression object containing all the conditions passed
* and set up the conjunction to be "AND" * and set up the conjunction to be "AND"
* *
* @param \Closure|string|array|\Cake\Database\ExpressionInterface $conditio ns to be joined with AND * @param \Closure|string|array|\Cake\Database\ExpressionInterface $conditio ns to be joined with AND
* @param array $types associative array of fields pointing to the type of t he * @param array $types associative array of fields pointing to the type of t he
* values that are being passed. Used for correctly binding values to statem ents. * values that are being passed. Used for correctly binding values to statem ents.
* @return \Cake\Database\Expression\QueryExpression * @return \Cake\Database\Expression\QueryExpression
* @deprecated 4.0.0 Use {@link and()} instead. * @deprecated 4.0.0 Use {@link and()} instead.
*/ */
public function and_($conditions, $types = []) public function and_($conditions, $types = [])
{ {
deprecationWarning('QueryExpression::and_() is deprecated use and() inst ead.'); deprecationWarning('QueryExpression::and_() is deprecated use and() inst ead.');
return $this->and($conditions, $types); return $this->and($conditions, $types);
} }
/** /**
* Returns a new QueryExpression object containing all the conditions passed * Returns a new QueryExpression object containing all the conditions passed
* and set up the conjunction to be "OR" * and set up the conjunction to be "OR"
* *
* @param \Closure|string|array|\Cake\Database\ExpressionInterface $conditio ns to be joined with OR * @param \Closure|string|array|\Cake\Database\ExpressionInterface $conditio ns to be joined with OR
* @param array $types associative array of fields pointing to the type of t he * @param array $types associative array of fields pointing to the type of t he
* values that are being passed. Used for correctly binding values to statem ents. * values that are being passed. Used for correctly binding values to statem ents.
* @return \Cake\Database\Expression\QueryExpression * @return \Cake\Database\Expression\QueryExpression
* @deprecated 4.0.0 Use {@link or()} instead. * @deprecated 4.0.0 Use {@link or()} instead.
*/ */
public function or_($conditions, $types = []) public function or_($conditions, $types = [])
{ {
deprecationWarning('QueryExpression::or_() is deprecated use or() instea d.'); deprecationWarning('QueryExpression::or_() is deprecated use or() instea d.');
return $this->or($conditions, $types); return $this->or($conditions, $types);
} }
// phpcs:enable
// phpcs:enable
/** /**
* Adds a new set of conditions to this level of the tree and negates * Adds a new set of conditions to this level of the tree and negates
* the final result by prepending a NOT, it will look like * the final result by prepending a NOT, it will look like
* "NOT ( (condition1) AND (conditions2) )" conjunction depends on the one * "NOT ( (condition1) AND (conditions2) )" conjunction depends on the one
* currently configured for this object. * currently configured for this object.
* *
* @param string|array|\Cake\Database\ExpressionInterface $conditions to be added and negated * @param string|array|\Cake\Database\ExpressionInterface $conditions to be added and negated
* @param array $types associative array of fields pointing to the type of t he * @param array $types associative array of fields pointing to the type of t he
* values that are being passed. Used for correctly binding values to statem ents. * values that are being passed. Used for correctly binding values to statem ents.
 End of changes. 4 change blocks. 
2 lines changed or deleted 6 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)