Skip to content

issues/354 guaranteed call to restore_error_handler #355

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
GityaMan wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −25
Open

issues/354 guaranteed call to restore_error_handler #355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 29 additions & 25 deletions src/Convert/Converters/AbstractConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,36 +233,40 @@ private function doConvertImplementation()

$this->activateWarningLogger();

$this->checkOptions();
try {
$this->checkOptions();

// Prepare destination folder
$this->createWritableDestinationFolder();
$this->removeExistingDestinationIfExists();
// Prepare destination folder
$this->createWritableDestinationFolder();
$this->removeExistingDestinationIfExists();

if (!isset($this->options['_skip_input_check'])) {
// Check that a file can be written to destination
$this->checkDestinationWritable();
}
if (!isset($this->options['_skip_input_check'])) {
// Check that a file can be written to destination
$this->checkDestinationWritable();
}

$this->checkOperationality();
$this->checkConvertability();
$this->checkOperationality();
$this->checkConvertability();

if ($this->options['log-call-arguments']) {
$this->logOptions();
$this->logLn('');
}
if ($this->options['log-call-arguments']) {
$this->logOptions();
$this->logLn('');
}

$this->runActualConvert();
$this->runActualConvert();

$source = $this->source;
$destination = $this->destination;
$source = $this->source;
$destination = $this->destination;

if (!@file_exists($destination)) {
throw new ConversionFailedException('Destination file is not there: ' . $destination);
}

if (@filesize($destination) === 0) {
@unlink($destination);
throw new ConversionFailedException('Destination file was completely empty');
}

if (!@file_exists($destination)) {
throw new ConversionFailedException('Destination file is not there: ' . $destination);
} elseif (@filesize($destination) === 0) {
@unlink($destination);
throw new ConversionFailedException('Destination file was completely empty');
} else {
if (!isset($this->options['_suppress_success_message'])) {
$this->ln();
$this->log('Converted image in ' . round((microtime(true) - $beginTime) * 1000) . ' ms');
Expand All @@ -273,9 +277,9 @@ private function doConvertImplementation()
$this->logReduction($source, $destination);
}
}
} finally {
$this->deactivateWarningLogger();
}

$this->deactivateWarningLogger();
}

//private function logEx
Expand Down