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.27.1 (main) (#2714) 

* fix(deps): update dependency friendsofphp/php-cs-fixer to <3.27.1

* style: format legacy files

---------

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-09-17 17:14:59 +02:00 committed by GitHub
parent 4caf0b0ef2
commit 2f1a0a8efa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/application/common/OsPath.php
View File

@ -80,7 +80,7 @@ class Application_Common_OsPath
}
if ($dir[strlen($dir) - 1] != '/') {
$dir = $dir . '/';
$dir .= '/';
}
return $dir;

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

@ -248,7 +248,7 @@ class PreferenceController extends Zend_Controller_Action
$element['isError'] = true;
$result[$path] = $element;
} else {
$path = $path . '/';
$path .= '/';
$handle = opendir($path);
if ($handle !== false) {
while (false !== ($file = readdir($handle))) {

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

@ -349,7 +349,7 @@ SQL;
if ($mins > 59) {
$hour = intval($mins / 60);
$hour = str_pad($hour, 2, '0', STR_PAD_LEFT);
$mins = $mins % 60;
$mins %= 60;
}
}
$hour = str_pad($hour, 2, '0', STR_PAD_LEFT);
@ -499,10 +499,10 @@ SQL;
$db_file = CcFilesQuery::create()->findPk($ac[0], $this->con);
$db_file->setDbIsPlaylist(true)->save($this->con);
$pos = $pos + 1;
++$pos;
} elseif (!is_array($ac)) {
$res = $this->insertBlockElement($this->buildEntry($ac, $pos));
$pos = $pos + 1;
++$pos;
$db_file = CcFilesQuery::create()->findPk($ac, $this->con);
$db_file->setDbIsPlaylist(true)->save($this->con);
@ -516,7 +516,7 @@ SQL;
for ($i = 0; $i < count($contentsToUpdate); ++$i) {
$contentsToUpdate[$i]->setDbPosition($pos);
$contentsToUpdate[$i]->save($this->con);
$pos = $pos + 1;
++$pos;
}
$this->block->setDbMtime(new DateTime('now', new DateTimeZone('UTC')));
@ -565,13 +565,13 @@ SQL;
Logging::info("item {$item->getDbId()} to pos {$pos}");
$item->setDbPosition($pos);
$item->save($this->con);
$pos = $pos + 1;
++$pos;
}
foreach ($otherContent as $item) {
Logging::info("item {$item->getDbId()} to pos {$pos}");
$item->setDbPosition($pos);
$item->save($this->con);
$pos = $pos + 1;
++$pos;
}
} else {
Logging::info("moving items after {$p_afterItem}");
@ -580,14 +580,14 @@ SQL;
Logging::info("item {$item->getDbId()} to pos {$pos}");
$item->setDbPosition($pos);
$item->save($this->con);
$pos = $pos + 1;
++$pos;
if ($item->getDbId() == $p_afterItem) {
foreach ($contentsToMove as $move) {
Logging::info("item {$move->getDbId()} to pos {$pos}");
$move->setDbPosition($pos);
$move->save($this->con);
$pos = $pos + 1;
++$pos;
}
}
}
@ -1660,7 +1660,7 @@ SQL;
*/
} elseif (in_array($spCriteria, ['length', 'cuein', 'cueout']) && $spCriteriaModifier == 'is') {
$spCriteriaModifier = 'starts with';
$spCriteria = $spCriteria . '::text';
$spCriteria .= '::text';
$spCriteriaValue = $criteria['value'];
} else {
/* Propel does not escape special characters properly when using LIKE/ILIKE

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

@ -499,14 +499,14 @@ SQL;
$db_file->setDbIsPlaylist(true)->save($this->con);
}
$pos = $pos + 1;
++$pos;
}
// reset the positions of the remaining items.
for ($i = 0; $i < count($contentsToUpdate); ++$i) {
$contentsToUpdate[$i]->setDbPosition($pos);
$contentsToUpdate[$i]->save($this->con);
$pos = $pos + 1;
++$pos;
}
$this->pl->setDbMtime(new DateTime('now', new DateTimeZone('UTC')));
@ -553,13 +553,13 @@ SQL;
Logging::info("item {$item->getDbId()} to pos {$pos}");
$item->setDbPosition($pos);
$item->save($this->con);
$pos = $pos + 1;
++$pos;
}
foreach ($otherContent as $item) {
Logging::info("item {$item->getDbId()} to pos {$pos}");
$item->setDbPosition($pos);
$item->save($this->con);
$pos = $pos + 1;
++$pos;
}
} else {
Logging::info("moving items after {$p_afterItem}");
@ -568,14 +568,14 @@ SQL;
Logging::info("item {$item->getDbId()} to pos {$pos}");
$item->setDbPosition($pos);
$item->save($this->con);
$pos = $pos + 1;
++$pos;
if ($item->getDbId() == $p_afterItem) {
foreach ($contentsToMove as $move) {
Logging::info("item {$move->getDbId()} to pos {$pos}");
$move->setDbPosition($pos);
$move->save($this->con);
$pos = $pos + 1;
++$pos;
}
}
}

6
legacy/application/models/Schedule.php
View File

@ -514,7 +514,7 @@ SQL;
':sj_ts_5' => $p_track_start,
':sj_ts_6' => $p_track_end,
];
$paramMap = $paramMap + $map;
$paramMap += $map;
$streamSql = str_replace(
'%%columns%%',
@ -540,7 +540,7 @@ SQL;
}
$showPredicate = ' AND show_id IN (' . implode(',', $params) . ')';
$paramMap = $paramMap + $map;
$paramMap += $map;
} elseif (count($p_show_instances) > 0) {
$showPredicate = ' AND si.id IN (' . implode(',', $p_show_instances) . ')';
}
@ -584,7 +584,7 @@ SQL;
':ts_5' => $p_start_str,
':ts_6' => $p_end_str,
];
$paramMap = $paramMap + $map;
$paramMap += $map;
return Application_Common_Database::prepareAndExecute(
$sql,

2
legacy/application/models/Tracktype.php
View File

@ -130,7 +130,7 @@ class Application_Model_Tracktype
$sql .= ' AND code ILIKE :search';
$params[':search'] = "%{$search}%";
$sql = $sql . ' ORDER BY id';
$sql .= ' ORDER BY id';
return Application_Common_Database::prepareAndExecute($sql, $params, 'all');
}

2
legacy/application/models/User.php
View File

@ -311,7 +311,7 @@ class Application_Model_User
$sql .= ' AND login ILIKE :search';
$params[':search'] = "%{$search}%";
$sql = $sql . ' ORDER BY login';
$sql .= ' ORDER BY login';
return Application_Common_Database::prepareAndExecute($sql, $params, 'all');
}

2
legacy/application/models/Webstream.php
View File

@ -154,7 +154,7 @@ class Application_Model_Webstream implements Application_Model_LibraryEditable
// minutes cannot be over 59. Need to convert anything > 59 minutes into hours.
$hours += intval($minutes / 60);
$minutes = $minutes % 60;
$minutes %= 60;
$di = new DateInterval("PT{$hours}H{$minutes}M");

2
legacy/application/models/tests/populator.php
View File

@ -105,7 +105,7 @@ while ($showTime < $endDate) {
createTestShow($showNumber, $showTime);
$showTime->add(new DateInterval('PT1H'));
}
$showNumber = $showNumber + 1;
++$showNumber;
}
if (Application_Model_RabbitMq::$doPush) {

2
legacy/tools/composer.json
View File

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