rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix code styles competing between PHPCS and PhpStorm.

This commit is contained in:
Buster "Silver Eagle" Neece 2020-12-07 01:19:28 -06:00
parent c8be1de3ee
commit 0b1393346d
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpcs.xml
View File

@ -7,7 +7,7 @@
<exclude-pattern>src/Tests/*$</exclude-pattern>
<arg name="basepath" value="."/>
<arg name="extensions" value="php" />
<arg name="extensions" value="php"/>
<arg name="colors"/>
<!-- relative path from PHPCS source location -->

64
src/Entity/Repository/StationMediaRepository.php
View File

@ -20,6 +20,7 @@ use InvalidArgumentException;
use League\Flysystem\FileNotFoundException;
use Psr\Log\LoggerInterface;
use Symfony\Component\Serializer\Serializer;
use const JSON_PRETTY_PRINT;
use const JSON_THROW_ON_ERROR;
use const JSON_UNESCAPED_SLASHES;
@ -74,10 +75,12 @@ class StationMediaRepository extends Repository
$storageLocation = $this->getStorageLocation($source);
/** @var Entity\StationMedia|null $media */
$media = $this->repository->findOneBy([
'storage_location' => $storageLocation,
'id' => $id,
]);
$media = $this->repository->findOneBy(
[
'storage_location' => $storageLocation,
'id' => $id,
]
);
return $media;
}
@ -92,10 +95,12 @@ class StationMediaRepository extends Repository
$storageLocation = $this->getStorageLocation($source);
/** @var Entity\StationMedia|null $media */
$media = $this->repository->findOneBy([
'storage_location' => $storageLocation,
'path' => $path,
]);
$media = $this->repository->findOneBy(
[
'storage_location' => $storageLocation,
'path' => $path,
]
);
return $media;
}
@ -110,10 +115,12 @@ class StationMediaRepository extends Repository
$storageLocation = $this->getStorageLocation($source);
/** @var Entity\StationMedia|null $media */
$media = $this->repository->findOneBy([
'storage_location' => $storageLocation,
'unique_id' => $uniqueId,
]);
$media = $this->repository->findOneBy(
[
'storage_location' => $storageLocation,
'unique_id' => $uniqueId,
]
);
return $media;
}
@ -204,9 +211,12 @@ class StationMediaRepository extends Repository
return false;
}
$fs->withLocalFile($mediaUri, function ($path) use ($media): void {
$this->loadFromFile($media, $path);
});
$fs->withLocalFile(
$mediaUri,
function ($path) use ($media): void {
$this->loadFromFile($media, $path);
}
);
}
$media->setMtime($mediaMtime);
@ -335,21 +345,27 @@ class StationMediaRepository extends Repository
}
// Write tags to the Media file.
return $fs->withLocalFile($media->getPath(), function ($path) use ($media, $metadata) {
if ($this->metadataManager->writeMetadata($metadata, $path)) {
$media->setMtime(time() + 5);
return true;
return $fs->withLocalFile(
$media->getPath(),
function ($path) use ($media, $metadata) {
if ($this->metadataManager->writeMetadata($metadata, $path)) {
$media->setMtime(time() + 5);
return true;
}
return false;
}
return false;
});
);
}
public function updateWaveform(Entity\StationMedia $media): void
{
$fs = $this->getFilesystem($media);
$fs->withLocalFile($media->getPath(), function ($path) use ($media): void {
$this->writeWaveform($media, $path);
});
$fs->withLocalFile(
$media->getPath(),
function ($path) use ($media): void {
$this->writeWaveform($media, $path);
}
);
}
public function writeWaveform(Entity\StationMedia $media, string $path): bool