FFFF
Skip to content

fix(deps): update dependency friendsofphp/php-cs-fixer to <3.46.1 (main) #2868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jooola merged 2 commits into from
Jan 7, 2024
Merged

fix(deps): update dependency friendsofphp/php-cs-fixer to <3.46.1 (main) #2868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3409d4
fix(deps): update dependency friendsofphp/php-cs-fixer to <3.46.1
renovate[bot] Jan 4, 2024
a1f2dc8
style: format files
jooola Jan 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion legacy/application/auth/adapters/FreeIpa.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function authenticate()
*/
public function getResultRowObject()
{
$o = new \stdClass();
$o = new stdClass();
$o->id = $this->user->getId();
$o->username = $this->user->getLogin();
$o->password = $this->user->getPassword();
Expand Down
3 changes: 2 additions & 1 deletion legacy/application/check.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php

use PhpAmqpLib\Connection\AMQPStreamConnection;
use PhpAmqpLib\Exception\AMQPRuntimeException;

function booleanReduce($a, $b)
Expand Down Expand Up @@ -118,7 +119,7 @@ function checkRMQConnection()
$config = Config::getConfig();

try {
$conn = new \PhpAmqpLib\Connection\AMQPStreamConnection(
$conn = new AMQPStreamConnection(
$config['rabbitmq']['host'],
$config['rabbitmq']['port'],
$config['rabbitmq']['user'],
Expand Down
4 changes: 2 additions & 2 deletions legacy/application/common/FileDataHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public static function getArtworkData($file, $size, $filepath = false)
public static function saveArtworkData($analyzeFile, $filename, $importDir = null, $DbPath = null)
{
if (class_exists('getID3')) {
$getID3 = new \getID3();
$getID3 = new getID3();
$getFileInfo = $getID3->analyze($analyzeFile);
} else {
$getFileInfo = [];
Expand Down Expand Up @@ -199,7 +199,7 @@ public static function resetArtwork($trackid)
$fullpath = $fp . $dbAudioPath;

if (class_exists('getID3')) {
$getID3 = new \getID3();
$getID3 = new getID3();
$getFileInfo = $getID3->analyze($fullpath);
} else {
$getFileInfo = [];
Expand Down
11 changes: 7 additions & 4 deletions legacy/application/models/RabbitMq.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?php

use PhpAmqpLib\Connection\AMQPStreamConnection;
use PhpAmqpLib\Message\AMQPMessage;

class Application_Model_RabbitMq
{
public static $doPush = false;
Expand All @@ -16,7 +19,7 @@ private static function sendMessage($exchange, $exchangeType, $autoDeleteExchang
{
$CC_CONFIG = Config::getConfig();

$conn = new \PhpAmqpLib\Connection\AMQPStreamConnection(
$conn = new AMQPStreamConnection(
$CC_CONFIG['rabbitmq']['host'],
$CC_CONFIG['rabbitmq']['port'],
$CC_CONFIG['rabbitmq']['user'],
Expand All @@ -41,7 +44,7 @@ private static function sendMessage($exchange, $exchangeType, $autoDeleteExchang
// the way it is just so I don't accidentally break anything when I add the Analyzer code in. -- Albert, March 13, 2014
$channel->exchange_declare($exchange, $exchangeType, false, true, $autoDeleteExchange);

$msg = new \PhpAmqpLib\Message\AMQPMessage($data, ['content_type' => 'text/plain']);
$msg = new AMQPMessage($data, ['content_type' => 'text/plain']);

$channel->basic_publish($msg, $exchange);
$channel->close();
Expand Down Expand Up @@ -97,7 +100,7 @@ public static function SendMessageToAnalyzer(
) {
$config = Config::getConfig();

$conn = new \PhpAmqpLib\Connection\AMQPStreamConnection(
$conn = new AMQPStreamConnection(
$config['rabbitmq']['host'],
$config['rabbitmq']['port'],
$config['rabbitmq']['user'],
Expand Down Expand Up @@ -144,7 +147,7 @@ public static function SendMessageToAnalyzer(
// the way it is just so I don't accidentally break anything when I add the Analyzer code in. -- Albert, March 13, 2014
$channel->exchange_declare($exchange, $exchangeType, false, true, $autoDeleteExchange);

$msg = new \PhpAmqpLib\Message\AMQPMessage($jsonData, ['content_type' => 'text/plain']);
$msg = new AMQPMessage($jsonData, ['content_type' => 'text/plain']);

$channel->basic_publish($msg, $exchange);
$channel->close();
Expand Down
6 changes: 2 additions & 4 deletions legacy/application/models/Scheduler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,10 +614,8 @@ public function removeGaps2($showInstance, $exclude = null)
/**
* Enter description here ...
*
* @param $scheduleItems
* cc_schedule items, where the items get inserted after
* @param $filesToInsert
* array of schedule item info, what gets inserted into cc_schedule
* @param $scheduleItems cc_schedule items, where the items get inserted after
* @param $filesToInsert array of schedule item info, what gets inserted into cc_schedule
* @param mixed $mediaItems
* @param mixed $moveAction
* @param mixed $adjustSched
Expand Down
2 changes: 1 addition & 1 deletion legacy/tools/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"php": "^7.4",
"friendsofphp/php-cs-fixer": "<3.45.1"
"friendsofphp/php-cs-fixer": "<3.46.1"
}
}
0