fix(deps): update dependency friendsofphp/php-cs-fixer to <3.23.1 (stable) (#2656)
* fix(deps): update dependency friendsofphp/php-cs-fixer to <3.23.1 * 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
a5cc52e9a9
commit
ab16cb47c5
|
@ -40,6 +40,7 @@ function checkPhpDependencies()
|
|||
function checkDatabaseDependencies()
|
||||
{
|
||||
global $extensions;
|
||||
|
||||
// Check the PHP extension list for the Postgres db extensions
|
||||
return in_array('pdo_pgsql', $extensions)
|
||||
&& in_array('pgsql', $extensions);
|
||||
|
|
|
@ -98,6 +98,7 @@ class CeleryManager
|
|||
|
||||
throw new CeleryTimeoutException('Celery task ' . $task->getDbName() . ' with ID ' . $task->getDbTaskId() . ' timed out');
|
||||
}
|
||||
|
||||
// The message hasn't timed out, but it's still false, which means it hasn't been
|
||||
// sent back from Celery yet.
|
||||
throw new CeleryException('Waiting on Celery task ' . $task->getDbName() . ' with ID ' . $task->getDbTaskId());
|
||||
|
|
|
@ -52,10 +52,9 @@ class Application_Common_HTTPHelper
|
|||
class ZendActionHttpException extends Exception
|
||||
{
|
||||
/**
|
||||
* @param int $statusCode
|
||||
* @param string $message
|
||||
* @param int $code
|
||||
* @param Exception $previous
|
||||
* @param int $statusCode
|
||||
* @param string $message
|
||||
* @param int $code
|
||||
*
|
||||
* @throws Zend_Controller_Response_Exception
|
||||
*/
|
||||
|
|
|
@ -116,9 +116,11 @@ class WebstreamController extends Zend_Controller_Action
|
|||
/*we are updating a playlist. Ensure that if the user is a
|
||||
host/dj, that he has the correct permission.*/
|
||||
$user = Application_Model_User::getCurrentUser();
|
||||
|
||||
// only allow when webstream belongs to the DJ
|
||||
return $webstream->getDbCreatorId() == $user->getId();
|
||||
}
|
||||
|
||||
/*we are creating a new stream. Don't need to check whether the
|
||||
DJ/Host owns the stream*/
|
||||
return true;
|
||||
|
|
|
@ -125,6 +125,7 @@ SQL;
|
|||
foreach ($data as $show_id) {
|
||||
$all_show_data = array_merge(self::getShowDataPointsWithinRange($p_start, $p_end, $show_id['show_id']), $all_show_data);
|
||||
}
|
||||
|
||||
/* option to sort by number of listeners currently commented out
|
||||
usort($all_show_data, function($a, $b) {
|
||||
return $a['average_number_of_listeners'] - $b['average_number_of_listeners'];
|
||||
|
|
|
@ -1209,6 +1209,7 @@ SQL;
|
|||
$row = intval($date->format('w')) % count($palette);
|
||||
$foo = $date->format('H');
|
||||
$col = intval(intval($date->format('H')) / 24.0 * count($palette[0]));
|
||||
|
||||
// $color = $palette[$hashValue % sizeof($palette)];
|
||||
return $palette[$row][$col];
|
||||
}
|
||||
|
|
|
@ -227,6 +227,7 @@ class Application_Model_User
|
|||
public function getOwnedFiles()
|
||||
{
|
||||
$user = $this->_userInstance;
|
||||
|
||||
// do we need a find call at the end here?
|
||||
return $user->getCcFilessRelatedByDbOwnerId();
|
||||
}
|
||||
|
|
|
@ -401,6 +401,7 @@ class Application_Service_ShowFormService
|
|||
Logging::error('Failed to read image: ' . $path);
|
||||
$imageData = null;
|
||||
}
|
||||
|
||||
// return the data URI - data:{mime};base64,{data}
|
||||
return ($imageData === null || $imageData === '') ?
|
||||
'' : 'data: ' . mime_content_type($path) . ';base64,' . $imageData;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"require": {
|
||||
"php": "^7.4",
|
||||
"friendsofphp/php-cs-fixer": "<3.22.1"
|
||||
"friendsofphp/php-cs-fixer": "<3.23.1"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue