Dolibarr / dolibarr

htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php

Indentation +158 added lines, -158 removed lines

@@ -15,162 +15,162 @@
  */
 abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_InputByteStream, Swift_Filterable
 {
-    /**
-     * Write sequence.
-     */
-    protected $sequence = 0;
-
-    /**
-     * StreamFilters.
-     *
-     * @var Swift_StreamFilter[]
-     */
-    private $filters = [];
-
-    /**
-     * A buffer for writing.
-     */
-    private $writeBuffer = '';
-
-    /**
-     * Bound streams.
-     *
-     * @var Swift_InputByteStream[]
-     */
-    private $mirrors = [];
-
-    /**
-     * Commit the given bytes to the storage medium immediately.
-     *
-     * @param string $bytes
-     */
-    abstract protected function doCommit($bytes);
-
-    /**
-     * Flush any buffers/content with immediate effect.
-     */
-    abstract protected function flush();
-
-    /**
-     * Add a StreamFilter to this InputByteStream.
-     *
-     * @param string $key
-     */
-    public function addFilter(Swift_StreamFilter $filter, $key)
-    {
-        $this->filters[$key] = $filter;
-    }
-
-    /**
-     * Remove an already present StreamFilter based on its $key.
-     *
-     * @param string $key
-     */
-    public function removeFilter($key)
-    {
-        unset($this->filters[$key]);
-    }
-
-    /**
-     * Writes $bytes to the end of the stream.
-     *
-     * @param string $bytes
-     *
-     * @throws Swift_IoException
-     *
-     * @return int
-     */
-    public function write($bytes)
-    {
-        $this->writeBuffer .= $bytes;
-        foreach ($this->filters as $filter) {
-            if ($filter->shouldBuffer($this->writeBuffer)) {
-                return;
-            }
-        }
-        $this->doWrite($this->writeBuffer);
-
-        return ++$this->sequence;
-    }
-
-    /**
-     * For any bytes that are currently buffered inside the stream, force them
-     * off the buffer.
-     *
-     * @throws Swift_IoException
-     */
-    public function commit()
-    {
-        $this->doWrite($this->writeBuffer);
-    }
-
-    /**
-     * Attach $is to this stream.
-     *
-     * The stream acts as an observer, receiving all data that is written.
-     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     */
-    public function bind(Swift_InputByteStream $is)
-    {
-        $this->mirrors[] = $is;
-    }
-
-    /**
-     * Remove an already bound stream.
-     *
-     * If $is is not bound, no errors will be raised.
-     * If the stream currently has any buffered data it will be written to $is
-     * before unbinding occurs.
-     */
-    public function unbind(Swift_InputByteStream $is)
-    {
-        foreach ($this->mirrors as $k => $stream) {
-            if ($is === $stream) {
-                if ('' !== $this->writeBuffer) {
-                    $stream->write($this->writeBuffer);
-                }
-                unset($this->mirrors[$k]);
-            }
-        }
-    }
-
-    /**
-     * Flush the contents of the stream (empty it) and set the internal pointer
-     * to the beginning.
-     *
-     * @throws Swift_IoException
-     */
-    public function flushBuffers()
-    {
-        if ('' !== $this->writeBuffer) {
-            $this->doWrite($this->writeBuffer);
-        }
-        $this->flush();
-
-        foreach ($this->mirrors as $stream) {
-            $stream->flushBuffers();
-        }
-    }
-
-    /** Run $bytes through all filters */
-    private function filter($bytes)
-    {
-        foreach ($this->filters as $filter) {
-            $bytes = $filter->filter($bytes);
-        }
-
-        return $bytes;
-    }
-
-    /** Just write the bytes to the stream */
-    private function doWrite($bytes)
-    {
-        $this->doCommit($this->filter($bytes));
-
-        foreach ($this->mirrors as $stream) {
-            $stream->write($bytes);
-        }
-
-        $this->writeBuffer = '';
-    }
+	/**
+	 * Write sequence.
+	 */
+	protected $sequence = 0;
+
+	/**
+	 * StreamFilters.
+	 *
+	 * @var Swift_StreamFilter[]
+	 */
+	private $filters = [];
+
+	/**
+	 * A buffer for writing.
+	 */
+	private $writeBuffer = '';
+
+	/**
+	 * Bound streams.
+	 *
+	 * @var Swift_InputByteStream[]
+	 */
+	private $mirrors = [];
+
+	/**
+	 * Commit the given bytes to the storage medium immediately.
+	 *
+	 * @param string $bytes
+	 */
+	abstract protected function doCommit($bytes);
+
+	/**
+	 * Flush any buffers/content with immediate effect.
+	 */
+	abstract protected function flush();
+
+	/**
+	 * Add a StreamFilter to this InputByteStream.
+	 *
+	 * @param string $key
+	 */
+	public function addFilter(Swift_StreamFilter $filter, $key)
+	{
+		$this->filters[$key] = $filter;
+	}
+
+	/**
+	 * Remove an already present StreamFilter based on its $key.
+	 *
+	 * @param string $key
+	 */
+	public function removeFilter($key)
+	{
+		unset($this->filters[$key]);
+	}
+
+	/**
+	 * Writes $bytes to the end of the stream.
+	 *
+	 * @param string $bytes
+	 *
+	 * @throws Swift_IoException
+	 *
+	 * @return int
+	 */
+	public function write($bytes)
+	{
+		$this->writeBuffer .= $bytes;
+		foreach ($this->filters as $filter) {
+			if ($filter->shouldBuffer($this->writeBuffer)) {
+				return;
+			}
+		}
+		$this->doWrite($this->writeBuffer);
+
+		return ++$this->sequence;
+	}
+
+	/**
+	 * For any bytes that are currently buffered inside the stream, force them
+	 * off the buffer.
+	 *
+	 * @throws Swift_IoException
+	 */
+	public function commit()
+	{
+		$this->doWrite($this->writeBuffer);
+	}
+
+	/**
+	 * Attach $is to this stream.
+	 *
+	 * The stream acts as an observer, receiving all data that is written.
+	 * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+	 */
+	public function bind(Swift_InputByteStream $is)
+	{
+		$this->mirrors[] = $is;
+	}
+
+	/**
+	 * Remove an already bound stream.
+	 *
+	 * If $is is not bound, no errors will be raised.
+	 * If the stream currently has any buffered data it will be written to $is
+	 * before unbinding occurs.
+	 */
+	public function unbind(Swift_InputByteStream $is)
+	{
+		foreach ($this->mirrors as $k => $stream) {
+			if ($is === $stream) {
+				if ('' !== $this->writeBuffer) {
+					$stream->write($this->writeBuffer);
+				}
+				unset($this->mirrors[$k]);
+			}
+		}
+	}
+
+	/**
+	 * Flush the contents of the stream (empty it) and set the internal pointer
+	 * to the beginning.
+	 *
+	 * @throws Swift_IoException
+	 */
+	public function flushBuffers()
+	{
+		if ('' !== $this->writeBuffer) {
+			$this->doWrite($this->writeBuffer);
+		}
+		$this->flush();
+
+		foreach ($this->mirrors as $stream) {
+			$stream->flushBuffers();
+		}
+	}
+
+	/** Run $bytes through all filters */
+	private function filter($bytes)
+	{
+		foreach ($this->filters as $filter) {
+			$bytes = $filter->filter($bytes);
+		}
+
+		return $bytes;
+	}
+
+	/** Just write the bytes to the stream */
+	private function doWrite($bytes)
+	{
+		$this->doCommit($this->filter($bytes));
+
+		foreach ($this->mirrors as $stream) {
+			$stream->write($bytes);
+		}
+
+		$this->writeBuffer = '';
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php

Indentation +160 added lines, -160 removed lines

@@ -15,164 +15,164 @@
  */
 class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_OutputByteStream
 {
-    /**
-     * The internal stack of bytes.
-     *
-     * @var string[]
-     */
-    private $array = [];
-
-    /**
-     * The size of the stack.
-     *
-     * @var int
-     */
-    private $arraySize = 0;
-
-    /**
-     * The internal pointer offset.
-     *
-     * @var int
-     */
-    private $offset = 0;
-
-    /**
-     * Bound streams.
-     *
-     * @var Swift_InputByteStream[]
-     */
-    private $mirrors = [];
-
-    /**
-     * Create a new ArrayByteStream.
-     *
-     * If $stack is given the stream will be populated with the bytes it contains.
-     *
-     * @param mixed $stack of bytes in string or array form, optional
-     */
-    public function __construct($stack = null)
-    {
-        if (\is_array($stack)) {
-            $this->array = $stack;
-            $this->arraySize = \count($stack);
-        } elseif (\is_string($stack)) {
-            $this->write($stack);
-        } else {
-            $this->array = [];
-        }
-    }
-
-    /**
-     * Reads $length bytes from the stream into a string and moves the pointer
-     * through the stream by $length.
-     *
-     * If less bytes exist than are requested the
-     * remaining bytes are given instead. If no bytes are remaining at all, boolean
-     * false is returned.
-     *
-     * @param int $length
-     *
-     * @return string
-     */
-    public function read($length)
-    {
-        if ($this->offset == $this->arraySize) {
-            return false;
-        }
-
-        // Don't use array slice
-        $end = $length + $this->offset;
-        $end = $this->arraySize < $end ? $this->arraySize : $end;
-        $ret = '';
-        for (; $this->offset < $end; ++$this->offset) {
-            $ret .= $this->array[$this->offset];
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Writes $bytes to the end of the stream.
-     *
-     * @param string $bytes
-     */
-    public function write($bytes)
-    {
-        $to_add = str_split($bytes);
-        foreach ($to_add as $value) {
-            $this->array[] = $value;
-        }
-        $this->arraySize = \count($this->array);
-
-        foreach ($this->mirrors as $stream) {
-            $stream->write($bytes);
-        }
-    }
-
-    /**
-     * Not used.
-     */
-    public function commit()
-    {
-    }
-
-    /**
-     * Attach $is to this stream.
-     *
-     * The stream acts as an observer, receiving all data that is written.
-     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     */
-    public function bind(Swift_InputByteStream $is)
-    {
-        $this->mirrors[] = $is;
-    }
-
-    /**
-     * Remove an already bound stream.
-     *
-     * If $is is not bound, no errors will be raised.
-     * If the stream currently has any buffered data it will be written to $is
-     * before unbinding occurs.
-     */
-    public function unbind(Swift_InputByteStream $is)
-    {
-        foreach ($this->mirrors as $k => $stream) {
-            if ($is === $stream) {
-                unset($this->mirrors[$k]);
-            }
-        }
-    }
-
-    /**
-     * Move the internal read pointer to $byteOffset in the stream.
-     *
-     * @param int $byteOffset
-     *
-     * @return bool
-     */
-    public function setReadPointer($byteOffset)
-    {
-        if ($byteOffset > $this->arraySize) {
-            $byteOffset = $this->arraySize;
-        } elseif ($byteOffset < 0) {
-            $byteOffset = 0;
-        }
-
-        $this->offset = $byteOffset;
-    }
-
-    /**
-     * Flush the contents of the stream (empty it) and set the internal pointer
-     * to the beginning.
-     */
-    public function flushBuffers()
-    {
-        $this->offset = 0;
-        $this->array = [];
-        $this->arraySize = 0;
-
-        foreach ($this->mirrors as $stream) {
-            $stream->flushBuffers();
-        }
-    }
+	/**
+	 * The internal stack of bytes.
+	 *
+	 * @var string[]
+	 */
+	private $array = [];
+
+	/**
+	 * The size of the stack.
+	 *
+	 * @var int
+	 */
+	private $arraySize = 0;
+
+	/**
+	 * The internal pointer offset.
+	 *
+	 * @var int
+	 */
+	private $offset = 0;
+
+	/**
+	 * Bound streams.
+	 *
+	 * @var Swift_InputByteStream[]
+	 */
+	private $mirrors = [];
+
+	/**
+	 * Create a new ArrayByteStream.
+	 *
+	 * If $stack is given the stream will be populated with the bytes it contains.
+	 *
+	 * @param mixed $stack of bytes in string or array form, optional
+	 */
+	public function __construct($stack = null)
+	{
+		if (\is_array($stack)) {
+			$this->array = $stack;
+			$this->arraySize = \count($stack);
+		} elseif (\is_string($stack)) {
+			$this->write($stack);
+		} else {
+			$this->array = [];
+		}
+	}
+
+	/**
+	 * Reads $length bytes from the stream into a string and moves the pointer
+	 * through the stream by $length.
+	 *
+	 * If less bytes exist than are requested the
+	 * remaining bytes are given instead. If no bytes are remaining at all, boolean
+	 * false is returned.
+	 *
+	 * @param int $length
+	 *
+	 * @return string
+	 */
+	public function read($length)
+	{
+		if ($this->offset == $this->arraySize) {
+			return false;
+		}
+
+		// Don't use array slice
+		$end = $length + $this->offset;
+		$end = $this->arraySize < $end ? $this->arraySize : $end;
+		$ret = '';
+		for (; $this->offset < $end; ++$this->offset) {
+			$ret .= $this->array[$this->offset];
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * Writes $bytes to the end of the stream.
+	 *
+	 * @param string $bytes
+	 */
+	public function write($bytes)
+	{
+		$to_add = str_split($bytes);
+		foreach ($to_add as $value) {
+			$this->array[] = $value;
+		}
+		$this->arraySize = \count($this->array);
+
+		foreach ($this->mirrors as $stream) {
+			$stream->write($bytes);
+		}
+	}
+
+	/**
+	 * Not used.
+	 */
+	public function commit()
+	{
+	}
+
+	/**
+	 * Attach $is to this stream.
+	 *
+	 * The stream acts as an observer, receiving all data that is written.
+	 * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+	 */
+	public function bind(Swift_InputByteStream $is)
+	{
+		$this->mirrors[] = $is;
+	}
+
+	/**
+	 * Remove an already bound stream.
+	 *
+	 * If $is is not bound, no errors will be raised.
+	 * If the stream currently has any buffered data it will be written to $is
+	 * before unbinding occurs.
+	 */
+	public function unbind(Swift_InputByteStream $is)
+	{
+		foreach ($this->mirrors as $k => $stream) {
+			if ($is === $stream) {
+				unset($this->mirrors[$k]);
+			}
+		}
+	}
+
+	/**
+	 * Move the internal read pointer to $byteOffset in the stream.
+	 *
+	 * @param int $byteOffset
+	 *
+	 * @return bool
+	 */
+	public function setReadPointer($byteOffset)
+	{
+		if ($byteOffset > $this->arraySize) {
+			$byteOffset = $this->arraySize;
+		} elseif ($byteOffset < 0) {
+			$byteOffset = 0;
+		}
+
+		$this->offset = $byteOffset;
+	}
+
+	/**
+	 * Flush the contents of the stream (empty it) and set the internal pointer
+	 * to the beginning.
+	 */
+	public function flushBuffers()
+	{
+		$this->offset = 0;
+		$this->array = [];
+		$this->arraySize = 0;
+
+		foreach ($this->mirrors as $stream) {
+			$stream->flushBuffers();
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php

Indentation +36 added lines, -36 removed lines

@@ -13,40 +13,40 @@
  */
 class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByteStream
 {
-    public function __construct()
-    {
-        $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
-
-        if (false === $filePath) {
-            throw new Swift_IoException('Failed to retrieve temporary file name.');
-        }
-
-        parent::__construct($filePath, true);
-    }
-
-    public function getContent()
-    {
-        if (false === ($content = file_get_contents($this->getPath()))) {
-            throw new Swift_IoException('Failed to get temporary file content.');
-        }
-
-        return $content;
-    }
-
-    public function __destruct()
-    {
-        if (file_exists($this->getPath())) {
-            @unlink($this->getPath());
-        }
-    }
-
-    public function __sleep()
-    {
-        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
-    }
-
-    public function __wakeup()
-    {
-        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
-    }
+	public function __construct()
+	{
+		$filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
+
+		if (false === $filePath) {
+			throw new Swift_IoException('Failed to retrieve temporary file name.');
+		}
+
+		parent::__construct($filePath, true);
+	}
+
+	public function getContent()
+	{
+		if (false === ($content = file_get_contents($this->getPath()))) {
+			throw new Swift_IoException('Failed to get temporary file content.');
+		}
+
+		return $content;
+	}
+
+	public function __destruct()
+	{
+		if (file_exists($this->getPath())) {
+			@unlink($this->getPath());
+		}
+	}
+
+	public function __sleep()
+	{
+		throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+	}
+
+	public function __wakeup()
+	{
+		throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php

Indentation +196 added lines, -196 removed lines

@@ -15,200 +15,200 @@
  */
 class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_FileStream
 {
-    /** The internal pointer offset */
-    private $offset = 0;
-
-    /** The path to the file */
-    private $path;
-
-    /** The mode this file is opened in for writing */
-    private $mode;
-
-    /** A lazy-loaded resource handle for reading the file */
-    private $reader;
-
-    /** A lazy-loaded resource handle for writing the file */
-    private $writer;
-
-    /** If stream is seekable true/false, or null if not known */
-    private $seekable = null;
-
-    /**
-     * Create a new FileByteStream for $path.
-     *
-     * @param string $path
-     * @param bool   $writable if true
-     */
-    public function __construct($path, $writable = false)
-    {
-        if (empty($path)) {
-            throw new Swift_IoException('The path cannot be empty');
-        }
-        $this->path = $path;
-        $this->mode = $writable ? 'w+b' : 'rb';
-    }
-
-    /**
-     * Get the complete path to the file.
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Reads $length bytes from the stream into a string and moves the pointer
-     * through the stream by $length.
-     *
-     * If less bytes exist than are requested the
-     * remaining bytes are given instead. If no bytes are remaining at all, boolean
-     * false is returned.
-     *
-     * @param int $length
-     *
-     * @return string|bool
-     *
-     * @throws Swift_IoException
-     */
-    public function read($length)
-    {
-        $fp = $this->getReadHandle();
-        if (!feof($fp)) {
-            $bytes = fread($fp, $length);
-            $this->offset = ftell($fp);
-
-            // If we read one byte after reaching the end of the file
-            // feof() will return false and an empty string is returned
-            if ((false === $bytes || '' === $bytes) && feof($fp)) {
-                $this->resetReadHandle();
-
-                return false;
-            }
-
-            return $bytes;
-        }
-
-        $this->resetReadHandle();
-
-        return false;
-    }
-
-    /**
-     * Move the internal read pointer to $byteOffset in the stream.
-     *
-     * @param int $byteOffset
-     *
-     * @return bool
-     */
-    public function setReadPointer($byteOffset)
-    {
-        if (isset($this->reader)) {
-            $this->seekReadStreamToPosition($byteOffset);
-        }
-        $this->offset = $byteOffset;
-    }
-
-    /** Just write the bytes to the file */
-    protected function doCommit($bytes)
-    {
-        fwrite($this->getWriteHandle(), $bytes);
-        $this->resetReadHandle();
-    }
-
-    /** Not used */
-    protected function flush()
-    {
-    }
-
-    /** Get the resource for reading */
-    private function getReadHandle()
-    {
-        if (!isset($this->reader)) {
-            $pointer = @fopen($this->path, 'rb');
-            if (!$pointer) {
-                throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
-            }
-            $this->reader = $pointer;
-            if (0 != $this->offset) {
-                $this->getReadStreamSeekableStatus();
-                $this->seekReadStreamToPosition($this->offset);
-            }
-        }
-
-        return $this->reader;
-    }
-
-    /** Get the resource for writing */
-    private function getWriteHandle()
-    {
-        if (!isset($this->writer)) {
-            if (!$this->writer = fopen($this->path, $this->mode)) {
-                throw new Swift_IoException('Unable to open file for writing ['.$this->path.']');
-            }
-        }
-
-        return $this->writer;
-    }
-
-    /** Force a reload of the resource for reading */
-    private function resetReadHandle()
-    {
-        if (isset($this->reader)) {
-            fclose($this->reader);
-            $this->reader = null;
-        }
-    }
-
-    /** Check if ReadOnly Stream is seekable */
-    private function getReadStreamSeekableStatus()
-    {
-        $metas = stream_get_meta_data($this->reader);
-        $this->seekable = $metas['seekable'];
-    }
-
-    /** Streams in a readOnly stream ensuring copy if needed */
-    private function seekReadStreamToPosition($offset)
-    {
-        if (null === $this->seekable) {
-            $this->getReadStreamSeekableStatus();
-        }
-        if (false === $this->seekable) {
-            $currentPos = ftell($this->reader);
-            if ($currentPos < $offset) {
-                $toDiscard = $offset - $currentPos;
-                fread($this->reader, $toDiscard);
-
-                return;
-            }
-            $this->copyReadStream();
-        }
-        fseek($this->reader, $offset, SEEK_SET);
-    }
-
-    /** Copy a readOnly Stream to ensure seekability */
-    private function copyReadStream()
-    {
-        if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
-            /* We have opened a php:// Stream Should work without problem */
-        } elseif (\function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
-            /* We have opened a tmpfile */
-        } else {
-            throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
-        }
-        $currentPos = ftell($this->reader);
-        fclose($this->reader);
-        $source = fopen($this->path, 'rb');
-        if (!$source) {
-            throw new Swift_IoException('Unable to open file for copying ['.$this->path.']');
-        }
-        fseek($tmpFile, 0, SEEK_SET);
-        while (!feof($source)) {
-            fwrite($tmpFile, fread($source, 4096));
-        }
-        fseek($tmpFile, $currentPos, SEEK_SET);
-        fclose($source);
-        $this->reader = $tmpFile;
-    }
+	/** The internal pointer offset */
+	private $offset = 0;
+
+	/** The path to the file */
+	private $path;
+
+	/** The mode this file is opened in for writing */
+	private $mode;
+
+	/** A lazy-loaded resource handle for reading the file */
+	private $reader;
+
+	/** A lazy-loaded resource handle for writing the file */
+	private $writer;
+
+	/** If stream is seekable true/false, or null if not known */
+	private $seekable = null;
+
+	/**
+	 * Create a new FileByteStream for $path.
+	 *
+	 * @param string $path
+	 * @param bool   $writable if true
+	 */
+	public function __construct($path, $writable = false)
+	{
+		if (empty($path)) {
+			throw new Swift_IoException('The path cannot be empty');
+		}
+		$this->path = $path;
+		$this->mode = $writable ? 'w+b' : 'rb';
+	}
+
+	/**
+	 * Get the complete path to the file.
+	 *
+	 * @return string
+	 */
+	public function getPath()
+	{
+		return $this->path;
+	}
+
+	/**
+	 * Reads $length bytes from the stream into a string and moves the pointer
+	 * through the stream by $length.
+	 *
+	 * If less bytes exist than are requested the
+	 * remaining bytes are given instead. If no bytes are remaining at all, boolean
+	 * false is returned.
+	 *
+	 * @param int $length
+	 *
+	 * @return string|bool
+	 *
+	 * @throws Swift_IoException
+	 */
+	public function read($length)
+	{
+		$fp = $this->getReadHandle();
+		if (!feof($fp)) {
+			$bytes = fread($fp, $length);
+			$this->offset = ftell($fp);
+
+			// If we read one byte after reaching the end of the file
+			// feof() will return false and an empty string is returned
+			if ((false === $bytes || '' === $bytes) && feof($fp)) {
+				$this->resetReadHandle();
+
+				return false;
+			}
+
+			return $bytes;
+		}
+
+		$this->resetReadHandle();
+
+		return false;
+	}
+
+	/**
+	 * Move the internal read pointer to $byteOffset in the stream.
+	 *
+	 * @param int $byteOffset
+	 *
+	 * @return bool
+	 */
+	public function setReadPointer($byteOffset)
+	{
+		if (isset($this->reader)) {
+			$this->seekReadStreamToPosition($byteOffset);
+		}
+		$this->offset = $byteOffset;
+	}
+
+	/** Just write the bytes to the file */
+	protected function doCommit($bytes)
+	{
+		fwrite($this->getWriteHandle(), $bytes);
+		$this->resetReadHandle();
+	}
+
+	/** Not used */
+	protected function flush()
+	{
+	}
+
+	/** Get the resource for reading */
+	private function getReadHandle()
+	{
+		if (!isset($this->reader)) {
+			$pointer = @fopen($this->path, 'rb');
+			if (!$pointer) {
+				throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
+			}
+			$this->reader = $pointer;
+			if (0 != $this->offset) {
+				$this->getReadStreamSeekableStatus();
+				$this->seekReadStreamToPosition($this->offset);
+			}
+		}
+
+		return $this->reader;
+	}
+
+	/** Get the resource for writing */
+	private function getWriteHandle()
+	{
+		if (!isset($this->writer)) {
+			if (!$this->writer = fopen($this->path, $this->mode)) {
+				throw new Swift_IoException('Unable to open file for writing ['.$this->path.']');
+			}
+		}
+
+		return $this->writer;
+	}
+
+	/** Force a reload of the resource for reading */
+	private function resetReadHandle()
+	{
+		if (isset($this->reader)) {
+			fclose($this->reader);
+			$this->reader = null;
+		}
+	}
+
+	/** Check if ReadOnly Stream is seekable */
+	private function getReadStreamSeekableStatus()
+	{
+		$metas = stream_get_meta_data($this->reader);
+		$this->seekable = $metas['seekable'];
+	}
+
+	/** Streams in a readOnly stream ensuring copy if needed */
+	private function seekReadStreamToPosition($offset)
+	{
+		if (null === $this->seekable) {
+			$this->getReadStreamSeekableStatus();
+		}
+		if (false === $this->seekable) {
+			$currentPos = ftell($this->reader);
+			if ($currentPos < $offset) {
+				$toDiscard = $offset - $currentPos;
+				fread($this->reader, $toDiscard);
+
+				return;
+			}
+			$this->copyReadStream();
+		}
+		fseek($this->reader, $offset, SEEK_SET);
+	}
+
+	/** Copy a readOnly Stream to ensure seekability */
+	private function copyReadStream()
+	{
+		if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
+			/* We have opened a php:// Stream Should work without problem */
+		} elseif (\function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
+			/* We have opened a tmpfile */
+		} else {
+			throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
+		}
+		$currentPos = ftell($this->reader);
+		fclose($this->reader);
+		$source = fopen($this->path, 'rb');
+		if (!$source) {
+			throw new Swift_IoException('Unable to open file for copying ['.$this->path.']');
+		}
+		fseek($tmpFile, 0, SEEK_SET);
+		while (!feof($source)) {
+			fwrite($tmpFile, fread($source, 4096));
+		}
+		fseek($tmpFile, $currentPos, SEEK_SET);
+		fclose($source);
+		$this->reader = $tmpFile;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php

Indentation +46 added lines, -46 removed lines

@@ -15,56 +15,56 @@
  */
 class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
 {
-    /** The needle(s) to search for */
-    private $search;
+	/** The needle(s) to search for */
+	private $search;
 
-    /** The replacement(s) to make */
-    private $replace;
+	/** The replacement(s) to make */
+	private $replace;
 
-    /**
-     * Create a new StringReplacementFilter with $search and $replace.
-     *
-     * @param string|array $search
-     * @param string|array $replace
-     */
-    public function __construct($search, $replace)
-    {
-        $this->search = $search;
-        $this->replace = $replace;
-    }
+	/**
+	 * Create a new StringReplacementFilter with $search and $replace.
+	 *
+	 * @param string|array $search
+	 * @param string|array $replace
+	 */
+	public function __construct($search, $replace)
+	{
+		$this->search = $search;
+		$this->replace = $replace;
+	}
 
-    /**
-     * Returns true if based on the buffer passed more bytes should be buffered.
-     *
-     * @param string $buffer
-     *
-     * @return bool
-     */
-    public function shouldBuffer($buffer)
-    {
-        if ('' === $buffer) {
-            return false;
-        }
+	/**
+	 * Returns true if based on the buffer passed more bytes should be buffered.
+	 *
+	 * @param string $buffer
+	 *
+	 * @return bool
+	 */
+	public function shouldBuffer($buffer)
+	{
+		if ('' === $buffer) {
+			return false;
+		}
 
-        $endOfBuffer = substr($buffer, -1);
-        foreach ((array) $this->search as $needle) {
-            if (false !== strpos($needle, $endOfBuffer)) {
-                return true;
-            }
-        }
+		$endOfBuffer = substr($buffer, -1);
+		foreach ((array) $this->search as $needle) {
+			if (false !== strpos($needle, $endOfBuffer)) {
+				return true;
+			}
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * Perform the actual replacements on $buffer and return the result.
-     *
-     * @param string $buffer
-     *
-     * @return string
-     */
-    public function filter($buffer)
-    {
-        return str_replace($this->search, $this->replace, $buffer);
-    }
+	/**
+	 * Perform the actual replacements on $buffer and return the result.
+	 *
+	 * @param string $buffer
+	 *
+	 * @return string
+	 */
+	public function filter($buffer)
+	{
+		return str_replace($this->search, $this->replace, $buffer);
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php

Indentation +134 added lines, -134 removed lines

@@ -17,150 +17,150 @@
  */
 class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
 {
-    /** The replacement(s) to make */
-    private $replace;
+	/** The replacement(s) to make */
+	private $replace;
 
-    /** The Index for searching */
-    private $index;
+	/** The Index for searching */
+	private $index;
 
-    /** The Search Tree */
-    private $tree = [];
+	/** The Search Tree */
+	private $tree = [];
 
-    /**  Gives the size of the largest search */
-    private $treeMaxLen = 0;
+	/**  Gives the size of the largest search */
+	private $treeMaxLen = 0;
 
-    private $repSize;
+	private $repSize;
 
-    /**
-     * Create a new ByteArrayReplacementFilter with $search and $replace.
-     *
-     * @param array $search
-     * @param array $replace
-     */
-    public function __construct($search, $replace)
-    {
-        $this->index = [];
-        $this->tree = [];
-        $this->replace = [];
-        $this->repSize = [];
+	/**
+	 * Create a new ByteArrayReplacementFilter with $search and $replace.
+	 *
+	 * @param array $search
+	 * @param array $replace
+	 */
+	public function __construct($search, $replace)
+	{
+		$this->index = [];
+		$this->tree = [];
+		$this->replace = [];
+		$this->repSize = [];
 
-        $tree = null;
-        $i = null;
-        $last_size = $size = 0;
-        foreach ($search as $i => $search_element) {
-            if (null !== $tree) {
-                $tree[-1] = min(\count($replace) - 1, $i - 1);
-                $tree[-2] = $last_size;
-            }
-            $tree = &$this->tree;
-            if (\is_array($search_element)) {
-                foreach ($search_element as $k => $char) {
-                    $this->index[$char] = true;
-                    if (!isset($tree[$char])) {
-                        $tree[$char] = [];
-                    }
-                    $tree = &$tree[$char];
-                }
-                $last_size = $k + 1;
-                $size = max($size, $last_size);
-            } else {
-                $last_size = 1;
-                if (!isset($tree[$search_element])) {
-                    $tree[$search_element] = [];
-                }
-                $tree = &$tree[$search_element];
-                $size = max($last_size, $size);
-                $this->index[$search_element] = true;
-            }
-        }
-        if (null !== $i) {
-            $tree[-1] = min(\count($replace) - 1, $i);
-            $tree[-2] = $last_size;
-            $this->treeMaxLen = $size;
-        }
-        foreach ($replace as $rep) {
-            if (!\is_array($rep)) {
-                $rep = [$rep];
-            }
-            $this->replace[] = $rep;
-        }
-        for ($i = \count($this->replace) - 1; $i >= 0; --$i) {
-            $this->replace[$i] = $rep = $this->filter($this->replace[$i], $i);
-            $this->repSize[$i] = \count($rep);
-        }
-    }
+		$tree = null;
+		$i = null;
+		$last_size = $size = 0;
+		foreach ($search as $i => $search_element) {
+			if (null !== $tree) {
+				$tree[-1] = min(\count($replace) - 1, $i - 1);
+				$tree[-2] = $last_size;
+			}
+			$tree = &$this->tree;
+			if (\is_array($search_element)) {
+				foreach ($search_element as $k => $char) {
+					$this->index[$char] = true;
+					if (!isset($tree[$char])) {
+						$tree[$char] = [];
+					}
+					$tree = &$tree[$char];
+				}
+				$last_size = $k + 1;
+				$size = max($size, $last_size);
+			} else {
+				$last_size = 1;
+				if (!isset($tree[$search_element])) {
+					$tree[$search_element] = [];
+				}
+				$tree = &$tree[$search_element];
+				$size = max($last_size, $size);
+				$this->index[$search_element] = true;
+			}
+		}
+		if (null !== $i) {
+			$tree[-1] = min(\count($replace) - 1, $i);
+			$tree[-2] = $last_size;
+			$this->treeMaxLen = $size;
+		}
+		foreach ($replace as $rep) {
+			if (!\is_array($rep)) {
+				$rep = [$rep];
+			}
+			$this->replace[] = $rep;
+		}
+		for ($i = \count($this->replace) - 1; $i >= 0; --$i) {
+			$this->replace[$i] = $rep = $this->filter($this->replace[$i], $i);
+			$this->repSize[$i] = \count($rep);
+		}
+	}
 
-    /**
-     * Returns true if based on the buffer passed more bytes should be buffered.
-     *
-     * @param array $buffer
-     *
-     * @return bool
-     */
-    public function shouldBuffer($buffer)
-    {
-        $endOfBuffer = end($buffer);
+	/**
+	 * Returns true if based on the buffer passed more bytes should be buffered.
+	 *
+	 * @param array $buffer
+	 *
+	 * @return bool
+	 */
+	public function shouldBuffer($buffer)
+	{
+		$endOfBuffer = end($buffer);
 
-        return isset($this->index[$endOfBuffer]);
-    }
+		return isset($this->index[$endOfBuffer]);
+	}
 
-    /**
-     * Perform the actual replacements on $buffer and return the result.
-     *
-     * @param array $buffer
-     * @param int   $minReplaces
-     *
-     * @return array
-     */
-    public function filter($buffer, $minReplaces = -1)
-    {
-        if (0 == $this->treeMaxLen) {
-            return $buffer;
-        }
+	/**
+	 * Perform the actual replacements on $buffer and return the result.
+	 *
+	 * @param array $buffer
+	 * @param int   $minReplaces
+	 *
+	 * @return array
+	 */
+	public function filter($buffer, $minReplaces = -1)
+	{
+		if (0 == $this->treeMaxLen) {
+			return $buffer;
+		}
 
-        $newBuffer = [];
-        $buf_size = \count($buffer);
-        $last_size = 0;
-        for ($i = 0; $i < $buf_size; ++$i) {
-            $search_pos = $this->tree;
-            $last_found = PHP_INT_MAX;
-            // We try to find if the next byte is part of a search pattern
-            for ($j = 0; $j <= $this->treeMaxLen; ++$j) {
-                // We have a new byte for a search pattern
-                if (isset($buffer[$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
-                    $search_pos = $search_pos[$buffer[$p]];
-                    // We have a complete pattern, save, in case we don't find a better match later
-                    if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
-                        && $search_pos[-1] > $minReplaces) {
-                        $last_found = $search_pos[-1];
-                        $last_size = $search_pos[-2];
-                    }
-                }
-                // We got a complete pattern
-                elseif (PHP_INT_MAX !== $last_found) {
-                    // Adding replacement datas to output buffer
-                    $rep_size = $this->repSize[$last_found];
-                    for ($j = 0; $j < $rep_size; ++$j) {
-                        $newBuffer[] = $this->replace[$last_found][$j];
-                    }
-                    // We Move cursor forward
-                    $i += $last_size - 1;
-                    // Edge Case, last position in buffer
-                    if ($i >= $buf_size) {
-                        $newBuffer[] = $buffer[$i];
-                    }
+		$newBuffer = [];
+		$buf_size = \count($buffer);
+		$last_size = 0;
+		for ($i = 0; $i < $buf_size; ++$i) {
+			$search_pos = $this->tree;
+			$last_found = PHP_INT_MAX;
+			// We try to find if the next byte is part of a search pattern
+			for ($j = 0; $j <= $this->treeMaxLen; ++$j) {
+				// We have a new byte for a search pattern
+				if (isset($buffer[$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
+					$search_pos = $search_pos[$buffer[$p]];
+					// We have a complete pattern, save, in case we don't find a better match later
+					if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
+						&& $search_pos[-1] > $minReplaces) {
+						$last_found = $search_pos[-1];
+						$last_size = $search_pos[-2];
+					}
+				}
+				// We got a complete pattern
+				elseif (PHP_INT_MAX !== $last_found) {
+					// Adding replacement datas to output buffer
+					$rep_size = $this->repSize[$last_found];
+					for ($j = 0; $j < $rep_size; ++$j) {
+						$newBuffer[] = $this->replace[$last_found][$j];
+					}
+					// We Move cursor forward
+					$i += $last_size - 1;
+					// Edge Case, last position in buffer
+					if ($i >= $buf_size) {
+						$newBuffer[] = $buffer[$i];
+					}
 
-                    // We start the next loop
-                    continue 2;
-                } else {
-                    // this byte is not in a pattern and we haven't found another pattern
-                    break;
-                }
-            }
-            // Normal byte, move it to output buffer
-            $newBuffer[] = $buffer[$i];
-        }
+					// We start the next loop
+					continue 2;
+				} else {
+					// this byte is not in a pattern and we haven't found another pattern
+					break;
+				}
+			}
+			// Normal byte, move it to output buffer
+			$newBuffer[] = $buffer[$i];
+		}
 
-        return $newBuffer;
-    }
+		return $newBuffer;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php

Indentation +23 added lines, -23 removed lines

@@ -15,31 +15,31 @@
  */
 class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
 {
-    /** Lazy-loaded filters */
-    private $filters = [];
+	/** Lazy-loaded filters */
+	private $filters = [];
 
-    /**
-     * Create a new StreamFilter to replace $search with $replace in a string.
-     *
-     * @param string $search
-     * @param string $replace
-     *
-     * @return Swift_StreamFilter
-     */
-    public function createFilter($search, $replace)
-    {
-        if (!isset($this->filters[$search][$replace])) {
-            if (!isset($this->filters[$search])) {
-                $this->filters[$search] = [];
-            }
+	/**
+	 * Create a new StreamFilter to replace $search with $replace in a string.
+	 *
+	 * @param string $search
+	 * @param string $replace
+	 *
+	 * @return Swift_StreamFilter
+	 */
+	public function createFilter($search, $replace)
+	{
+		if (!isset($this->filters[$search][$replace])) {
+			if (!isset($this->filters[$search])) {
+				$this->filters[$search] = [];
+			}
 
-            if (!isset($this->filters[$search][$replace])) {
-                $this->filters[$search][$replace] = [];
-            }
+			if (!isset($this->filters[$search][$replace])) {
+				$this->filters[$search][$replace] = [];
+			}
 
-            $this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
-        }
+			$this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+		}
 
-        return $this->filters[$search][$replace];
-    }
+		return $this->filters[$search][$replace];
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Filterable.php

Indentation +12 added lines, -12 removed lines

@@ -15,17 +15,17 @@
  */
 interface Swift_Filterable
 {
-    /**
-     * Add a new StreamFilter, referenced by $key.
-     *
-     * @param string $key
-     */
-    public function addFilter(Swift_StreamFilter $filter, $key);
+	/**
+	 * Add a new StreamFilter, referenced by $key.
+	 *
+	 * @param string $key
+	 */
+	public function addFilter(Swift_StreamFilter $filter, $key);
 
-    /**
-     * Remove an existing filter using $key.
-     *
-     * @param string $key
-     */
-    public function removeFilter($key);
+	/**
+	 * Remove an existing filter using $key.
+	 *
+	 * @param string $key
+	 */
+	public function removeFilter($key);
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Message.php

Indentation +261 added lines, -261 removed lines

@@ -15,265 +15,265 @@
  */
 class Swift_Message extends Swift_Mime_SimpleMessage
 {
-    /**
-     * @var Swift_Signers_HeaderSigner[]
-     */
-    private $headerSigners = [];
-
-    /**
-     * @var Swift_Signers_BodySigner[]
-     */
-    private $bodySigners = [];
-
-    /**
-     * @var array
-     */
-    private $savedMessage = [];
-
-    /**
-     * Create a new Message.
-     *
-     * Details may be optionally passed into the constructor.
-     *
-     * @param string $subject
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     */
-    public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
-    {
-        \call_user_func_array(
-            [$this, 'Swift_Mime_SimpleMessage::__construct'],
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('mime.message')
-            );
-
-        if (!isset($charset)) {
-            $charset = Swift_DependencyContainer::getInstance()
-                ->lookup('properties.charset');
-        }
-        $this->setSubject($subject);
-        $this->setBody($body);
-        $this->setCharset($charset);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
-    }
-
-    /**
-     * Add a MimePart to this Message.
-     *
-     * @param string|Swift_OutputByteStream $body
-     * @param string                        $contentType
-     * @param string                        $charset
-     *
-     * @return $this
-     */
-    public function addPart($body, $contentType = null, $charset = null)
-    {
-        return $this->attach((new Swift_MimePart($body, $contentType, $charset))->setEncoder($this->getEncoder()));
-    }
-
-    /**
-     * Attach a new signature handler to the message.
-     *
-     * @return $this
-     */
-    public function attachSigner(Swift_Signer $signer)
-    {
-        if ($signer instanceof Swift_Signers_HeaderSigner) {
-            $this->headerSigners[] = $signer;
-        } elseif ($signer instanceof Swift_Signers_BodySigner) {
-            $this->bodySigners[] = $signer;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Detach a signature handler from a message.
-     *
-     * @return $this
-     */
-    public function detachSigner(Swift_Signer $signer)
-    {
-        if ($signer instanceof Swift_Signers_HeaderSigner) {
-            foreach ($this->headerSigners as $k => $headerSigner) {
-                if ($headerSigner === $signer) {
-                    unset($this->headerSigners[$k]);
-
-                    return $this;
-                }
-            }
-        } elseif ($signer instanceof Swift_Signers_BodySigner) {
-            foreach ($this->bodySigners as $k => $bodySigner) {
-                if ($bodySigner === $signer) {
-                    unset($this->bodySigners[$k]);
-
-                    return $this;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear all signature handlers attached to the message.
-     *
-     * @return $this
-     */
-    public function clearSigners()
-    {
-        $this->headerSigners = [];
-        $this->bodySigners = [];
-
-        return $this;
-    }
-
-    /**
-     * Get this message as a complete string.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if (empty($this->headerSigners) && empty($this->bodySigners)) {
-            return parent::toString();
-        }
-
-        $this->saveMessage();
-
-        $this->doSign();
-
-        $string = parent::toString();
-
-        $this->restoreMessage();
-
-        return $string;
-    }
-
-    /**
-     * Write this message to a {@link Swift_InputByteStream}.
-     */
-    public function toByteStream(Swift_InputByteStream $is)
-    {
-        if (empty($this->headerSigners) && empty($this->bodySigners)) {
-            parent::toByteStream($is);
-
-            return;
-        }
-
-        $this->saveMessage();
-
-        $this->doSign();
-
-        parent::toByteStream($is);
-
-        $this->restoreMessage();
-    }
-
-    public function __wakeup()
-    {
-        Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
-    }
-
-    /**
-     * loops through signers and apply the signatures.
-     */
-    protected function doSign()
-    {
-        foreach ($this->bodySigners as $signer) {
-            $altered = $signer->getAlteredHeaders();
-            $this->saveHeaders($altered);
-            $signer->signMessage($this);
-        }
-
-        foreach ($this->headerSigners as $signer) {
-            $altered = $signer->getAlteredHeaders();
-            $this->saveHeaders($altered);
-            $signer->reset();
-
-            $signer->setHeaders($this->getHeaders());
-
-            $signer->startBody();
-            $this->bodyToByteStream($signer);
-            $signer->endBody();
-
-            $signer->addSignature($this->getHeaders());
-        }
-    }
-
-    /**
-     * save the message before any signature is applied.
-     */
-    protected function saveMessage()
-    {
-        $this->savedMessage = ['headers' => []];
-        $this->savedMessage['body'] = $this->getBody();
-        $this->savedMessage['children'] = $this->getChildren();
-        if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
-            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
-            $this->setBody('');
-        }
-    }
-
-    /**
-     * save the original headers.
-     */
-    protected function saveHeaders(array $altered)
-    {
-        foreach ($altered as $head) {
-            $lc = strtolower($head ?? '');
-
-            if (!isset($this->savedMessage['headers'][$lc])) {
-                $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
-            }
-        }
-    }
-
-    /**
-     * Remove or restore altered headers.
-     */
-    protected function restoreHeaders()
-    {
-        foreach ($this->savedMessage['headers'] as $name => $savedValue) {
-            $headers = $this->getHeaders()->getAll($name);
-
-            foreach ($headers as $key => $value) {
-                if (!isset($savedValue[$key])) {
-                    $this->getHeaders()->remove($name, $key);
-                }
-            }
-        }
-    }
-
-    /**
-     * Restore message body.
-     */
-    protected function restoreMessage()
-    {
-        $this->setBody($this->savedMessage['body']);
-        $this->setChildren($this->savedMessage['children']);
-
-        $this->restoreHeaders();
-        $this->savedMessage = [];
-    }
-
-    /**
-     * Clone Message Signers.
-     *
-     * @see Swift_Mime_SimpleMimeEntity::__clone()
-     */
-    public function __clone()
-    {
-        parent::__clone();
-        foreach ($this->bodySigners as $key => $bodySigner) {
-            $this->bodySigners[$key] = clone $bodySigner;
-        }
-
-        foreach ($this->headerSigners as $key => $headerSigner) {
-            $this->headerSigners[$key] = clone $headerSigner;
-        }
-    }
+	/**
+	 * @var Swift_Signers_HeaderSigner[]
+	 */
+	private $headerSigners = [];
+
+	/**
+	 * @var Swift_Signers_BodySigner[]
+	 */
+	private $bodySigners = [];
+
+	/**
+	 * @var array
+	 */
+	private $savedMessage = [];
+
+	/**
+	 * Create a new Message.
+	 *
+	 * Details may be optionally passed into the constructor.
+	 *
+	 * @param string $subject
+	 * @param string $body
+	 * @param string $contentType
+	 * @param string $charset
+	 */
+	public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
+	{
+		\call_user_func_array(
+			[$this, 'Swift_Mime_SimpleMessage::__construct'],
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('mime.message')
+			);
+
+		if (!isset($charset)) {
+			$charset = Swift_DependencyContainer::getInstance()
+				->lookup('properties.charset');
+		}
+		$this->setSubject($subject);
+		$this->setBody($body);
+		$this->setCharset($charset);
+		if ($contentType) {
+			$this->setContentType($contentType);
+		}
+	}
+
+	/**
+	 * Add a MimePart to this Message.
+	 *
+	 * @param string|Swift_OutputByteStream $body
+	 * @param string                        $contentType
+	 * @param string                        $charset
+	 *
+	 * @return $this
+	 */
+	public function addPart($body, $contentType = null, $charset = null)
+	{
+		return $this->attach((new Swift_MimePart($body, $contentType, $charset))->setEncoder($this->getEncoder()));
+	}
+
+	/**
+	 * Attach a new signature handler to the message.
+	 *
+	 * @return $this
+	 */
+	public function attachSigner(Swift_Signer $signer)
+	{
+		if ($signer instanceof Swift_Signers_HeaderSigner) {
+			$this->headerSigners[] = $signer;
+		} elseif ($signer instanceof Swift_Signers_BodySigner) {
+			$this->bodySigners[] = $signer;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Detach a signature handler from a message.
+	 *
+	 * @return $this
+	 */
+	public function detachSigner(Swift_Signer $signer)
+	{
+		if ($signer instanceof Swift_Signers_HeaderSigner) {
+			foreach ($this->headerSigners as $k => $headerSigner) {
+				if ($headerSigner === $signer) {
+					unset($this->headerSigners[$k]);
+
+					return $this;
+				}
+			}
+		} elseif ($signer instanceof Swift_Signers_BodySigner) {
+			foreach ($this->bodySigners as $k => $bodySigner) {
+				if ($bodySigner === $signer) {
+					unset($this->bodySigners[$k]);
+
+					return $this;
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Clear all signature handlers attached to the message.
+	 *
+	 * @return $this
+	 */
+	public function clearSigners()
+	{
+		$this->headerSigners = [];
+		$this->bodySigners = [];
+
+		return $this;
+	}
+
+	/**
+	 * Get this message as a complete string.
+	 *
+	 * @return string
+	 */
+	public function toString()
+	{
+		if (empty($this->headerSigners) && empty($this->bodySigners)) {
+			return parent::toString();
+		}
+
+		$this->saveMessage();
+
+		$this->doSign();
+
+		$string = parent::toString();
+
+		$this->restoreMessage();
+
+		return $string;
+	}
+
+	/**
+	 * Write this message to a {@link Swift_InputByteStream}.
+	 */
+	public function toByteStream(Swift_InputByteStream $is)
+	{
+		if (empty($this->headerSigners) && empty($this->bodySigners)) {
+			parent::toByteStream($is);
+
+			return;
+		}
+
+		$this->saveMessage();
+
+		$this->doSign();
+
+		parent::toByteStream($is);
+
+		$this->restoreMessage();
+	}
+
+	public function __wakeup()
+	{
+		Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
+	}
+
+	/**
+	 * loops through signers and apply the signatures.
+	 */
+	protected function doSign()
+	{
+		foreach ($this->bodySigners as $signer) {
+			$altered = $signer->getAlteredHeaders();
+			$this->saveHeaders($altered);
+			$signer->signMessage($this);
+		}
+
+		foreach ($this->headerSigners as $signer) {
+			$altered = $signer->getAlteredHeaders();
+			$this->saveHeaders($altered);
+			$signer->reset();
+
+			$signer->setHeaders($this->getHeaders());
+
+			$signer->startBody();
+			$this->bodyToByteStream($signer);
+			$signer->endBody();
+
+			$signer->addSignature($this->getHeaders());
+		}
+	}
+
+	/**
+	 * save the message before any signature is applied.
+	 */
+	protected function saveMessage()
+	{
+		$this->savedMessage = ['headers' => []];
+		$this->savedMessage['body'] = $this->getBody();
+		$this->savedMessage['children'] = $this->getChildren();
+		if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+			$this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
+			$this->setBody('');
+		}
+	}
+
+	/**
+	 * save the original headers.
+	 */
+	protected function saveHeaders(array $altered)
+	{
+		foreach ($altered as $head) {
+			$lc = strtolower($head ?? '');
+
+			if (!isset($this->savedMessage['headers'][$lc])) {
+				$this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
+			}
+		}
+	}
+
+	/**
+	 * Remove or restore altered headers.
+	 */
+	protected function restoreHeaders()
+	{
+		foreach ($this->savedMessage['headers'] as $name => $savedValue) {
+			$headers = $this->getHeaders()->getAll($name);
+
+			foreach ($headers as $key => $value) {
+				if (!isset($savedValue[$key])) {
+					$this->getHeaders()->remove($name, $key);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Restore message body.
+	 */
+	protected function restoreMessage()
+	{
+		$this->setBody($this->savedMessage['body']);
+		$this->setChildren($this->savedMessage['children']);
+
+		$this->restoreHeaders();
+		$this->savedMessage = [];
+	}
+
+	/**
+	 * Clone Message Signers.
+	 *
+	 * @see Swift_Mime_SimpleMimeEntity::__clone()
+	 */
+	public function __clone()
+	{
+		parent::__clone();
+		foreach ($this->bodySigners as $key => $bodySigner) {
+			$this->bodySigners[$key] = clone $bodySigner;
+		}
+
+		foreach ($this->headerSigners as $key => $headerSigner) {
+			$this->headerSigners[$key] = clone $headerSigner;
+		}
+	}
 }