Skip to content

[AssetMapper] Add logical failure implementation #58275

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

Open
wants to merge 7 commits into
base: 7.4
Choose a base branch
from
Open

[AssetMapper] Add logical failure implementation #58275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
719ce09
feat: Added logical failure implementation
wotta Sep 16, 2024
f73ab5d
chore: Update CHANGELOG.md.
wotta Sep 16, 2024
9831757
feat: only catch the LogicException since that is thrown.
wotta Sep 16, 2024
6138710
feat: Updated global LogicException to local AssetMapper LogicException.
wotta Sep 17, 2024
1e18550
Added additional exceptions that need to be catched to resolve the ac…
wotta Sep 26, 2024
95c367c
fix(asset-mapper): handle exceptions in package download
wotta Sep 27, 2024
290de5d
fix(asset-mapper): Removed un-used use statements.
wotta Sep 27, 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
1 change: 1 addition & 0 deletions src/Symfony/Component/AssetMapper/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
7.2
---

* Add logical failure implementation.
* Shorten the public digest of mapped assets to 7 characters

7.1
Expand Down
31 changes: 20 additions & 11 deletions src/Symfony/Component/AssetMapper/Command/ImportMapInstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Component\AssetMapper\Command;

use Symfony\Component\AssetMapper\Exception\LogicException;
use Symfony\Component\AssetMapper\ImportMap\RemotePackageDownloader;
use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
Expand Down Expand Up @@ -42,18 +43,26 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$finishedCount = 0;
$progressBar = new ProgressBar($output);
$progressBar->setFormat('<info>%current%/%max%</info> %bar% %url%');
$downloadedPackages = $this->packageDownloader->downloadPackages(function (string $package, string $event, ResponseInterface $response, int $totalPackages) use (&$finishedCount, $progressBar) {
$progressBar->setMessage($response->getInfo('url'), 'url');
if (0 === $progressBar->getMaxSteps()) {
$progressBar->setMaxSteps($totalPackages);
$progressBar->start();
}

if ('finished' === $event) {
++$finishedCount;
$progressBar->advance();
}
});
try {
$downloadedPackages = $this->packageDownloader->downloadPackages(function (string $package, string $event, ResponseInterface $response, int $totalPackages) use (&$finishedCount, $progressBar) {
$progressBar->setMessage($response->getInfo('url'), 'url');
if (0 === $progressBar->getMaxSteps()) {
$progressBar->setMaxSteps($totalPackages);
$progressBar->start();
}

if ('finished' === $event) {
++$finishedCount;
$progressBar->advance();
}
});
} catch (LogicException $throwable) {
$io->error($throwable->getMessage());

return Command::FAILURE;
}

$progressBar->finish();
$progressBar->clear();

Expand Down
15 changes: 11 additions & 4 deletions src/Symfony/Component/AssetMapper/ImportMap/RemotePackageDownloader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,11 @@

namespace Symfony\Component\AssetMapper\ImportMap;

use Symfony\Component\AssetMapper\Exception\LogicException;
use Symfony\Component\AssetMapper\ImportMap\Resolver\PackageResolverInterface;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpClient\Exception\TimeoutException;
use Symfony\Component\HttpClient\Exception\TransportException;

/**
* @final
Expand Down Expand Up @@ -69,11 +72,15 @@ public function downloadPackages(?callable $progressCallback = null): array
return [];
}

$contents = $this->packageResolver->downloadPackages($remoteEntriesToDownload, $progressCallback);
try {
$contents = $this->packageResolver->downloadPackages($remoteEntriesToDownload, $progressCallback);
} catch (TimeoutException|TransportException $exception) {
throw new LogicException($exception->getMessage());
}
Comment on lines +75 to +79
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is a good idea, as it's hiding the real exception. Also, this is not a "Logic" exception.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I understand but how would y'all like to see this in that case. It's hard to guess what direction I need to go with this.

Again I'm new to the Symfony world and just want to fix this specific issue because it is breaking deployments. And while I want to fix it I do want to do it while communicating.

Let me know if you have any thoughts on how to improve things. Have a nice evening!

$downloadedPackages = [];
foreach ($remoteEntriesToDownload as $package => $entry) {
if (!isset($contents[$package])) {
throw new \LogicException(\sprintf('The package "%s" was not downloaded.', $package));
throw new LogicException(\sprintf('The package "%s" was not downloaded.', $package));
}

$this->remotePackageStorage->save($entry, $contents[$package]['content']);
Expand All @@ -92,7 +99,7 @@ public function downloadPackages(?callable $progressCallback = null): array
}

if ($contents) {
throw new \LogicException(\sprintf('The following packages were unexpectedly downloaded: "%s".', implode('", "', array_keys($contents))));
throw new LogicException(\sprintf('The following packages were unexpectedly downloaded: "%s".', implode('", "', array_keys($contents))));
}

$this->saveInstalled($newInstalled);
Expand Down Expand Up @@ -136,7 +143,7 @@ private function loadInstalled(): array
}

if (!isset($data['dependencies'])) {
throw new \LogicException(\sprintf('The package "%s" is missing its dependencies.', $package));
throw new LogicException(\sprintf('The package "%s" is missing its dependencies.', $package));
}

if (!isset($data['extraFiles'])) {
Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy