fix(deps): update dependency friendsofphp/php-cs-fixer to <3.41.2 (stable) (#2766)
* fix(deps): update dependency friendsofphp/php-cs-fixer to <3.41.2 * style: format files using php-cs-fixer --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: jo <ljonas@riseup.net>
This commit is contained in:
parent
651bb9261c
commit
1820970ce3
|
@ -253,7 +253,7 @@ class PlaylistController extends Zend_Controller_Action
|
||||||
Logging::info("Currently active {$type} {$obj_sess->id}");
|
Logging::info("Currently active {$type} {$obj_sess->id}");
|
||||||
if (in_array($obj_sess->id, $ids)) {
|
if (in_array($obj_sess->id, $ids)) {
|
||||||
Logging::info("Deleting currently active {$type}");
|
Logging::info("Deleting currently active {$type}");
|
||||||
// Application_Model_Library::changePlaylist(null, $type);
|
// Application_Model_Library::changePlaylist(null, $type);
|
||||||
} else {
|
} else {
|
||||||
Logging::info("Not deleting currently active {$type}");
|
Logging::info("Not deleting currently active {$type}");
|
||||||
$obj = new $objInfo['className']($obj_sess->id);
|
$obj = new $objInfo['className']($obj_sess->id);
|
||||||
|
@ -562,7 +562,7 @@ class PlaylistController extends Zend_Controller_Action
|
||||||
$bl->saveSmartBlockCriteria($params['data']);
|
$bl->saveSmartBlockCriteria($params['data']);
|
||||||
$this->createUpdateResponse($bl, true);
|
$this->createUpdateResponse($bl, true);
|
||||||
$this->view->result = 0;
|
$this->view->result = 0;
|
||||||
// $result['html'] = $this->createFullResponse($bl, true, true);
|
// $result['html'] = $this->createFullResponse($bl, true, true);
|
||||||
} else {
|
} else {
|
||||||
$this->view->form = $form;
|
$this->view->form = $form;
|
||||||
$this->view->unsavedName = $params['name'];
|
$this->view->unsavedName = $params['name'];
|
||||||
|
@ -601,7 +601,7 @@ class PlaylistController extends Zend_Controller_Action
|
||||||
$result = $bl->generateSmartBlock($params['data']);
|
$result = $bl->generateSmartBlock($params['data']);
|
||||||
$this->view->result = $result['result'];
|
$this->view->result = $result['result'];
|
||||||
$this->createUpdateResponse($bl, true);
|
$this->createUpdateResponse($bl, true);
|
||||||
// $this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true)));
|
// $this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true)));
|
||||||
} else {
|
} else {
|
||||||
$this->view->obj = $bl;
|
$this->view->obj = $bl;
|
||||||
$this->view->id = $bl->getId();
|
$this->view->id = $bl->getId();
|
||||||
|
|
|
@ -69,7 +69,7 @@ class PreferenceController extends Zend_Controller_Action
|
||||||
$this->view->statusMsg = "<div class='success'>" . _('Preferences updated.') . '</div>';
|
$this->view->statusMsg = "<div class='success'>" . _('Preferences updated.') . '</div>';
|
||||||
$form = new Application_Form_Preferences();
|
$form = new Application_Form_Preferences();
|
||||||
$this->view->form = $form;
|
$this->view->form = $form;
|
||||||
// $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml')));
|
// $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml')));
|
||||||
} else {
|
} else {
|
||||||
$this->view->form = $form;
|
$this->view->form = $form;
|
||||||
// $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml')));
|
// $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml')));
|
||||||
|
|
|
@ -1652,12 +1652,12 @@ SQL;
|
||||||
if (isset($criteria['extra'])) {
|
if (isset($criteria['extra'])) {
|
||||||
$spCriteriaExtra = $criteria['extra'] * 1000;
|
$spCriteriaExtra = $criteria['extra'] * 1000;
|
||||||
}
|
}
|
||||||
/*
|
/*
|
||||||
* If user is searching for an exact match of length we need to
|
* If user is searching for an exact match of length we need to
|
||||||
* search as if it starts with the specified length because the
|
* search as if it starts with the specified length because the
|
||||||
* user only sees the rounded version (i.e. 4:02.7 is 4:02.761625
|
* user only sees the rounded version (i.e. 4:02.7 is 4:02.761625
|
||||||
* in the database)
|
* in the database)
|
||||||
*/
|
*/
|
||||||
} elseif (in_array($spCriteria, ['length', 'cuein', 'cueout']) && $spCriteriaModifier == 'is') {
|
} elseif (in_array($spCriteria, ['length', 'cuein', 'cueout']) && $spCriteriaModifier == 'is') {
|
||||||
$spCriteriaModifier = 'starts with';
|
$spCriteriaModifier = 'starts with';
|
||||||
$spCriteria .= '::text';
|
$spCriteria .= '::text';
|
||||||
|
|
|
@ -595,7 +595,7 @@ SQL;
|
||||||
$this->deleteAllInstances($showId);
|
$this->deleteAllInstances($showId);
|
||||||
$this->deleteAllShowDays($showId);
|
$this->deleteAllShowDays($showId);
|
||||||
|
|
||||||
// when repeating by day of the month (1st, 2nd, etc.) we do not store the repeat week days
|
// when repeating by day of the month (1st, 2nd, etc.) we do not store the repeat week days
|
||||||
} elseif ($currentRepeatType != 2) {
|
} elseif ($currentRepeatType != 2) {
|
||||||
// repeat type is the same, check if the days of the week are the same
|
// repeat type is the same, check if the days of the week are the same
|
||||||
$repeatingDaysChanged = false;
|
$repeatingDaysChanged = false;
|
||||||
|
@ -881,10 +881,10 @@ SQL;
|
||||||
CcShowQuery::create()
|
CcShowQuery::create()
|
||||||
->filterByDbId($showId)
|
->filterByDbId($showId)
|
||||||
->delete();
|
->delete();
|
||||||
// There is only one cc_show_instance if the user selects 'Delete This Instance'
|
// There is only one cc_show_instance if the user selects 'Delete This Instance'
|
||||||
// There is more than one cc_show_instance if the user selects 'Delete This
|
// There is more than one cc_show_instance if the user selects 'Delete This
|
||||||
// Instance and All Following'. We only need to set the last_show value
|
// Instance and All Following'. We only need to set the last_show value
|
||||||
// when 'Delete This Instance and All Following' has been selected
|
// when 'Delete This Instance and All Following' has been selected
|
||||||
} elseif (count($ccShowInstances) > 1) {
|
} elseif (count($ccShowInstances) > 1) {
|
||||||
$this->setLastRepeatingShowDate($showId);
|
$this->setLastRepeatingShowDate($showId);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.4",
|
"php": "^7.4",
|
||||||
"friendsofphp/php-cs-fixer": "<3.35.2"
|
"friendsofphp/php-cs-fixer": "<3.41.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue