Skip to content

Commit 936a6e0

Browse files
committedJan 7, 2021
Show phpcs sniff with each error
1 parent 46f3629 commit 936a6e0

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed
 

‎phpcs.xml

+2
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<config name="installed_paths" value="../../cakephp/cakephp-codesniffer" />
44

55
<rule ref="CakePHP" />
6+
7+
<arg value="s"/>
68
</ruleset>

‎src/Database/Expression/QueryExpression.php

+6-2
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,8 @@ public function or($conditions, $types = [])
443443
return new static($conditions, $this->getTypeMap()->setTypes($types), 'OR');
444444
}
445445

446-
// phpcs:disable
446+
// phpcs:disable PSR1.Methods.CamelCapsMethodName.NotCamelCaps
447+
447448
/**
448449
* Returns a new QueryExpression object containing all the conditions passed
449450
* and set up the conjunction to be "AND"
@@ -457,6 +458,7 @@ public function or($conditions, $types = [])
457458
public function and_($conditions, $types = [])
458459
{
459460
deprecationWarning('QueryExpression::and_() is deprecated use and() instead.');
461+
460462
return $this->and($conditions, $types);
461463
}
462464

@@ -473,9 +475,11 @@ public function and_($conditions, $types = [])
473475
public function or_($conditions, $types = [])
474476
{
475477
deprecationWarning('QueryExpression::or_() is deprecated use or() instead.');
478+
476479
return $this->or($conditions, $types);
477480
}
478-
// phpcs:enable
481+
482+
// phpcs:enable
479483

480484
/**
481485
* Adds a new set of conditions to this level of the tree and negates

0 commit comments

Comments
 (0)
Please sign in to comment.