Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
renovate[bot] 2023-12-18 19:02:03 +01:00 committed by GitHub
parent 651bb9261c
commit 1820970ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/application/controllers/PlaylistController.php
View File

@ -253,7 +253,7 @@ class PlaylistController extends Zend_Controller_Action
Logging::info("Currently active {$type} {$obj_sess->id}");
if (in_array($obj_sess->id, $ids)) {
Logging::info("Deleting currently active {$type}");
// Application_Model_Library::changePlaylist(null, $type);
// Application_Model_Library::changePlaylist(null, $type);
} else {
Logging::info("Not deleting currently active {$type}");
$obj = new $objInfo['className']($obj_sess->id);
@ -562,7 +562,7 @@ class PlaylistController extends Zend_Controller_Action
$bl->saveSmartBlockCriteria($params['data']);
$this->createUpdateResponse($bl, true);
$this->view->result = 0;
// $result['html'] = $this->createFullResponse($bl, true, true);
// $result['html'] = $this->createFullResponse($bl, true, true);
} else {
$this->view->form = $form;
$this->view->unsavedName = $params['name'];
@ -601,7 +601,7 @@ class PlaylistController extends Zend_Controller_Action
$result = $bl->generateSmartBlock($params['data']);
$this->view->result = $result['result'];
$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 {
$this->view->obj = $bl;
$this->view->id = $bl->getId();

2
legacy/application/controllers/PreferenceController.php
View File

@ -69,7 +69,7 @@ class PreferenceController extends Zend_Controller_Action
$this->view->statusMsg = "<div class='success'>" . _('Preferences updated.') . '</div>';
$form = new Application_Form_Preferences();
$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 {
$this->view->form = $form;
// $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml')));

12
legacy/application/models/Block.php
View File

@ -1652,12 +1652,12 @@ SQL;
if (isset($criteria['extra'])) {
$spCriteriaExtra = $criteria['extra'] * 1000;
}
/*
* If user is searching for an exact match of length we need to
* 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
* in the database)
*/
/*
* If user is searching for an exact match of length we need to
* 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
* in the database)
*/
} elseif (in_array($spCriteria, ['length', 'cuein', 'cueout']) && $spCriteriaModifier == 'is') {
$spCriteriaModifier = 'starts with';
$spCriteria .= '::text';

10
legacy/application/services/ShowService.php
View File

@ -595,7 +595,7 @@ SQL;
$this->deleteAllInstances($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) {
// repeat type is the same, check if the days of the week are the same
$repeatingDaysChanged = false;
@ -881,10 +881,10 @@ SQL;
CcShowQuery::create()
->filterByDbId($showId)
->delete();
// 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
// Instance and All Following'. We only need to set the last_show value
// when 'Delete This Instance and All Following' has been selected
// 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
// Instance and All Following'. We only need to set the last_show value
// when 'Delete This Instance and All Following' has been selected
} elseif (count($ccShowInstances) > 1) {
$this->setLastRepeatingShowDate($showId);
}

2
legacy/tools/composer.json
View File

@ -1,6 +1,6 @@
{
"require": {
"php": "^7.4",
"friendsofphp/php-cs-fixer": "<3.35.2"
"friendsofphp/php-cs-fixer": "<3.41.2"
}
}