Skip to content

Commit

Permalink
Removed last errors
Browse files Browse the repository at this point in the history
  • Loading branch information
sreichel committed Aug 24, 2024
1 parent ce691c9 commit 9990cfe
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/phpcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ jobs:

- name: PHPCodeSniffer
run: php vendor/bin/phpcs -s --report=full --standard=${{ matrix.rules.path }}
continue-on-error: ${{ matrix.rules.path != '.phpcs.xml.dist' }}
continue-on-error: ${{ matrix.rules.path == '.phpcs.ecg.xml.dist' }}
3 changes: 2 additions & 1 deletion app/code/core/Mage/Catalog/Helper/Image.php
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,10 @@ public function constrainOnly($flag)
*/
public function backgroundColor($colorRGB)
{
$args = func_get_args();
// assume that 3 params were given instead of array
if (!is_array($colorRGB)) {
$colorRGB = func_get_args();
$colorRGB = $args;
}
$this->_getModel()->setBackgroundColor($colorRGB);
return $this;
Expand Down
2 changes: 1 addition & 1 deletion app/code/core/Mage/Core/Block/Abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,9 @@ public function unsetChild($alias)
*/
public function unsetCallChild($alias, $callback, $result, $params)
{
$args = func_get_args();
$child = $this->getChild($alias);
if ($child) {
$args = func_get_args();
$alias = array_shift($args);
$callback = array_shift($args);
$result = (string)array_shift($args);
Expand Down
3 changes: 2 additions & 1 deletion app/code/core/Mage/Core/Block/Template/Facade.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ public function setDataByKeyFromRegistry($key, $registryKey)
*/
public function ifEquals($conditionKeys)
{
$args = func_get_args();
if (!is_array($conditionKeys)) {
$conditionKeys = func_get_args();
$conditionKeys = $args;
}

// evaluate conditions (equality)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ class Mage_Oauth_Model_Consumer_Validator_KeyLength extends Zend_Validate_String
*/
public function __construct($options = [])
{
$args = func_get_args();
if (!is_array($options)) {
$options = func_get_args();
$options = $args;
if (!isset($options[1])) {
$options[1] = 'utf-8';
}
Expand Down

0 comments on commit 9990cfe

Please sign in to comment.