Dolibarr / dolibarr

htdocs/includes/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php

Indentation +23 added lines, -23 removed lines

@@ -15,29 +15,29 @@
  */
 class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
 {
-    /**
-     * The Exception thrown.
-     *
-     * @var Swift_TransportException
-     */
-    private $exception;
+	/**
+	 * The Exception thrown.
+	 *
+	 * @var Swift_TransportException
+	 */
+	private $exception;
 
-    /**
-     * Create a new TransportExceptionEvent for $transport.
-     */
-    public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
-    {
-        parent::__construct($transport);
-        $this->exception = $ex;
-    }
+	/**
+	 * Create a new TransportExceptionEvent for $transport.
+	 */
+	public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
+	{
+		parent::__construct($transport);
+		$this->exception = $ex;
+	}
 
-    /**
-     * Get the TransportException thrown.
-     *
-     * @return Swift_TransportException
-     */
-    public function getException()
-    {
-        return $this->exception;
-    }
+	/**
+	 * Get the TransportException thrown.
+	 *
+	 * @return Swift_TransportException
+	 */
+	public function getException()
+	{
+		return $this->exception;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Events/SendEvent.php

Indentation +108 added lines, -108 removed lines

@@ -15,112 +15,112 @@
  */
 class Swift_Events_SendEvent extends Swift_Events_EventObject
 {
-    /** Sending has yet to occur */
-    const RESULT_PENDING = 0x0001;
-
-    /** Email is spooled, ready to be sent */
-    const RESULT_SPOOLED = 0x0011;
-
-    /** Sending was successful */
-    const RESULT_SUCCESS = 0x0010;
-
-    /** Sending worked, but there were some failures */
-    const RESULT_TENTATIVE = 0x0100;
-
-    /** Sending failed */
-    const RESULT_FAILED = 0x1000;
-
-    /**
-     * The Message being sent.
-     *
-     * @var Swift_Mime_SimpleMessage
-     */
-    private $message;
-
-    /**
-     * Any recipients which failed after sending.
-     *
-     * @var string[]
-     */
-    private $failedRecipients = [];
-
-    /**
-     * The overall result as a bitmask from the class constants.
-     *
-     * @var int
-     */
-    private $result;
-
-    /**
-     * Create a new SendEvent for $source and $message.
-     */
-    public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
-    {
-        parent::__construct($source);
-        $this->message = $message;
-        $this->result = self::RESULT_PENDING;
-    }
-
-    /**
-     * Get the Transport used to send the Message.
-     *
-     * @return Swift_Transport
-     */
-    public function getTransport()
-    {
-        return $this->getSource();
-    }
-
-    /**
-     * Get the Message being sent.
-     *
-     * @return Swift_Mime_SimpleMessage
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-    /**
-     * Set the array of addresses that failed in sending.
-     *
-     * @param array $recipients
-     */
-    public function setFailedRecipients($recipients)
-    {
-        $this->failedRecipients = $recipients;
-    }
-
-    /**
-     * Get an recipient addresses which were not accepted for delivery.
-     *
-     * @return string[]
-     */
-    public function getFailedRecipients()
-    {
-        return $this->failedRecipients;
-    }
-
-    /**
-     * Set the result of sending.
-     *
-     * @param int $result
-     */
-    public function setResult($result)
-    {
-        $this->result = $result;
-    }
-
-    /**
-     * Get the result of this Event.
-     *
-     * The return value is a bitmask from
-     * {@see RESULT_PENDING, RESULT_SUCCESS, RESULT_TENTATIVE, RESULT_FAILED}
-     *
-     * @return int
-     */
-    public function getResult()
-    {
-        return $this->result;
-    }
+	/** Sending has yet to occur */
+	const RESULT_PENDING = 0x0001;
+
+	/** Email is spooled, ready to be sent */
+	const RESULT_SPOOLED = 0x0011;
+
+	/** Sending was successful */
+	const RESULT_SUCCESS = 0x0010;
+
+	/** Sending worked, but there were some failures */
+	const RESULT_TENTATIVE = 0x0100;
+
+	/** Sending failed */
+	const RESULT_FAILED = 0x1000;
+
+	/**
+	 * The Message being sent.
+	 *
+	 * @var Swift_Mime_SimpleMessage
+	 */
+	private $message;
+
+	/**
+	 * Any recipients which failed after sending.
+	 *
+	 * @var string[]
+	 */
+	private $failedRecipients = [];
+
+	/**
+	 * The overall result as a bitmask from the class constants.
+	 *
+	 * @var int
+	 */
+	private $result;
+
+	/**
+	 * Create a new SendEvent for $source and $message.
+	 */
+	public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
+	{
+		parent::__construct($source);
+		$this->message = $message;
+		$this->result = self::RESULT_PENDING;
+	}
+
+	/**
+	 * Get the Transport used to send the Message.
+	 *
+	 * @return Swift_Transport
+	 */
+	public function getTransport()
+	{
+		return $this->getSource();
+	}
+
+	/**
+	 * Get the Message being sent.
+	 *
+	 * @return Swift_Mime_SimpleMessage
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
+
+	/**
+	 * Set the array of addresses that failed in sending.
+	 *
+	 * @param array $recipients
+	 */
+	public function setFailedRecipients($recipients)
+	{
+		$this->failedRecipients = $recipients;
+	}
+
+	/**
+	 * Get an recipient addresses which were not accepted for delivery.
+	 *
+	 * @return string[]
+	 */
+	public function getFailedRecipients()
+	{
+		return $this->failedRecipients;
+	}
+
+	/**
+	 * Set the result of sending.
+	 *
+	 * @param int $result
+	 */
+	public function setResult($result)
+	{
+		$this->result = $result;
+	}
+
+	/**
+	 * Get the result of this Event.
+	 *
+	 * The return value is a bitmask from
+	 * {@see RESULT_PENDING, RESULT_SUCCESS, RESULT_TENTATIVE, RESULT_FAILED}
+	 *
+	 * @return int
+	 */
+	public function getResult()
+	{
+		return $this->result;
+	}
 }

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

Indentation +14 added lines, -14 removed lines

@@ -15,19 +15,19 @@
  */
 class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
 {
-    /**
-     * Creates a new FailoverTransport with $transports.
-     *
-     * @param Swift_Transport[] $transports
-     */
-    public function __construct($transports = [])
-    {
-        \call_user_func_array(
-            [$this, 'Swift_Transport_FailoverTransport::__construct'],
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('transport.failover')
-            );
+	/**
+	 * Creates a new FailoverTransport with $transports.
+	 *
+	 * @param Swift_Transport[] $transports
+	 */
+	public function __construct($transports = [])
+	{
+		\call_user_func_array(
+			[$this, 'Swift_Transport_FailoverTransport::__construct'],
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('transport.failover')
+			);
 
-        $this->setTransports($transports);
-    }
+		$this->setTransports($transports);
+	}
 }

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

Indentation +369 added lines, -369 removed lines

@@ -15,373 +15,373 @@
  */
 class Swift_DependencyContainer
 {
-    /** Constant for literal value types */
-    const TYPE_VALUE = 0x00001;
-
-    /** Constant for new instance types */
-    const TYPE_INSTANCE = 0x00010;
-
-    /** Constant for shared instance types */
-    const TYPE_SHARED = 0x00100;
-
-    /** Constant for aliases */
-    const TYPE_ALIAS = 0x01000;
-
-    /** Constant for arrays */
-    const TYPE_ARRAY = 0x10000;
-
-    /** Singleton instance */
-    private static $instance = null;
-
-    /** The data container */
-    private $store = [];
-
-    /** The current endpoint in the data container */
-    private $endPoint;
-
-    /**
-     * Constructor should not be used.
-     *
-     * Use {@link getInstance()} instead.
-     */
-    public function __construct()
-    {
-    }
-
-    /**
-     * Returns a singleton of the DependencyContainer.
-     *
-     * @return self
-     */
-    public static function getInstance()
-    {
-        if (!isset(self::$instance)) {
-            self::$instance = new self();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * List the names of all items stored in the Container.
-     *
-     * @return array
-     */
-    public function listItems()
-    {
-        return array_keys($this->store);
-    }
-
-    /**
-     * Test if an item is registered in this container with the given name.
-     *
-     * @see register()
-     *
-     * @param string $itemName
-     *
-     * @return bool
-     */
-    public function has($itemName)
-    {
-        return \array_key_exists($itemName, $this->store)
-            && isset($this->store[$itemName]['lookupType']);
-    }
-
-    /**
-     * Lookup the item with the given $itemName.
-     *
-     * @see register()
-     *
-     * @param string $itemName
-     *
-     * @return mixed
-     *
-     * @throws Swift_DependencyException If the dependency is not found
-     */
-    public function lookup($itemName)
-    {
-        if (!$this->has($itemName)) {
-            throw new Swift_DependencyException('Cannot lookup dependency "'.$itemName.'" since it is not registered.');
-        }
-
-        switch ($this->store[$itemName]['lookupType']) {
-            case self::TYPE_ALIAS:
-                return $this->createAlias($itemName);
-            case self::TYPE_VALUE:
-                return $this->getValue($itemName);
-            case self::TYPE_INSTANCE:
-                return $this->createNewInstance($itemName);
-            case self::TYPE_SHARED:
-                return $this->createSharedInstance($itemName);
-            case self::TYPE_ARRAY:
-                return $this->createDependenciesFor($itemName);
-        }
-    }
-
-    /**
-     * Create an array of arguments passed to the constructor of $itemName.
-     *
-     * @param string $itemName
-     *
-     * @return array
-     */
-    public function createDependenciesFor($itemName)
-    {
-        $args = [];
-        if (isset($this->store[$itemName]['args'])) {
-            $args = $this->resolveArgs($this->store[$itemName]['args']);
-        }
-
-        return $args;
-    }
-
-    /**
-     * Register a new dependency with $itemName.
-     *
-     * This method returns the current DependencyContainer instance because it
-     * requires the use of the fluid interface to set the specific details for the
-     * dependency.
-     *
-     * @see asNewInstanceOf(), asSharedInstanceOf(), asValue()
-     *
-     * @param string $itemName
-     *
-     * @return $this
-     */
-    public function register($itemName)
-    {
-        $this->store[$itemName] = [];
-        $this->endPoint = &$this->store[$itemName];
-
-        return $this;
-    }
-
-    /**
-     * Specify the previously registered item as a literal value.
-     *
-     * {@link register()} must be called before this will work.
-     *
-     * @param mixed $value
-     *
-     * @return $this
-     */
-    public function asValue($value)
-    {
-        $endPoint = &$this->getEndPoint();
-        $endPoint['lookupType'] = self::TYPE_VALUE;
-        $endPoint['value'] = $value;
-
-        return $this;
-    }
-
-    /**
-     * Specify the previously registered item as an alias of another item.
-     *
-     * @param string $lookup
-     *
-     * @return $this
-     */
-    public function asAliasOf($lookup)
-    {
-        $endPoint = &$this->getEndPoint();
-        $endPoint['lookupType'] = self::TYPE_ALIAS;
-        $endPoint['ref'] = $lookup;
-
-        return $this;
-    }
-
-    /**
-     * Specify the previously registered item as a new instance of $className.
-     *
-     * {@link register()} must be called before this will work.
-     * Any arguments can be set with {@link withDependencies()},
-     * {@link addConstructorValue()} or {@link addConstructorLookup()}.
-     *
-     * @see withDependencies(), addConstructorValue(), addConstructorLookup()
-     *
-     * @param string $className
-     *
-     * @return $this
-     */
-    public function asNewInstanceOf($className)
-    {
-        $endPoint = &$this->getEndPoint();
-        $endPoint['lookupType'] = self::TYPE_INSTANCE;
-        $endPoint['className'] = $className;
-
-        return $this;
-    }
-
-    /**
-     * Specify the previously registered item as a shared instance of $className.
-     *
-     * {@link register()} must be called before this will work.
-     *
-     * @param string $className
-     *
-     * @return $this
-     */
-    public function asSharedInstanceOf($className)
-    {
-        $endPoint = &$this->getEndPoint();
-        $endPoint['lookupType'] = self::TYPE_SHARED;
-        $endPoint['className'] = $className;
-
-        return $this;
-    }
-
-    /**
-     * Specify the previously registered item as array of dependencies.
-     *
-     * {@link register()} must be called before this will work.
-     *
-     * @return $this
-     */
-    public function asArray()
-    {
-        $endPoint = &$this->getEndPoint();
-        $endPoint['lookupType'] = self::TYPE_ARRAY;
-
-        return $this;
-    }
-
-    /**
-     * Specify a list of injected dependencies for the previously registered item.
-     *
-     * This method takes an array of lookup names.
-     *
-     * @see addConstructorValue(), addConstructorLookup()
-     *
-     * @return $this
-     */
-    public function withDependencies(array $lookups)
-    {
-        $endPoint = &$this->getEndPoint();
-        $endPoint['args'] = [];
-        foreach ($lookups as $lookup) {
-            $this->addConstructorLookup($lookup);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Specify a literal (non looked up) value for the constructor of the
-     * previously registered item.
-     *
-     * @see withDependencies(), addConstructorLookup()
-     *
-     * @param mixed $value
-     *
-     * @return $this
-     */
-    public function addConstructorValue($value)
-    {
-        $endPoint = &$this->getEndPoint();
-        if (!isset($endPoint['args'])) {
-            $endPoint['args'] = [];
-        }
-        $endPoint['args'][] = ['type' => 'value', 'item' => $value];
-
-        return $this;
-    }
-
-    /**
-     * Specify a dependency lookup for the constructor of the previously
-     * registered item.
-     *
-     * @see withDependencies(), addConstructorValue()
-     *
-     * @param string $lookup
-     *
-     * @return $this
-     */
-    public function addConstructorLookup($lookup)
-    {
-        $endPoint = &$this->getEndPoint();
-        if (!isset($this->endPoint['args'])) {
-            $endPoint['args'] = [];
-        }
-        $endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
-
-        return $this;
-    }
-
-    /** Get the literal value with $itemName */
-    private function getValue($itemName)
-    {
-        return $this->store[$itemName]['value'];
-    }
-
-    /** Resolve an alias to another item */
-    private function createAlias($itemName)
-    {
-        return $this->lookup($this->store[$itemName]['ref']);
-    }
-
-    /** Create a fresh instance of $itemName */
-    private function createNewInstance($itemName)
-    {
-        $reflector = new ReflectionClass($this->store[$itemName]['className']);
-        if ($reflector->getConstructor()) {
-            return $reflector->newInstanceArgs(
-                $this->createDependenciesFor($itemName)
-                );
-        }
-
-        return $reflector->newInstance();
-    }
-
-    /** Create and register a shared instance of $itemName */
-    private function createSharedInstance($itemName)
-    {
-        if (!isset($this->store[$itemName]['instance'])) {
-            $this->store[$itemName]['instance'] = $this->createNewInstance($itemName);
-        }
-
-        return $this->store[$itemName]['instance'];
-    }
-
-    /** Get the current endpoint in the store */
-    private function &getEndPoint()
-    {
-        if (!isset($this->endPoint)) {
-            throw new BadMethodCallException('Component must first be registered by calling register()');
-        }
-
-        return $this->endPoint;
-    }
-
-    /** Get an argument list with dependencies resolved */
-    private function resolveArgs(array $args)
-    {
-        $resolved = [];
-        foreach ($args as $argDefinition) {
-            switch ($argDefinition['type']) {
-                case 'lookup':
-                    $resolved[] = $this->lookupRecursive($argDefinition['item']);
-                    break;
-                case 'value':
-                    $resolved[] = $argDefinition['item'];
-                    break;
-            }
-        }
-
-        return $resolved;
-    }
-
-    /** Resolve a single dependency with an collections */
-    private function lookupRecursive($item)
-    {
-        if (\is_array($item)) {
-            $collection = [];
-            foreach ($item as $k => $v) {
-                $collection[$k] = $this->lookupRecursive($v);
-            }
-
-            return $collection;
-        }
-
-        return $this->lookup($item);
-    }
+	/** Constant for literal value types */
+	const TYPE_VALUE = 0x00001;
+
+	/** Constant for new instance types */
+	const TYPE_INSTANCE = 0x00010;
+
+	/** Constant for shared instance types */
+	const TYPE_SHARED = 0x00100;
+
+	/** Constant for aliases */
+	const TYPE_ALIAS = 0x01000;
+
+	/** Constant for arrays */
+	const TYPE_ARRAY = 0x10000;
+
+	/** Singleton instance */
+	private static $instance = null;
+
+	/** The data container */
+	private $store = [];
+
+	/** The current endpoint in the data container */
+	private $endPoint;
+
+	/**
+	 * Constructor should not be used.
+	 *
+	 * Use {@link getInstance()} instead.
+	 */
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Returns a singleton of the DependencyContainer.
+	 *
+	 * @return self
+	 */
+	public static function getInstance()
+	{
+		if (!isset(self::$instance)) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * List the names of all items stored in the Container.
+	 *
+	 * @return array
+	 */
+	public function listItems()
+	{
+		return array_keys($this->store);
+	}
+
+	/**
+	 * Test if an item is registered in this container with the given name.
+	 *
+	 * @see register()
+	 *
+	 * @param string $itemName
+	 *
+	 * @return bool
+	 */
+	public function has($itemName)
+	{
+		return \array_key_exists($itemName, $this->store)
+			&& isset($this->store[$itemName]['lookupType']);
+	}
+
+	/**
+	 * Lookup the item with the given $itemName.
+	 *
+	 * @see register()
+	 *
+	 * @param string $itemName
+	 *
+	 * @return mixed
+	 *
+	 * @throws Swift_DependencyException If the dependency is not found
+	 */
+	public function lookup($itemName)
+	{
+		if (!$this->has($itemName)) {
+			throw new Swift_DependencyException('Cannot lookup dependency "'.$itemName.'" since it is not registered.');
+		}
+
+		switch ($this->store[$itemName]['lookupType']) {
+			case self::TYPE_ALIAS:
+				return $this->createAlias($itemName);
+			case self::TYPE_VALUE:
+				return $this->getValue($itemName);
+			case self::TYPE_INSTANCE:
+				return $this->createNewInstance($itemName);
+			case self::TYPE_SHARED:
+				return $this->createSharedInstance($itemName);
+			case self::TYPE_ARRAY:
+				return $this->createDependenciesFor($itemName);
+		}
+	}
+
+	/**
+	 * Create an array of arguments passed to the constructor of $itemName.
+	 *
+	 * @param string $itemName
+	 *
+	 * @return array
+	 */
+	public function createDependenciesFor($itemName)
+	{
+		$args = [];
+		if (isset($this->store[$itemName]['args'])) {
+			$args = $this->resolveArgs($this->store[$itemName]['args']);
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Register a new dependency with $itemName.
+	 *
+	 * This method returns the current DependencyContainer instance because it
+	 * requires the use of the fluid interface to set the specific details for the
+	 * dependency.
+	 *
+	 * @see asNewInstanceOf(), asSharedInstanceOf(), asValue()
+	 *
+	 * @param string $itemName
+	 *
+	 * @return $this
+	 */
+	public function register($itemName)
+	{
+		$this->store[$itemName] = [];
+		$this->endPoint = &$this->store[$itemName];
+
+		return $this;
+	}
+
+	/**
+	 * Specify the previously registered item as a literal value.
+	 *
+	 * {@link register()} must be called before this will work.
+	 *
+	 * @param mixed $value
+	 *
+	 * @return $this
+	 */
+	public function asValue($value)
+	{
+		$endPoint = &$this->getEndPoint();
+		$endPoint['lookupType'] = self::TYPE_VALUE;
+		$endPoint['value'] = $value;
+
+		return $this;
+	}
+
+	/**
+	 * Specify the previously registered item as an alias of another item.
+	 *
+	 * @param string $lookup
+	 *
+	 * @return $this
+	 */
+	public function asAliasOf($lookup)
+	{
+		$endPoint = &$this->getEndPoint();
+		$endPoint['lookupType'] = self::TYPE_ALIAS;
+		$endPoint['ref'] = $lookup;
+
+		return $this;
+	}
+
+	/**
+	 * Specify the previously registered item as a new instance of $className.
+	 *
+	 * {@link register()} must be called before this will work.
+	 * Any arguments can be set with {@link withDependencies()},
+	 * {@link addConstructorValue()} or {@link addConstructorLookup()}.
+	 *
+	 * @see withDependencies(), addConstructorValue(), addConstructorLookup()
+	 *
+	 * @param string $className
+	 *
+	 * @return $this
+	 */
+	public function asNewInstanceOf($className)
+	{
+		$endPoint = &$this->getEndPoint();
+		$endPoint['lookupType'] = self::TYPE_INSTANCE;
+		$endPoint['className'] = $className;
+
+		return $this;
+	}
+
+	/**
+	 * Specify the previously registered item as a shared instance of $className.
+	 *
+	 * {@link register()} must be called before this will work.
+	 *
+	 * @param string $className
+	 *
+	 * @return $this
+	 */
+	public function asSharedInstanceOf($className)
+	{
+		$endPoint = &$this->getEndPoint();
+		$endPoint['lookupType'] = self::TYPE_SHARED;
+		$endPoint['className'] = $className;
+
+		return $this;
+	}
+
+	/**
+	 * Specify the previously registered item as array of dependencies.
+	 *
+	 * {@link register()} must be called before this will work.
+	 *
+	 * @return $this
+	 */
+	public function asArray()
+	{
+		$endPoint = &$this->getEndPoint();
+		$endPoint['lookupType'] = self::TYPE_ARRAY;
+
+		return $this;
+	}
+
+	/**
+	 * Specify a list of injected dependencies for the previously registered item.
+	 *
+	 * This method takes an array of lookup names.
+	 *
+	 * @see addConstructorValue(), addConstructorLookup()
+	 *
+	 * @return $this
+	 */
+	public function withDependencies(array $lookups)
+	{
+		$endPoint = &$this->getEndPoint();
+		$endPoint['args'] = [];
+		foreach ($lookups as $lookup) {
+			$this->addConstructorLookup($lookup);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Specify a literal (non looked up) value for the constructor of the
+	 * previously registered item.
+	 *
+	 * @see withDependencies(), addConstructorLookup()
+	 *
+	 * @param mixed $value
+	 *
+	 * @return $this
+	 */
+	public function addConstructorValue($value)
+	{
+		$endPoint = &$this->getEndPoint();
+		if (!isset($endPoint['args'])) {
+			$endPoint['args'] = [];
+		}
+		$endPoint['args'][] = ['type' => 'value', 'item' => $value];
+
+		return $this;
+	}
+
+	/**
+	 * Specify a dependency lookup for the constructor of the previously
+	 * registered item.
+	 *
+	 * @see withDependencies(), addConstructorValue()
+	 *
+	 * @param string $lookup
+	 *
+	 * @return $this
+	 */
+	public function addConstructorLookup($lookup)
+	{
+		$endPoint = &$this->getEndPoint();
+		if (!isset($this->endPoint['args'])) {
+			$endPoint['args'] = [];
+		}
+		$endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
+
+		return $this;
+	}
+
+	/** Get the literal value with $itemName */
+	private function getValue($itemName)
+	{
+		return $this->store[$itemName]['value'];
+	}
+
+	/** Resolve an alias to another item */
+	private function createAlias($itemName)
+	{
+		return $this->lookup($this->store[$itemName]['ref']);
+	}
+
+	/** Create a fresh instance of $itemName */
+	private function createNewInstance($itemName)
+	{
+		$reflector = new ReflectionClass($this->store[$itemName]['className']);
+		if ($reflector->getConstructor()) {
+			return $reflector->newInstanceArgs(
+				$this->createDependenciesFor($itemName)
+				);
+		}
+
+		return $reflector->newInstance();
+	}
+
+	/** Create and register a shared instance of $itemName */
+	private function createSharedInstance($itemName)
+	{
+		if (!isset($this->store[$itemName]['instance'])) {
+			$this->store[$itemName]['instance'] = $this->createNewInstance($itemName);
+		}
+
+		return $this->store[$itemName]['instance'];
+	}
+
+	/** Get the current endpoint in the store */
+	private function &getEndPoint()
+	{
+		if (!isset($this->endPoint)) {
+			throw new BadMethodCallException('Component must first be registered by calling register()');
+		}
+
+		return $this->endPoint;
+	}
+
+	/** Get an argument list with dependencies resolved */
+	private function resolveArgs(array $args)
+	{
+		$resolved = [];
+		foreach ($args as $argDefinition) {
+			switch ($argDefinition['type']) {
+				case 'lookup':
+					$resolved[] = $this->lookupRecursive($argDefinition['item']);
+					break;
+				case 'value':
+					$resolved[] = $argDefinition['item'];
+					break;
+			}
+		}
+
+		return $resolved;
+	}
+
+	/** Resolve a single dependency with an collections */
+	private function lookupRecursive($item)
+	{
+		if (\is_array($item)) {
+			$collection = [];
+			foreach ($item as $k => $v) {
+				$collection[$k] = $this->lookupRecursive($v);
+			}
+
+			return $collection;
+		}
+
+		return $this->lookup($item);
+	}
 }

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

Indentation +8 added lines, -8 removed lines

@@ -15,12 +15,12 @@
  */
 class Swift_NullTransport extends Swift_Transport_NullTransport
 {
-    public function __construct()
-    {
-        \call_user_func_array(
-            [$this, 'Swift_Transport_NullTransport::__construct'],
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('transport.null')
-        );
-    }
+	public function __construct()
+	{
+		\call_user_func_array(
+			[$this, 'Swift_Transport_NullTransport::__construct'],
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('transport.null')
+		);
+	}
 }

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

Indentation +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@
  */
 interface Swift_FileStream extends Swift_OutputByteStream
 {
-    /**
-     * Get the complete path to the file.
-     *
-     * @return string
-     */
-    public function getPath();
+	/**
+	 * Get the complete path to the file.
+	 *
+	 * @return string
+	 */
+	public function getPath();
 }

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

Indentation +24 added lines, -24 removed lines

@@ -18,29 +18,29 @@
  */
 interface Swift_OutputByteStream
 {
-    /**
-     * 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
-     *
-     * @throws Swift_IoException
-     *
-     * @return string|bool
-     */
-    public function read($length);
+	/**
+	 * 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
+	 *
+	 * @throws Swift_IoException
+	 *
+	 * @return string|bool
+	 */
+	public function read($length);
 
-    /**
-     * Move the internal read pointer to $byteOffset in the stream.
-     *
-     * @param int $byteOffset
-     *
-     * @throws Swift_IoException
-     *
-     * @return bool
-     */
-    public function setReadPointer($byteOffset);
+	/**
+	 * Move the internal read pointer to $byteOffset in the stream.
+	 *
+	 * @param int $byteOffset
+	 *
+	 * @throws Swift_IoException
+	 *
+	 * @return bool
+	 */
+	public function setReadPointer($byteOffset);
 }

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

Indentation +8 added lines, -8 removed lines

@@ -15,12 +15,12 @@
  */
 interface Swift_CharacterReaderFactory
 {
-    /**
-     * Returns a CharacterReader suitable for the charset applied.
-     *
-     * @param string $charset
-     *
-     * @return Swift_CharacterReader
-     */
-    public function getReaderFor($charset);
+	/**
+	 * Returns a CharacterReader suitable for the charset applied.
+	 *
+	 * @param string $charset
+	 *
+	 * @return Swift_CharacterReader
+	 */
+	public function getReaderFor($charset);
 }

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

Indentation +77 added lines, -77 removed lines

@@ -15,90 +15,90 @@
  */
 interface Swift_KeyCache
 {
-    /** Mode for replacing existing cached data */
-    const MODE_WRITE = 1;
+	/** Mode for replacing existing cached data */
+	const MODE_WRITE = 1;
 
-    /** Mode for appending data to the end of existing cached data */
-    const MODE_APPEND = 2;
+	/** Mode for appending data to the end of existing cached data */
+	const MODE_APPEND = 2;
 
-    /**
-     * Set a string into the cache under $itemKey for the namespace $nsKey.
-     *
-     * @see MODE_WRITE, MODE_APPEND
-     *
-     * @param string $nsKey
-     * @param string $itemKey
-     * @param string $string
-     * @param int    $mode
-     */
-    public function setString($nsKey, $itemKey, $string, $mode);
+	/**
+	 * Set a string into the cache under $itemKey for the namespace $nsKey.
+	 *
+	 * @see MODE_WRITE, MODE_APPEND
+	 *
+	 * @param string $nsKey
+	 * @param string $itemKey
+	 * @param string $string
+	 * @param int    $mode
+	 */
+	public function setString($nsKey, $itemKey, $string, $mode);
 
-    /**
-     * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
-     *
-     * @see MODE_WRITE, MODE_APPEND
-     *
-     * @param string $nsKey
-     * @param string $itemKey
-     * @param int    $mode
-     */
-    public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
+	/**
+	 * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+	 *
+	 * @see MODE_WRITE, MODE_APPEND
+	 *
+	 * @param string $nsKey
+	 * @param string $itemKey
+	 * @param int    $mode
+	 */
+	public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
 
-    /**
-     * Provides a ByteStream which when written to, writes data to $itemKey.
-     *
-     * NOTE: The stream will always write in append mode.
-     * If the optional third parameter is passed all writes will go through $is.
-     *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $is      optional input stream
-     *
-     * @return Swift_InputByteStream
-     */
-    public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $is = null);
+	/**
+	 * Provides a ByteStream which when written to, writes data to $itemKey.
+	 *
+	 * NOTE: The stream will always write in append mode.
+	 * If the optional third parameter is passed all writes will go through $is.
+	 *
+	 * @param string                $nsKey
+	 * @param string                $itemKey
+	 * @param Swift_InputByteStream $is      optional input stream
+	 *
+	 * @return Swift_InputByteStream
+	 */
+	public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $is = null);
 
-    /**
-     * Get data back out of the cache as a string.
-     *
-     * @param string $nsKey
-     * @param string $itemKey
-     *
-     * @return string
-     */
-    public function getString($nsKey, $itemKey);
+	/**
+	 * Get data back out of the cache as a string.
+	 *
+	 * @param string $nsKey
+	 * @param string $itemKey
+	 *
+	 * @return string
+	 */
+	public function getString($nsKey, $itemKey);
 
-    /**
-     * Get data back out of the cache as a ByteStream.
-     *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $is      stream to write the data to
-     */
-    public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is);
+	/**
+	 * Get data back out of the cache as a ByteStream.
+	 *
+	 * @param string                $nsKey
+	 * @param string                $itemKey
+	 * @param Swift_InputByteStream $is      stream to write the data to
+	 */
+	public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is);
 
-    /**
-     * Check if the given $itemKey exists in the namespace $nsKey.
-     *
-     * @param string $nsKey
-     * @param string $itemKey
-     *
-     * @return bool
-     */
-    public function hasKey($nsKey, $itemKey);
+	/**
+	 * Check if the given $itemKey exists in the namespace $nsKey.
+	 *
+	 * @param string $nsKey
+	 * @param string $itemKey
+	 *
+	 * @return bool
+	 */
+	public function hasKey($nsKey, $itemKey);
 
-    /**
-     * Clear data for $itemKey in the namespace $nsKey if it exists.
-     *
-     * @param string $nsKey
-     * @param string $itemKey
-     */
-    public function clearKey($nsKey, $itemKey);
+	/**
+	 * Clear data for $itemKey in the namespace $nsKey if it exists.
+	 *
+	 * @param string $nsKey
+	 * @param string $itemKey
+	 */
+	public function clearKey($nsKey, $itemKey);
 
-    /**
-     * Clear all data in the namespace $nsKey if it exists.
-     *
-     * @param string $nsKey
-     */
-    public function clearAll($nsKey);
+	/**
+	 * Clear all data in the namespace $nsKey if it exists.
+	 *
+	 * @param string $nsKey
+	 */
+	public function clearAll($nsKey);
 }