// At this point, $error should contain the single "most important"
// error, plus any parameters.
$errorMsg = array_shift( $error );
- throw new UploadStashFileException( "Error storing file in '$path': "
- . wfMessage( $errorMsg, $error )->text() );
+ throw new UploadStashFileException( wfMessage( $errorMsg, $error ) );
}
$stashPath = $storeStatus->value;
}
}
-class UploadStashException extends MWException {
+class UploadStashException extends MWException implements ILocalizedException {
+ /** @var string|array|MessageSpecifier */
+ protected $messageSpec;
+
+ /**
+ * @param string|array|MessageSpecifier $messageSpec See Message::newFromSpecifier
+ * @param int $code Exception code
+ * @param Exception|Throwable $previous The previous exception used for the exception chaining.
+ */
+ public function __construct( $messageSpec, $code = 0, $previous = null ) {
+ $this->messageSpec = $messageSpec;
+
+ $msg = $this->getMessageObject()->text();
+ $msg = preg_replace( '!</?(var|kbd|samp|code)>!', '"', $msg );
+ $msg = Sanitizer::stripAllTags( $msg );
+ parent::__construct( $msg, $code, $previous );
+ }
+
+ public function getMessageObject() {
+ return Message::newFromSpecifier( $this->messageSpec );
+ }
}
class UploadStashFileNotFoundException extends UploadStashException {
/**
* @var string
*/
- private $bug29408File;
+ private $tmpFile;
protected function setUp() {
parent::setUp();
- // Setup a file for T31408
- $this->bug29408File = wfTempDir() . '/bug29408';
- file_put_contents( $this->bug29408File, "\x00" );
+ $this->tmpFile = wfTempDir() . '/' . uniqid();
+ file_put_contents( $this->tmpFile, "\x00" );
self::$users = [
'sysop' => new TestUser(
}
protected function tearDown() {
- if ( file_exists( $this->bug29408File . "." ) ) {
- unlink( $this->bug29408File . "." );
+ if ( file_exists( $this->tmpFile . "." ) ) {
+ unlink( $this->tmpFile . "." );
}
- if ( file_exists( $this->bug29408File ) ) {
- unlink( $this->bug29408File );
+ if ( file_exists( $this->tmpFile ) ) {
+ unlink( $this->tmpFile );
}
parent::tearDown();
$stash = new UploadStash( $repo );
// Throws exception caught by PHPUnit on failure
- $file = $stash->stashFile( $this->bug29408File );
+ $file = $stash->stashFile( $this->tmpFile );
// We'll never reach this point if we hit T31408
$this->assertTrue( true, 'Unrecognized file without extension' );
$this->assertTrue( UploadFromStash::isValidRequest( $request ) );
}
+ public function testExceptionWhenStoreTempFails() {
+ $mockRepoStoreStatusResult = Status::newFatal( 'TEST_ERROR' );
+ $mockRepo = $this->getMockBuilder( FileRepo::class )
+ ->disableOriginalConstructor()
+ ->getMock();
+ $mockRepo->expects( $this->once() )
+ ->method( 'storeTemp' )
+ ->willReturn( $mockRepoStoreStatusResult );
+
+ $stash = new UploadStash( $mockRepo );
+ try {
+ $stash->stashFile( $this->tmpFile );
+ $this->fail( 'Expected UploadStashFileException not thrown' );
+ } catch ( UploadStashFileException $e ) {
+ $this->assertInstanceOf( 'ILocalizedException', $e );
+ } catch ( Exception $e ) {
+ $this->fail( 'Unexpected exception class ' . get_class( $e ) );
+ }
+ }
}