class + NotSupportedException extends RuntimeException implements + Exception
+ +Should be used when a driver does not support an operation.
++
+diff --git a/vendor/autoload.php b/vendor/autoload.php
index c6bd4b914d..dd4c555f43 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitf4df0055480c4a6738498545f1ec0cfd::getLoader();
+return ComposerAutoloaderInitbbdc7dea11a66b6e7562e6c0fd58031a::getLoader();
diff --git a/vendor/bin/generate_vcards b/vendor/bin/generate_vcards
new file mode 120000
index 0000000000..cb76da13a1
--- /dev/null
+++ b/vendor/bin/generate_vcards
@@ -0,0 +1 @@
+../sabre/vobject/bin/generate_vcards
\ No newline at end of file
diff --git a/vendor/bin/vobject b/vendor/bin/vobject
new file mode 120000
index 0000000000..f5b111eacd
--- /dev/null
+++ b/vendor/bin/vobject
@@ -0,0 +1 @@
+../sabre/vobject/bin/vobject
\ No newline at end of file
diff --git a/vendor/chamilo/chash/src/Chash/Command/Installation/CommonCommand.php b/vendor/chamilo/chash/src/Chash/Command/Installation/CommonCommand.php
index 0dcb9893c9..f123eacb64 100644
--- a/vendor/chamilo/chash/src/Chash/Command/Installation/CommonCommand.php
+++ b/vendor/chamilo/chash/src/Chash/Command/Installation/CommonCommand.php
@@ -30,16 +30,16 @@ class CommonCommand extends AbstractCommand
private $migrationConfigurationFile;
/**
- * @param array $configuration
- */
+ * @param array $configuration
+ */
public function setConfigurationArray(array $configuration)
{
$this->configuration = $configuration;
}
/**
- * @return array
- */
+ * @return array
+ */
public function getConfigurationArray()
{
return $this->configuration;
@@ -116,8 +116,8 @@ class CommonCommand extends AbstractCommand
}
/**
- * @param array $databaseSettings
- */
+ * @param array $databaseSettings
+ */
public function setExtraDatabaseSettings(array $databaseSettings)
{
$this->extraDatabaseSettings = $databaseSettings;
@@ -503,8 +503,8 @@ class CommonCommand extends AbstractCommand
'parent' => '1.9.0'
),
'1.9.x' => array(
- 'require_update' => false,
- 'parent' => '1.9.0'
+ 'require_update' => false,
+ 'parent' => '1.9.0'
),
'1.10.0' => array(
'require_update' => true,
diff --git a/vendor/chamilo/chash/src/Chash/Command/Installation/InstallCommand.php b/vendor/chamilo/chash/src/Chash/Command/Installation/InstallCommand.php
index 9cc3766079..73ccc5ed3d 100644
--- a/vendor/chamilo/chash/src/Chash/Command/Installation/InstallCommand.php
+++ b/vendor/chamilo/chash/src/Chash/Command/Installation/InstallCommand.php
@@ -379,7 +379,6 @@ class InstallCommand extends CommonCommand
// Generating config files (auth, profile, etc)
$this->generateConfFiles($output);
- $this->writeHtaccess($path);
$output->writeln("
<?php
require_once 'vendor/autoload.php';
@@ -71,7 +71,10 @@ echo $response->getBody();
// >>> {"type":"User", ...
echo $response->getHeader('Content-Length');
// >>> 792
+
+ <?php
// Create a client to work with the Twitter API
$client = new Client('https://api.twitter.com/{version}', array(
'version' => '1.1'
diff --git a/vendor/guzzle/guzzle/docs/conf.py b/vendor/guzzle/guzzle/docs/conf.py
index 895886d241..92bc46bb5e 100644
--- a/vendor/guzzle/guzzle/docs/conf.py
+++ b/vendor/guzzle/guzzle/docs/conf.py
@@ -45,7 +45,6 @@ htmlhelp_basename = 'Guzzledoc'
sys.path.insert(0, '/Users/dowling/projects/guzzle_sphinx_theme')
import guzzle_sphinx_theme
-pygments_style = 'guzzle_sphinx_theme.GuzzleStyle'
html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
html_theme_path = guzzle_sphinx_theme.html_theme_path()
html_theme = 'guzzle_sphinx_theme'
diff --git a/vendor/guzzle/guzzle/docs/getting-started/installation.rst b/vendor/guzzle/guzzle/docs/getting-started/installation.rst
index 7d522919b1..77d4001312 100644
--- a/vendor/guzzle/guzzle/docs/getting-started/installation.rst
+++ b/vendor/guzzle/guzzle/docs/getting-started/installation.rst
@@ -24,7 +24,7 @@ project.
curl -sS https://getcomposer.org/installer | php
# Add Guzzle as a dependency
- php composer.phar require guzzle/guzzle:~3.7
+ php composer.phar require guzzle/guzzle:~3.9
After installing, you need to require Composer's autoloader:
@@ -115,7 +115,7 @@ You can install a specific version of Guzzle by providing a version number suffi
.. code-block:: bash
- pear install guzzle/guzzle-3.7.0
+ pear install guzzle/guzzle-3.9.0
Contributing to Guzzle
----------------------
diff --git a/vendor/guzzle/guzzle/docs/http-client/client.rst b/vendor/guzzle/guzzle/docs/http-client/client.rst
index d344a96e07..723d729dbb 100644
--- a/vendor/guzzle/guzzle/docs/http-client/client.rst
+++ b/vendor/guzzle/guzzle/docs/http-client/client.rst
@@ -405,7 +405,7 @@ cert
The `cert` option lets you specify a PEM formatted SSL client certificate to use with servers that require one. If the
certificate requires a password, provide an array with the password as the second item.
-This would typically be used in conjuction with the `ssl_key` option.
+This would typically be used in conjunction with the `ssl_key` option.
.. code-block:: php
@@ -423,7 +423,7 @@ ssl_key
The `ssl_key` option lets you specify a file containing your PEM formatted private key, optionally protected by a password.
Note: your password is sensitive, keep the PHP script containing it safe.
-This would typically be used in conjuction with the `cert` option.
+This would typically be used in conjunction with the `cert` option.
.. code-block:: php
diff --git a/vendor/guzzle/guzzle/docs/http-client/request.rst b/vendor/guzzle/guzzle/docs/http-client/request.rst
index a0593c915e..a8387a915a 100644
--- a/vendor/guzzle/guzzle/docs/http-client/request.rst
+++ b/vendor/guzzle/guzzle/docs/http-client/request.rst
@@ -590,7 +590,7 @@ Connection problems and cURL specific errors can also occur when transferring re
encounters cURL specific errors while transferring a single request, a ``Guzzle\Http\Exception\CurlException`` is
thrown with an informative error message and access to the cURL error message.
-A ``Guzzle\Common\Exception\MultiTransferException`` exception is thrown when a cURL specific error occurs while
+A ``Guzzle\Http\Exception\MultiTransferException`` exception is thrown when a cURL specific error occurs while
transferring multiple requests in parallel. You can then iterate over all of the exceptions encountered during the
transfer.
diff --git a/vendor/guzzle/guzzle/docs/iterators/guzzle-iterators.rst b/vendor/guzzle/guzzle/docs/iterators/guzzle-iterators.rst
index 1c56ec0c56..a5c7fd33ff 100644
--- a/vendor/guzzle/guzzle/docs/iterators/guzzle-iterators.rst
+++ b/vendor/guzzle/guzzle/docs/iterators/guzzle-iterators.rst
@@ -17,7 +17,7 @@ pulling out chunks of values from the inner iterator.
use Guzzle\Iterator\ChunkedIterator;
$inner = new ArrayIterator(range(0, 8));
- $chunkedIterator = new ChunkedIterator($inner, 10);
+ $chunkedIterator = new ChunkedIterator($inner, 2);
foreach ($chunkedIterator as $chunk) {
echo implode(', ', $chunk) . "\n";
@@ -63,7 +63,7 @@ This iterator modifies the values of the inner iterator before yielding.
use Guzzle\Iterator\MapIterator;
- $innner = new ArrayIterator(range(0, 3));
+ $inner = new ArrayIterator(range(0, 3));
$mapIterator = new MapIterator($inner, function ($value) {
return $value * 10;
diff --git a/vendor/guzzle/guzzle/docs/webservice-client/guzzle-service-descriptions.rst b/vendor/guzzle/guzzle/docs/webservice-client/guzzle-service-descriptions.rst
index b1901fc7d7..a91b69c4ab 100644
--- a/vendor/guzzle/guzzle/docs/webservice-client/guzzle-service-descriptions.rst
+++ b/vendor/guzzle/guzzle/docs/webservice-client/guzzle-service-descriptions.rst
@@ -216,7 +216,7 @@ Here's a very simple example of implementing a custom responseClass object.
public static function fromCommand(OperationCommand $command)
{
$response = $command->getResponse();
- $xml = $command->xml();
+ $xml = $response->xml();
return new self((string) $xml->name);
}
diff --git a/vendor/guzzle/guzzle/phar-stub.php b/vendor/guzzle/guzzle/phar-stub.php
index cc2b53f4f0..504dfe0786 100644
--- a/vendor/guzzle/guzzle/phar-stub.php
+++ b/vendor/guzzle/guzzle/phar-stub.php
@@ -13,4 +13,16 @@ $classLoader->registerNamespaces(array(
));
$classLoader->register();
+// Copy the cacert.pem file from the phar if it is not in the temp folder.
+$from = 'phar://guzzle.phar/src/Guzzle/Http/Resources/cacert.pem';
+$certFile = sys_get_temp_dir() . '/guzzle-cacert.pem';
+
+// Only copy when the file size is different
+if (!file_exists($certFile) || filesize($certFile) != filesize($from)) {
+ if (!copy($from, $certFile)) {
+ throw new RuntimeException("Could not copy {$from} to {$certFile}: "
+ . var_export(error_get_last(), true));
+ }
+}
+
__HALT_COMPILER();
diff --git a/vendor/guzzle/guzzle/phing/imports/deploy.xml b/vendor/guzzle/guzzle/phing/imports/deploy.xml
index 8476132e78..109e5ec4f4 100644
--- a/vendor/guzzle/guzzle/phing/imports/deploy.xml
+++ b/vendor/guzzle/guzzle/phing/imports/deploy.xml
@@ -5,8 +5,9 @@
+
-
+
On branch ${head}
@@ -127,7 +128,6 @@
-
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Common/Version.php b/vendor/guzzle/guzzle/src/Guzzle/Common/Version.php
index 4f5147f7aa..0de1414fe2 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Common/Version.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Common/Version.php
@@ -7,7 +7,7 @@ namespace Guzzle\Common;
*/
class Version
{
- const VERSION = '3.8.1';
+ const VERSION = '3.9.0';
/**
* @var bool Set this value to true to enable warnings for deprecated functionality use. This should be on in your
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Client.php b/vendor/guzzle/guzzle/src/Guzzle/Http/Client.php
index 3bda450e19..22df2ec6e2 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Client.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/Client.php
@@ -30,6 +30,8 @@ class Client extends AbstractHasDispatcher implements ClientInterface
const CURL_OPTIONS = 'curl.options';
const SSL_CERT_AUTHORITY = 'ssl.certificate_authority';
const DISABLE_REDIRECTS = RedirectPlugin::DISABLE;
+ const DEFAULT_SELECT_TIMEOUT = 1.0;
+ const MAX_HANDLES = 3;
/** @var Collection Default HTTP headers to set on each request */
protected $defaultHeaders;
@@ -177,7 +179,7 @@ class Client extends AbstractHasDispatcher implements ClientInterface
} else {
list($uri, $templateVars) = $uri;
}
- if (substr($uri, 0, 4) === 'http') {
+ if (strpos($uri, '://')) {
// Use absolute URLs as-is
$url = $this->expandTemplate($uri, $templateVars);
} else {
@@ -306,7 +308,10 @@ class Client extends AbstractHasDispatcher implements ClientInterface
public function getCurlMulti()
{
if (!$this->curlMulti) {
- $this->curlMulti = new CurlMultiProxy();
+ $this->curlMulti = new CurlMultiProxy(
+ self::MAX_HANDLES,
+ $this->getConfig('select_timeout') ?: self::DEFAULT_SELECT_TIMEOUT
+ );
}
return $this->curlMulti;
@@ -333,31 +338,6 @@ class Client extends AbstractHasDispatcher implements ClientInterface
return $this;
}
- /**
- * Copy the cacert.pem file from the phar if it is not in the temp folder and validate the MD5 checksum
- *
- * @param bool $md5Check Set to false to not perform the MD5 validation
- *
- * @return string Returns the path to the extracted cacert
- * @throws RuntimeException if the file cannot be copied or there is a MD5 mismatch
- */
- public function preparePharCacert($md5Check = true)
- {
- $from = __DIR__ . '/Resources/cacert.pem';
- $certFile = sys_get_temp_dir() . '/guzzle-cacert.pem';
- if (!file_exists($certFile) && !copy($from, $certFile)) {
- throw new RuntimeException("Could not copy {$from} to {$certFile}: " . var_export(error_get_last(), true));
- } elseif ($md5Check) {
- $actualMd5 = md5_file($certFile);
- $expectedMd5 = trim(file_get_contents("{$from}.md5"));
- if ($actualMd5 != $expectedMd5) {
- throw new RuntimeException("{$certFile} MD5 mismatch: expected {$expectedMd5} but got {$actualMd5}");
- }
- }
-
- return $certFile;
- }
-
/**
* Expand a URI template while merging client config settings into the template variables
*
@@ -457,7 +437,9 @@ class Client extends AbstractHasDispatcher implements ClientInterface
*/
protected function initSsl()
{
- if ('system' == ($authority = $this->config[self::SSL_CERT_AUTHORITY])) {
+ $authority = $this->config[self::SSL_CERT_AUTHORITY];
+
+ if ($authority === 'system') {
return;
}
@@ -466,13 +448,7 @@ class Client extends AbstractHasDispatcher implements ClientInterface
}
if ($authority === true && substr(__FILE__, 0, 7) == 'phar://') {
- $authority = $this->preparePharCacert();
- $that = $this;
- $this->getEventDispatcher()->addListener('request.before_send', function ($event) use ($authority, $that) {
- if ($authority == $event['request']->getCurlOptions()->get(CURLOPT_CAINFO)) {
- $that->preparePharCacert(false);
- }
- });
+ $authority = sys_get_temp_dir() . '/guzzle-cacert.pem';
}
$this->setSslVerification($authority);
@@ -503,4 +479,12 @@ class Client extends AbstractHasDispatcher implements ClientInterface
return $this;
}
+
+ /**
+ * @deprecated
+ */
+ public function preparePharCacert($md5Check = true)
+ {
+ return sys_get_temp_dir() . '/guzzle-cacert.pem';
+ }
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php b/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php
index f09ca0cac8..e8301be340 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMulti.php
@@ -39,8 +39,12 @@ class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
CURLM_INTERNAL_ERROR => array('CURLM_INTERNAL_ERROR', 'This can only be returned if libcurl bugs. Please report it to us!')
);
- public function __construct()
+ /** @var float */
+ protected $selectTimeout;
+
+ public function __construct($selectTimeout = 1.0)
{
+ $this->selectTimeout = $selectTimeout;
$this->multiHandle = curl_multi_init();
// @codeCoverageIgnoreStart
if ($this->multiHandle === false) {
@@ -229,7 +233,7 @@ class CurlMulti extends AbstractHasDispatcher implements CurlMultiInterface
// Perform a usleep if a select returns -1: https://bugs.php.net/bug.php?id=61141
usleep(150);
}
- $selectTimeout = 1;
+ $selectTimeout = $this->selectTimeout;
} while ($active);
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMultiProxy.php b/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMultiProxy.php
index 665f029a79..c5b80a7f57 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMultiProxy.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/Curl/CurlMultiProxy.php
@@ -15,13 +15,16 @@ class CurlMultiProxy extends AbstractHasDispatcher implements CurlMultiInterface
protected $groups = array();
protected $queued = array();
protected $maxHandles;
+ protected $selectTimeout;
/**
- * @param int $maxHandles The maximum number of idle CurlMulti handles to allow to remain open
+ * @param int $maxHandles The maximum number of idle CurlMulti handles to allow to remain open
+ * @param float $selectTimeout timeout for curl_multi_select
*/
- public function __construct($maxHandles = 3)
+ public function __construct($maxHandles = 3, $selectTimeout = 1.0)
{
$this->maxHandles = $maxHandles;
+ $this->selectTimeout = $selectTimeout;
// You can get some weird "Too many open files" errors when sending a large amount of requests in parallel.
// These two statements autoload classes before a system runs out of file descriptors so that you can get back
// valuable error messages if you run out.
@@ -122,7 +125,7 @@ class CurlMultiProxy extends AbstractHasDispatcher implements CurlMultiInterface
}
// All are claimed, so create one
- $handle = new CurlMulti();
+ $handle = new CurlMulti($this->selectTimeout);
$handle->setEventDispatcher($this->getEventDispatcher());
$this->handles[] = $handle;
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Message/Request.php b/vendor/guzzle/guzzle/src/Guzzle/Http/Message/Request.php
index 3d487fee36..f218cd5ce9 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Message/Request.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/Message/Request.php
@@ -275,7 +275,7 @@ class Request extends AbstractMessage implements RequestInterface
// Include the port in the Host header if it is not the default port for the scheme of the URL
$scheme = $this->url->getScheme();
- if (($scheme == 'http' && $port != 80) || ($scheme == 'https' && $port != 443)) {
+ if ($port && (($scheme == 'http' && $port != 80) || ($scheme == 'https' && $port != 443))) {
$this->headers['host'] = $this->headerFactory->createHeader('Host', $this->url->getHost() . ':' . $port);
} else {
$this->headers['host'] = $this->headerFactory->createHeader('Host', $this->url->getHost());
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/QueryString.php b/vendor/guzzle/guzzle/src/Guzzle/Http/QueryString.php
index c657db09d1..38a2640738 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/QueryString.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/QueryString.php
@@ -3,6 +3,7 @@
namespace Guzzle\Http;
use Guzzle\Common\Collection;
+use Guzzle\Common\Exception\RuntimeException;
use Guzzle\Http\QueryAggregator\DuplicateAggregator;
use Guzzle\Http\QueryAggregator\QueryAggregatorInterface;
use Guzzle\Http\QueryAggregator\PhpAggregator;
@@ -70,7 +71,8 @@ class QueryString extends Collection
$q[$key] = $value;
}
} else {
- $q->add($key, self::BLANK);
+ // Uses false by default to represent keys with no trailing "=" sign.
+ $q->add($key, false);
}
}
@@ -86,6 +88,7 @@ class QueryString extends Collection
* Convert the query string parameters to a query string string
*
* @return string
+ * @throws RuntimeException
*/
public function __toString()
{
@@ -93,21 +96,12 @@ class QueryString extends Collection
return '';
}
- $queryString = '';
-
+ $queryList = array();
foreach ($this->prepareData($this->data) as $name => $value) {
- foreach ((array) $value as $v) {
- if ($queryString) {
- $queryString .= $this->fieldSeparator;
- }
- $queryString .= $name;
- if ($v !== self::BLANK) {
- $queryString .= $this->valueSeparator . $v;
- }
- }
+ $queryList[] = $this->convertKvp($name, $value);
}
- return $queryString;
+ return implode($this->fieldSeparator, $queryList);
}
/**
@@ -264,7 +258,10 @@ class QueryString extends Collection
$temp = array();
foreach ($data as $key => $value) {
- if (is_array($value)) {
+ if ($value === false || $value === null) {
+ // False and null will not include the "=". Use an empty string to include the "=".
+ $temp[$this->encodeValue($key)] = $value;
+ } elseif (is_array($value)) {
$temp = array_merge($temp, $this->aggregator->aggregate($key, $value, $this));
} else {
$temp[$this->encodeValue($key)] = $this->encodeValue($value);
@@ -273,4 +270,28 @@ class QueryString extends Collection
return $temp;
}
+
+ /**
+ * Converts a key value pair that can contain strings, nulls, false, or arrays
+ * into a single string.
+ *
+ * @param string $name Name of the field
+ * @param mixed $value Value of the field
+ * @return string
+ */
+ private function convertKvp($name, $value)
+ {
+ if ($value === self::BLANK || $value === null || $value === false) {
+ return $name;
+ } elseif (!is_array($value)) {
+ return $name . $this->valueSeparator . $value;
+ }
+
+ $result = '';
+ foreach ($value as $v) {
+ $result .= $this->convertKvp($name, $v) . $this->fieldSeparator;
+ }
+
+ return rtrim($result, $this->fieldSeparator);
+ }
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem b/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem
index 93d3d2dbf4..67f696abc4 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem
@@ -1,12 +1,12 @@
##
## ca-bundle.crt -- Bundle of CA Root Certificates
##
-## Certificate data from Mozilla as of: Sat Dec 29 20:03:40 2012
+## Certificate data from Mozilla as of: Tue Jan 28 09:38:07 2014
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
## file (certdata.txt). This file can be found in the mozilla source tree:
-## http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
+## http://mxr.mozilla.org/mozilla-release/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1
##
## It contains the certificates in PEM format and therefore
## can be directly used with curl / libcurl / php_curl, or with
@@ -14,7 +14,6 @@
## Just configure this file as the SSLCACertificateFile.
##
-# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.87 $ $Date: 2012/12/29 16:32:45 $
GTE CyberTrust Global Root
==========================
@@ -91,46 +90,6 @@ BIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee95
70+sB3c4
-----END CERTIFICATE-----
-Digital Signature Trust Co. Global CA 1
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENnAVljANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMTAeFw05ODEy
-MTAxODEwMjNaFw0xODEyMTAxODQwMjNaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUxMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQCgbIGpzzQeJN3+hijM3oMv+V7UQtLodGBmE5gGHKlREmlvMVW5SXIACH7TpWJE
-NySZj9mDSI+ZbZUTu0M7LklOiDfBu1h//uG9+LthzfNHwJmm8fOR6Hh8AMthyUQncWlVSn5JTe2i
-o74CTADKAqjuAQIxZA9SLRN0dja1erQtcQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTExDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMTAxODEwMjNagQ8yMDE4MTIxMDE4MTAyM1owCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFGp5fpFpRhgTCgJ3pVlbYJglDqL4MB0GA1UdDgQWBBRqeX6RaUYYEwoCd6VZW2CYJQ6i+DAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-ACIS2Hod3IEGtgllsofIH160L+nEHvI8wbsEkBFKg05+k7lNQseSJqBcNJo4cvj9axY+IO6CizEq
-kzaFI4iKPANo08kJD038bKTaKHKTDomAsH3+gG9lbRgzl4vCa4nuYD3Im+9/KzJic5PLPON74nZ4
-RbyhkwS7hp86W0N6w4pl
------END CERTIFICATE-----
-
-Digital Signature Trust Co. Global CA 3
-=======================================
------BEGIN CERTIFICATE-----
-MIIDKTCCApKgAwIBAgIENm7TzjANBgkqhkiG9w0BAQUFADBGMQswCQYDVQQGEwJVUzEkMCIGA1UE
-ChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMREwDwYDVQQLEwhEU1RDQSBFMjAeFw05ODEy
-MDkxOTE3MjZaFw0xODEyMDkxOTQ3MjZaMEYxCzAJBgNVBAYTAlVTMSQwIgYDVQQKExtEaWdpdGFs
-IFNpZ25hdHVyZSBUcnVzdCBDby4xETAPBgNVBAsTCERTVENBIEUyMIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQC/k48Xku8zExjrEH9OFr//Bo8qhbxe+SSmJIi2A7fBw18DW9Fvrn5C6mYjuGOD
-VvsoLeE4i7TuqAHhzhy2iCoiRoX7n6dwqUcUP87eZfCocfdPJmyMvMa1795JJ/9IKn3oTQPMx7JS
-xhcxEzu1TdvIxPbDDyQq2gyd55FbgM2UnQIBA6OCASQwggEgMBEGCWCGSAGG+EIBAQQEAwIABzBo
-BgNVHR8EYTBfMF2gW6BZpFcwVTELMAkGA1UEBhMCVVMxJDAiBgNVBAoTG0RpZ2l0YWwgU2lnbmF0
-dXJlIFRydXN0IENvLjERMA8GA1UECxMIRFNUQ0EgRTIxDTALBgNVBAMTBENSTDEwKwYDVR0QBCQw
-IoAPMTk5ODEyMDkxOTE3MjZagQ8yMDE4MTIwOTE5MTcyNlowCwYDVR0PBAQDAgEGMB8GA1UdIwQY
-MBaAFB6CTShlgDzJQW6sNS5ay97u+DlbMB0GA1UdDgQWBBQegk0oZYA8yUFurDUuWsve7vg5WzAM
-BgNVHRMEBTADAQH/MBkGCSqGSIb2fQdBAAQMMAobBFY0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4GB
-AEeNg61i8tuwnkUiBbmi1gMOOHLnnvx75pO2mqWilMg0HZHRxdf0CiUPPXiBng+xZ8SQTGPdXqfi
-up/1902lMXucKS1M/mQ+7LZT/uqb7YLbdHVLB3luHtgZg3Pe9T7Qtd7nS2h9Qy4qIOF+oHhEngj1
-mPnHfxsb1gYgAlihw6ID
------END CERTIFICATE-----
-
Verisign Class 3 Public Primary Certification Authority
=======================================================
-----BEGIN CERTIFICATE-----
@@ -344,11 +303,11 @@ n9cd2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
Entrust.net Premium 2048 Secure Server CA
=========================================
-----BEGIN CERTIFICATE-----
-MIIEXDCCA0SgAwIBAgIEOGO5ZjANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
-NzUwNTFaFw0xOTEyMjQxODIwNTFaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
@@ -356,14 +315,13 @@ MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
-VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo3QwcjARBglghkgBhvhC
-AQEEBAMCAAcwHwYDVR0jBBgwFoAUVeSB0RGAvtiJuQijMfmhJAkWuXAwHQYDVR0OBBYEFFXkgdER
-gL7YibkIozH5oSQJFrlwMB0GCSqGSIb2fQdBAAQQMA4bCFY1LjA6NC4wAwIEkDANBgkqhkiG9w0B
-AQUFAAOCAQEAWUesIYSKF8mciVMeuoCFGsY8Tj6xnLZ8xpJdGGQC49MGCBFhfGPjK50xA3B20qMo
-oPS7mmNz7W3lKtvtFKkrxjYR0CvrB4ul2p5cGZ1WEvVUKcgF7bISKo30Axv/55IQh7A6tcOdBTcS
-o8f0FbnVpDkWm1M6I5HxqIKiaohowXkCIryqptau37AUX7iH0N18f3v/rxzP5tsHrV7bhZ3QKw0z
-2wTR5klAEyt2+z7pnIkPFc4YsIV4IU9rTw76NmfNB/L/CNDi3tm/Kq+4h4YhPATKt5Rof8886ZjX
-OP/swNlQ8C5LWK5Gb9Auw2DaclVyvUxFnmG6v4SBkgPR0ml8xQ==
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
-----END CERTIFICATE-----
Baltimore CyberTrust Root
@@ -421,26 +379,6 @@ lSE/9dR+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN/Bf+
KpYrtWKmpj29f5JZzVoqgrI3eQ==
-----END CERTIFICATE-----
-Equifax Secure eBusiness CA 2
-=============================
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIEN3DPtTANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJVUzEXMBUGA1UE
-ChMORXF1aWZheCBTZWN1cmUxJjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0y
-MB4XDTk5MDYyMzEyMTQ0NVoXDTE5MDYyMzEyMTQ0NVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoT
-DkVxdWlmYXggU2VjdXJlMSYwJAYDVQQLEx1FcXVpZmF4IFNlY3VyZSBlQnVzaW5lc3MgQ0EtMjCB
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5Dk5kx5SBhsoNviyoynF7Y6yEb3+6+e0dMKP/wXn
-2Z0GvxLIPw7y1tEkshHe0XMJitSxLJgJDR5QRrKDpkWNYmi7hRsgcDKqQM2mll/EcTc/BPO3QSQ5
-BxoeLmFYoBIL5aXfxavqN3HMHMg3OrmXUqesxWoklE6ce8/AatbfIb0CAwEAAaOCAQkwggEFMHAG
-A1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORXF1aWZheCBTZWN1cmUx
-JjAkBgNVBAsTHUVxdWlmYXggU2VjdXJlIGVCdXNpbmVzcyBDQS0yMQ0wCwYDVQQDEwRDUkwxMBoG
-A1UdEAQTMBGBDzIwMTkwNjIzMTIxNDQ1WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUUJ4L6q9e
-uSBIplBqy/3YIHqngnYwHQYDVR0OBBYEFFCeC+qvXrkgSKZQasv92CB6p4J2MAwGA1UdEwQFMAMB
-Af8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUAA4GBAAyGgq3oThr1
-jokn4jVYPSm0B482UJW/bsGe68SQsoWou7dC4A8HOd/7npCy0cE+U58DRLB+S/Rv5Hwf5+Kx5Lia
-78O9zt4LMjTZ3ijtM2vE1Nc9ElirfQkty3D1E4qUoSek1nDFbZS1yX2doNLGCEnZZpum0/QL3MUm
-V+GRMOrN
------END CERTIFICATE-----
-
AddTrust Low-Value Services Root
================================
-----BEGIN CERTIFICATE-----
@@ -1405,29 +1343,6 @@ wUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzflZKG+TQyTmAyX9odtsz/ny4Cm
VM+h4k0460tQtcsm9MracEpqoeJ5quGnM/b9Sh/22WA=
-----END CERTIFICATE-----
-Wells Fargo Root CA
-===================
------BEGIN CERTIFICATE-----
-MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMCVVMxFDASBgNV
-BAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
-MDAxMDExMTY0MTI4WhcNMjEwMTE0MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dl
-bGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEv
-MC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n135zHCLielTWi5MbqNQ1mX
-x3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHESxP9cMIlrCL1dQu3U+SlK93OvRw6esP3
-E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4OJgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5
-OEL8pahbSCOz6+MlsoCultQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4j
-sNtlAHCEAQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMBAAGj
-YTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcBCzAyMDAGCCsGAQUF
-BwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRwb2xpY3kwDQYJKoZIhvcNAQEFBQAD
-ggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrv
-m+0fazbuSCUlFLZWohDo7qd/0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0R
-OhPs7fpvcmR7nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
-x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ33ZwmVxwQ023
-tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
------END CERTIFICATE-----
-
Swisscom Root CA 1
==================
-----BEGIN CERTIFICATE-----
@@ -2803,29 +2718,6 @@ YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
kpeDMdmztcpHWD9f
-----END CERTIFICATE-----
-TC TrustCenter Universal CA III
-===============================
------BEGIN CERTIFICATE-----
-MIID4TCCAsmgAwIBAgIOYyUAAQACFI0zFQLkbPQwDQYJKoZIhvcNAQEFBQAwezELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy
-IFVuaXZlcnNhbCBDQTEoMCYGA1UEAxMfVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIElJSTAe
-Fw0wOTA5MDkwODE1MjdaFw0yOTEyMzEyMzU5NTlaMHsxCzAJBgNVBAYTAkRFMRwwGgYDVQQKExNU
-QyBUcnVzdENlbnRlciBHbWJIMSQwIgYDVQQLExtUQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0Ex
-KDAmBgNVBAMTH1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQSBJSUkwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDC2pxisLlxErALyBpXsq6DFJmzNEubkKLF5+cvAqBNLaT6hdqbJYUt
-QCggbergvbFIgyIpRJ9Og+41URNzdNW88jBmlFPAQDYvDIRlzg9uwliT6CwLOunBjvvya8o84pxO
-juT5fdMnnxvVZ3iHLX8LR7PH6MlIfK8vzArZQe+f/prhsq75U7Xl6UafYOPfjdN/+5Z+s7Vy+Eut
-CHnNaYlAJ/Uqwa1D7KRTyGG299J5KmcYdkhtWyUB0SbFt1dpIxVbYYqt8Bst2a9c8SaQaanVDED1
-M4BDj5yjdipFtK+/fz6HP3bFzSreIMUWWMv5G/UPyw0RUmS40nZid4PxWJ//AgMBAAGjYzBhMB8G
-A1UdIwQYMBaAFFbn4VslQ4Dg9ozhcbyO5YAvxEjiMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMB0GA1UdDgQWBBRW5+FbJUOA4PaM4XG8juWAL8RI4jANBgkqhkiG9w0BAQUFAAOCAQEA
-g8ev6n9NCjw5sWi+e22JLumzCecYV42FmhfzdkJQEw/HkG8zrcVJYCtsSVgZ1OK+t7+rSbyUyKu+
-KGwWaODIl0YgoGhnYIg5IFHYaAERzqf2EQf27OysGh+yZm5WZ2B6dF7AbZc2rrUNXWZzwCUyRdhK
-BgePxLcHsU0GDeGl6/R1yrqc0L2z0zIkTO5+4nYES0lT2PLpVDP85XEfPRRclkvxOvIAu2y0+pZV
-CIgJwcyRGSmwIC3/yzikQOEXvnlhgP8HA4ZMTnsGnxGGjYnuJ8Tb4rwZjgvDwxPHLQNjO9Po5KIq
-woIIlBZU8O8fJ5AluA0OKBtHd0e9HKgl8ZS0Zg==
------END CERTIFICATE-----
-
Autoridad de Certificacion Firmaprofesional CIF A62634068
=========================================================
-----BEGIN CERTIFICATE-----
@@ -3552,3 +3444,342 @@ uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
dcGWxZ0=
-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2007
+=================================================
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
+DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
+a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
+YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
+KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
+KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
+rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
+AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
+Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
+Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
+BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
+poRq0Tl9
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+PSCProcert
+==========
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
+ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
+MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
+dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
+cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
+IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
+MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
+DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
+ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
+Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
+wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
+3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
+RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
+EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
+0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
+td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
+Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
+r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
+AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
+Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
+xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
+ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
+EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
+Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
+ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
+9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
+MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
+LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
+ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
+YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
+dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
+T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
+g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
+uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
+n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
+FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
+5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
+3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
+poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
+eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+China Internet Network Information Center EV Certificates Root
+==============================================================
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV
+BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D
+aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg
+Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG
+A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM
+PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl
+cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y
+jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV
+98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H
+klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23
+KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC
+7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD
+glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5
+0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM
+7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0
+5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQG
+EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
+dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2
+MjUwNzM4MTRaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
+aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvErjw0DzpPM
+LgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r0rk0X2s682Q2zsKwzxNo
+ysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJ
+wDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVPACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpH
+Wrumnf2U5NGKpV+GY3aFy6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1a
+SgJA/MTAtukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL6yxS
+NLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0uPoTXGiTOmekl9Ab
+mbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrALacywlKinh/LTSlDcX3KwFnUey7QY
+Ypqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velhk6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3
+qPyZ7iVNTA6z00yPhOgpD/0QVAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0hBBYwFDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqhb97iEoHF8Twu
+MA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4RfbgZPnm3qKhyN2abGu2sEzsO
+v2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ
+82YqZh6NM4OKb3xuqFp1mrjX2lhIREeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLz
+o9v/tdhZsnPdTSpxsrpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcs
+a0vvaGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciATwoCqISxx
+OQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99nBjx8Oto0QuFmtEYE3saW
+mA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5Wt6NlUe07qxS/TFED6F+KBZvuim6c779o
++sjaC+NCydAXFJy3SuCvkychVSa1ZC+N8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TC
+rvJcwhbtkj6EPnNgiLx29CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX
+5OfNeOI5wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+Swisscom Root EV CA 2
+=====================
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UE
+BhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdpdGFsIENlcnRpZmljYXRlIFNl
+cnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcN
+MzEwNjI1MDg0NTA4WjBnMQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsT
+HERpZ2l0YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYg
+Q0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7BxUglgRCgz
+o3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD1ycfMQ4jFrclyxy0uYAy
+Xhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPHoCE2G3pXKSinLr9xJZDzRINpUKTk4Rti
+GZQJo/PDvO/0vezbE53PnUgJUmfANykRHvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8Li
+qG12W0OfvrSdsyaGOx9/5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaH
+Za0zKcQvidm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHLOdAG
+alNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaCNYGu+HuB5ur+rPQa
+m3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f46Fq9mDU5zXNysRojddxyNMkM3Ox
+bPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCBUWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDi
+xzgHcgplwLa7JSnaFp6LNYth7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWBbj2ITY1x0kbB
+bkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6xXCX5145v9Ydkn+0UjrgEjihL
+j6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98TPLr+flaYC/NUn81ETm484T4VvwYmneTwkLbU
+wp4wLh/vx3rEUMfqe9pQy3omywC0Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7
+XwgiG/W9mR4U9s70WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH
+59yLGn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm7JFe3VE/
+23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4Snr8PyQUQ3nqjsTzyP6Wq
+J3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VNvBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyA
+HmBR3NdUIR7KYndP+tiPsys6DXhyyWhBWkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/gi
+uMod89a2GQ+fYWVq6nTIfI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuW
+l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+CA Disig Root R1
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQyMDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy
+3QRkD2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/oOI7bm+V8
+u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3AfQ+lekLZWnDZv6fXARz2
+m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJeIgpFy4QxTaz+29FHuvlglzmxZcfe+5nk
+CiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8noc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTa
+YVKvJrT1cU/J19IG32PK/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6
+vpmumwKjrckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD3AjL
+LhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE7cderVC6xkGbrPAX
+ZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkCyC2fg69naQanMVXVz0tv/wQFx1is
+XxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLdqvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ
+04IwDQYJKoZIhvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaASfX8MPWbTx9B
+LxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXoHqJPYNcHKfyyo6SdbhWSVhlM
+CrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpBemOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5Gfb
+VSUZP/3oNn6z4eGBrxEWi1CXYBmCAMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85
+YmLLW1AL14FABZyb7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKS
+ds+xDzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvkF7mGnjix
+lAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqFa3qdnom2piiZk4hA9z7N
+UaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsTQ6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJ
+a7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem.md5 b/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem.md5
deleted file mode 100644
index 7112ccf62c..0000000000
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Resources/cacert.pem.md5
+++ /dev/null
@@ -1 +0,0 @@
-349ba2d6964db9ca558c9e1daf38e428
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Http/Url.php b/vendor/guzzle/guzzle/src/Guzzle/Http/Url.php
index 91de5c4f3c..6a4e772451 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Http/Url.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Http/Url.php
@@ -213,6 +213,12 @@ class Url
*/
public function setScheme($scheme)
{
+ if ($this->scheme == 'http' && $this->port == 80) {
+ $this->port = null;
+ } elseif ($this->scheme == 'https' && $this->port == 443) {
+ $this->port = null;
+ }
+
$this->scheme = $scheme;
return $this;
@@ -312,7 +318,7 @@ class Url
}
/**
- * Add a relative path to the currently set path
+ * Add a relative path to the currently set path.
*
* @param string $relativePath Relative path to add
*
@@ -320,16 +326,15 @@ class Url
*/
public function addPath($relativePath)
{
- if (!$relativePath || $relativePath == '/') {
- return $this;
- }
-
- // Add a leading slash if needed
- if ($relativePath[0] != '/') {
- $relativePath = '/' . $relativePath;
+ if ($relativePath != '/' && is_string($relativePath) && strlen($relativePath) > 0) {
+ // Add a leading slash if needed
+ if ($relativePath[0] != '/') {
+ $relativePath = '/' . $relativePath;
+ }
+ $this->setPath(str_replace('//', '/', $this->path . $relativePath));
}
- return $this->setPath(str_replace('//', '/', $this->getPath() . $relativePath));
+ return $this;
}
/**
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Iterator/composer.json b/vendor/guzzle/guzzle/src/Guzzle/Iterator/composer.json
index 17e8005268..ee1737987b 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Iterator/composer.json
+++ b/vendor/guzzle/guzzle/src/Guzzle/Iterator/composer.json
@@ -18,7 +18,7 @@
"autoload": {
"psr-0": { "Guzzle\\Iterator": "/" }
},
- "target-dir": "Guzzle/Log",
+ "target-dir": "Guzzle/Iterator",
"extra": {
"branch-alias": {
"dev-master": "3.7-dev"
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Log/MonologLogAdapter.php b/vendor/guzzle/guzzle/src/Guzzle/Log/MonologLogAdapter.php
index 8c74a45dce..6afe7b62af 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Log/MonologLogAdapter.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Log/MonologLogAdapter.php
@@ -29,6 +29,6 @@ class MonologLogAdapter extends AbstractLogAdapter
public function log($message, $priority = LOG_INFO, $extras = array())
{
- $this->log->addRecord(self::$mapping[$priority], $message);
+ $this->log->addRecord(self::$mapping[$priority], $message, $extras);
}
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Parser/Cookie/CookieParser.php b/vendor/guzzle/guzzle/src/Guzzle/Parser/Cookie/CookieParser.php
index 8e825f9bde..4349eeb38b 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Parser/Cookie/CookieParser.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Parser/Cookie/CookieParser.php
@@ -36,7 +36,7 @@ class CookieParser implements CookieParserInterface
$data = array_merge(array_fill_keys(array_keys(self::$cookieParts), null), array(
'cookies' => array(),
'data' => array(),
- 'path' => $path ?: '/',
+ 'path' => null,
'http_only' => false,
'discard' => false,
'domain' => $host
@@ -81,6 +81,51 @@ class CookieParser implements CookieParserInterface
$data['expires'] = time() + (int) $data['max_age'];
}
+ // Check path attribute according RFC6265 http://tools.ietf.org/search/rfc6265#section-5.2.4
+ // "If the attribute-value is empty or if the first character of the
+ // attribute-value is not %x2F ("/"):
+ // Let cookie-path be the default-path.
+ // Otherwise:
+ // Let cookie-path be the attribute-value."
+ if (!$data['path'] || substr($data['path'], 0, 1) !== '/') {
+ $data['path'] = $this->getDefaultPath($path);
+ }
+
return $data;
}
+
+ /**
+ * Get default cookie path according to RFC 6265
+ * http://tools.ietf.org/search/rfc6265#section-5.1.4 Paths and Path-Match
+ *
+ * @param string $path Request uri-path
+ *
+ * @return string
+ */
+ protected function getDefaultPath($path) {
+ // "The user agent MUST use an algorithm equivalent to the following algorithm
+ // to compute the default-path of a cookie:"
+
+ // "2. If the uri-path is empty or if the first character of the uri-path is not
+ // a %x2F ("/") character, output %x2F ("/") and skip the remaining steps.
+ if (empty($path) || substr($path, 0, 1) !== '/') {
+ return '/';
+ }
+
+ // "3. If the uri-path contains no more than one %x2F ("/") character, output
+ // %x2F ("/") and skip the remaining step."
+ if ($path === "/") {
+ return $path;
+ }
+
+ $rightSlashPos = strrpos($path, '/');
+ if ($rightSlashPos === 0) {
+ return "/";
+ }
+
+ // "4. Output the characters of the uri-path from the first character up to,
+ // but not including, the right-most %x2F ("/")."
+ return substr($path, 0, $rightSlashPos);
+
+ }
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultRevalidation.php b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultRevalidation.php
index ab2e2a2cec..af33234eef 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultRevalidation.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cache/DefaultRevalidation.php
@@ -95,9 +95,11 @@ class DefaultRevalidation implements RevalidationInterface
protected function createRevalidationRequest(RequestInterface $request, Response $response)
{
$revalidate = clone $request;
- $revalidate->removeHeader('Pragma')
- ->removeHeader('Cache-Control')
- ->setHeader('If-Modified-Since', $response->getLastModified() ?: $response->getDate());
+ $revalidate->removeHeader('Pragma')->removeHeader('Cache-Control');
+
+ if ($response->getLastModified()) {
+ $revalidate->setHeader('If-Modified-Since', $response->getLastModified());
+ }
if ($response->getEtag()) {
$revalidate->setHeader('If-None-Match', $response->getEtag());
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/Cookie.php b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/Cookie.php
index f5803dcb15..5218e5f0e4 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/Cookie.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/Cookie.php
@@ -412,7 +412,32 @@ class Cookie implements ToArrayInterface
*/
public function matchesPath($path)
{
- return !$this->getPath() || 0 === stripos($path, $this->getPath());
+ // RFC6265 http://tools.ietf.org/search/rfc6265#section-5.1.4
+ // A request-path path-matches a given cookie-path if at least one of
+ // the following conditions holds:
+
+ // o The cookie-path and the request-path are identical.
+ if ($path == $this->getPath()) {
+ return true;
+ }
+
+ $pos = stripos($path, $this->getPath());
+ if ($pos === 0) {
+ // o The cookie-path is a prefix of the request-path, and the last
+ // character of the cookie-path is %x2F ("/").
+ if (substr($this->getPath(), -1, 1) === "/") {
+ return true;
+ }
+
+ // o The cookie-path is a prefix of the request-path, and the first
+ // character of the request-path that is not included in the cookie-
+ // path is a %x2F ("/") character.
+ if (substr($path, strlen($this->getPath()), 1) === "/") {
+ return true;
+ }
+ }
+
+ return false;
}
/**
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php
index 68d5be7e63..6b675039fa 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Cookie/CookieJar/ArrayCookieJar.php
@@ -93,6 +93,7 @@ class ArrayCookieJar implements CookieJarInterface, \Serializable
if ($this->strictMode) {
throw new InvalidCookieException($result);
} else {
+ $this->removeCookieIfEmpty($cookie);
return false;
}
}
@@ -219,4 +220,18 @@ class ArrayCookieJar implements CookieJarInterface, \Serializable
return $cookies;
}
+
+ /**
+ * If a cookie already exists and the server asks to set it again with a null value, the
+ * cookie must be deleted.
+ *
+ * @param \Guzzle\Plugin\Cookie\Cookie $cookie
+ */
+ private function removeCookieIfEmpty(Cookie $cookie)
+ {
+ $cookieValue = $cookie->getValue();
+ if ($cookieValue === null || $cookieValue === '') {
+ $this->remove($cookie->getDomain(), $cookie->getPath(), $cookie->getName());
+ }
+ }
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php b/vendor/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php
index b3e6c22dec..588b9c3e37 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Plugin/ErrorResponse/ErrorResponsePlugin.php
@@ -62,7 +62,7 @@ class ErrorResponsePlugin implements EventSubscriberInterface
$errorClassInterface = __NAMESPACE__ . '\\ErrorResponseExceptionInterface';
if (!class_exists($className)) {
throw new ErrorResponseException("{$className} does not exist");
- } elseif (!is_subclass_of($className, $errorClassInterface)) {
+ } elseif (!(in_array($errorClassInterface, class_implements($className)))) {
throw new ErrorResponseException("{$className} must implement {$errorClassInterface}");
}
throw $className::fromCommand($command, $response);
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Mock/MockPlugin.php b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Mock/MockPlugin.php
index ab7833cee2..2440578cf0 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Mock/MockPlugin.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Mock/MockPlugin.php
@@ -226,17 +226,20 @@ class MockPlugin extends AbstractHasDispatcher implements EventSubscriberInterfa
* Called when a request is about to be sent
*
* @param Event $event
+ * @throws \OutOfBoundsException When queue is empty
*/
public function onRequestBeforeSend(Event $event)
{
- if ($this->queue) {
- $request = $event['request'];
- $this->received[] = $request;
- // Detach the filter from the client so it's a one-time use
- if ($this->temporary && count($this->queue) == 1 && $request->getClient()) {
- $request->getClient()->getEventDispatcher()->removeSubscriber($this);
- }
- $this->dequeue($request);
+ if (!$this->queue) {
+ throw new \OutOfBoundsException('Mock queue is empty');
+ }
+
+ $request = $event['request'];
+ $this->received[] = $request;
+ // Detach the filter from the client so it's a one-time use
+ if ($this->temporary && count($this->queue) == 1 && $request->getClient()) {
+ $request->getClient()->getEventDispatcher()->removeSubscriber($this);
}
+ $this->dequeue($request);
}
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Oauth/OauthPlugin.php b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Oauth/OauthPlugin.php
index 1e1547f65b..95e0c3e4a8 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Plugin/Oauth/OauthPlugin.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Plugin/Oauth/OauthPlugin.php
@@ -155,7 +155,8 @@ class OauthPlugin implements EventSubscriberInterface
$params = $this->prepareParameters($params);
// Build signing string from combined params
- $parameterString = new QueryString($params);
+ $parameterString = clone $request->getQuery();
+ $parameterString->replace($params);
$url = Url::factory($request->getUrl())->setQuery('')->setFragment(null);
@@ -225,7 +226,7 @@ class OauthPlugin implements EventSubscriberInterface
// Sort params
$params = $params->toArray();
- ksort($params);
+ uksort($params, 'strcmp');
return $params;
}
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Service/Client.php b/vendor/guzzle/guzzle/src/Guzzle/Service/Client.php
index f4b76be1cd..3e5f8e53da 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Service/Client.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Service/Client.php
@@ -147,6 +147,10 @@ class Client extends HttpClient implements ClientInterface
{
$this->serviceDescription = $service;
+ if ($this->getCommandFactory() && $this->getCommandFactory() instanceof CompositeFactory) {
+ $this->commandFactory->add(new Command\Factory\ServiceDescriptionFactory($service));
+ }
+
// If a baseUrl was set on the description, then update the client
if ($baseUrl = $service->getBaseUrl()) {
$this->setBaseUrl($baseUrl);
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php b/vendor/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php
index 64affbc345..bb7124be75 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Service/Command/LocationVisitor/Response/XmlVisitor.php
@@ -55,6 +55,8 @@ class XmlVisitor extends AbstractResponseVisitor
$this->processObject($param, $value);
} elseif ($type == 'array') {
$this->processArray($param, $value);
+ } elseif ($type == 'string' && gettype($value) == 'array') {
+ $value = '';
}
if ($value !== null) {
diff --git a/vendor/guzzle/guzzle/src/Guzzle/Service/Description/SchemaValidator.php b/vendor/guzzle/guzzle/src/Guzzle/Service/Description/SchemaValidator.php
index 13b99cdf2b..b045422d4c 100644
--- a/vendor/guzzle/guzzle/src/Guzzle/Service/Description/SchemaValidator.php
+++ b/vendor/guzzle/guzzle/src/Guzzle/Service/Description/SchemaValidator.php
@@ -157,8 +157,9 @@ class SchemaValidator implements ValidatorInterface
}
} else {
// if additionalProperties is set to false and there are additionalProperties in the values, then fail
- $keys = array_keys($value);
- $this->errors[] = sprintf('%s[%s] is not an allowed property', $path, reset($keys));
+ foreach ($diff as $prop) {
+ $this->errors[] = sprintf('%s[%s] is not an allowed property', $path, $prop);
+ }
}
}
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/GuzzleTestCase.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/GuzzleTestCase.php
index 8109874e8f..d89c5f0a28 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/GuzzleTestCase.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/GuzzleTestCase.php
@@ -8,7 +8,7 @@ use Guzzle\Http\Message\Response;
use Guzzle\Http\Message\RequestInterface;
use Guzzle\Tests\Http\Message\HeaderComparison;
use Guzzle\Plugin\Mock\MockPlugin;
-use Guzzle\Service\Client;
+use Guzzle\Http\Client;
use Guzzle\Service\Builder\ServiceBuilderInterface;
use Guzzle\Service\Builder\ServiceBuilder;
use Guzzle\Tests\Mock\MockObserver;
@@ -99,7 +99,7 @@ abstract class GuzzleTestCase extends \PHPUnit_Framework_TestCase
/**
* Get a wildcard observer for an event dispatcher
*
- * @param HasDispatcherInterface $hasEvent
+ * @param HasDispatcherInterface $hasDispatcher
*
* @return MockObserver
*/
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/ClientTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/ClientTest.php
index 6814cacec1..4a91a18f91 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/ClientTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/ClientTest.php
@@ -589,4 +589,13 @@ class ClientTest extends \Guzzle\Tests\GuzzleTestCase
$head = $client->head('http://www.foo.com', array(), array('query' => array('foo' => 'bar')));
$this->assertEquals('bar', $head->getQuery()->get('foo'));
}
+
+ public function testCanSetRelativeUrlStartingWithHttp()
+ {
+ $client = new Client('http://www.foo.com');
+ $this->assertEquals(
+ 'http://www.foo.com/httpfoo',
+ $client->createRequest('GET', 'httpfoo')->getUrl()
+ );
+ }
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
index e9eab1d85c..bfa85bd628 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlHandleTest.php
@@ -140,7 +140,9 @@ class CurlHandleTest extends \Guzzle\Tests\GuzzleTestCase
"couldn't connect to host",
'timeout was reached',
'connection time-out',
- 'connect() timed out!'
+ 'connect() timed out!',
+ 'failed connect to 127.0.0.1:123; connection refused',
+ 'failed to connect to 127.0.0.1 port 123: connection refused'
);
$this->assertTrue(in_array(strtolower($h->getError()), $errors), $h->getError() . ' was not the error');
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlMultiProxyTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlMultiProxyTest.php
index 060cd59ded..e04141c5f5 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlMultiProxyTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Curl/CurlMultiProxyTest.php
@@ -12,13 +12,17 @@ use Guzzle\Http\Curl\CurlMultiProxy;
*/
class CurlMultiProxyTest extends \Guzzle\Tests\GuzzleTestCase
{
+ const SELECT_TIMEOUT = 23.1;
+
+ const MAX_HANDLES = 2;
+
/** @var \Guzzle\Http\Curl\CurlMultiProxy */
private $multi;
protected function setUp()
{
parent::setUp();
- $this->multi = new CurlMultiProxy();
+ $this->multi = new CurlMultiProxy(self::MAX_HANDLES, self::SELECT_TIMEOUT);
}
public function tearDown()
@@ -28,8 +32,14 @@ class CurlMultiProxyTest extends \Guzzle\Tests\GuzzleTestCase
public function testConstructorSetsMaxHandles()
{
- $m = new CurlMultiProxy(2);
- $this->assertEquals(2, $this->readAttribute($m, 'maxHandles'));
+ $m = new CurlMultiProxy(self::MAX_HANDLES, self::SELECT_TIMEOUT);
+ $this->assertEquals(self::MAX_HANDLES, $this->readAttribute($m, 'maxHandles'));
+ }
+
+ public function testConstructorSetsSelectTimeout()
+ {
+ $m = new CurlMultiProxy(self::MAX_HANDLES, self::SELECT_TIMEOUT);
+ $this->assertEquals(self::SELECT_TIMEOUT, $this->readAttribute($m, 'selectTimeout'));
}
public function testAddingRequestsAddsToQueue()
@@ -90,7 +100,7 @@ class CurlMultiProxyTest extends \Guzzle\Tests\GuzzleTestCase
"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n"
));
$client = new Client($this->getServer()->getUrl());
- $client->setCurlMulti(new CurlMultiProxy(2));
+ $client->setCurlMulti(new CurlMultiProxy(self::MAX_HANDLES, self::SELECT_TIMEOUT));
$request = $client->get();
$request->send();
$this->assertEquals(200, $request->getResponse()->getStatusCode());
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php
index d43e0899c1..f91bc84a14 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php
@@ -421,7 +421,10 @@ class HttpRequestFactoryTest extends \Guzzle\Tests\GuzzleTestCase
public function testCanAddPlugins()
{
- $mock = new MockPlugin(array(new Response(200)));
+ $mock = new MockPlugin(array(
+ new Response(200),
+ new Response(200)
+ ));
$client = new Client();
$client->addSubscriber($mock);
$request = $client->get('/', array(), array(
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestTest.php
index 5f4d8a789b..5bf6248296 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/Message/RequestTest.php
@@ -622,4 +622,18 @@ class RequestTest extends \Guzzle\Tests\GuzzleTestCase
$request->setResponse(new Response(200, array(), 'foo'));
$this->assertEquals('foo', (string) $en);
}
+
+ public function testCanChangePortThroughScheme()
+ {
+ $request = new Request('GET', 'http://foo.com');
+ $request->setScheme('https');
+ $this->assertEquals('https://foo.com', (string) $request->getUrl());
+ $this->assertEquals('foo.com', $request->getHost());
+ $request->setScheme('http');
+ $this->assertEquals('http://foo.com', (string) $request->getUrl());
+ $this->assertEquals('foo.com', $request->getHost());
+ $request->setPort(null);
+ $this->assertEquals('http://foo.com', (string) $request->getUrl());
+ $this->assertEquals('foo.com', $request->getHost());
+ }
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/QueryStringTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/QueryStringTest.php
index 0513f62241..948db442d4 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/QueryStringTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/QueryStringTest.php
@@ -92,13 +92,13 @@ class QueryStringTest extends \Guzzle\Tests\GuzzleTestCase
'test4' => null,
);
$this->q->replace($params);
- $this->assertEquals('test=value&test%202=this%20is%20a%20test%3F&test3%5B0%5D=v1&test3%5B1%5D=v2&test3%5B2%5D=v3&test4=', $this->q->__toString());
+ $this->assertEquals('test=value&test%202=this%20is%20a%20test%3F&test3%5B0%5D=v1&test3%5B1%5D=v2&test3%5B2%5D=v3&test4', $this->q->__toString());
$this->q->useUrlEncoding(false);
- $this->assertEquals('test=value&test 2=this is a test?&test3[0]=v1&test3[1]=v2&test3[2]=v3&test4=', $this->q->__toString());
+ $this->assertEquals('test=value&test 2=this is a test?&test3[0]=v1&test3[1]=v2&test3[2]=v3&test4', $this->q->__toString());
// Use an alternative aggregator
$this->q->setAggregator(new CommaAggregator());
- $this->assertEquals('test=value&test 2=this is a test?&test3=v1,v2,v3&test4=', $this->q->__toString());
+ $this->assertEquals('test=value&test 2=this is a test?&test3=v1,v2,v3&test4', $this->q->__toString());
}
public function testAllowsMultipleValuesPerKey()
@@ -147,7 +147,7 @@ class QueryStringTest extends \Guzzle\Tests\GuzzleTestCase
// Ensure that query string values are percent decoded
array('q%20a=a%20b', array('q a' => 'a b')),
// Ensure null values can be added
- array('q&a', array('q' => QueryString::BLANK, 'a' => QueryString::BLANK)),
+ array('q&a', array('q' => false, 'a' => false)),
);
}
@@ -207,9 +207,10 @@ class QueryStringTest extends \Guzzle\Tests\GuzzleTestCase
'foo' => 0,
'baz' => '0',
'bar' => null,
- 'boo' => false
+ 'boo' => false,
+ 'bam' => ''
));
- $this->assertEquals('foo=0&baz=0&bar=&boo=', (string) $query);
+ $this->assertEquals('foo=0&baz=0&bar&boo&bam=', (string) $query);
}
public function testFromStringDoesntStripTrailingEquals()
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/UrlTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/UrlTest.php
index acba289855..28f26718bb 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/UrlTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Http/UrlTest.php
@@ -127,11 +127,16 @@ class UrlTest extends \Guzzle\Tests\GuzzleTestCase
{
// Does nothing here
$this->assertEquals('http://e.com/base?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath(false));
+ $this->assertEquals('http://e.com/base?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath(null));
+ $this->assertEquals('http://e.com/base?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath(array()));
+ $this->assertEquals('http://e.com/base?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath(new \stdClass()));
$this->assertEquals('http://e.com/base?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath(''));
$this->assertEquals('http://e.com/base?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath('/'));
-
+ $this->assertEquals('http://e.com/baz/foo', (string) Url::factory('http://e.com/baz/')->addPath('foo'));
$this->assertEquals('http://e.com/base/relative?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath('relative'));
$this->assertEquals('http://e.com/base/relative?a=1', (string) Url::factory('http://e.com/base?a=1')->addPath('/relative'));
+ $this->assertEquals('http://e.com/base/0', (string) Url::factory('http://e.com/base')->addPath('0'));
+ $this->assertEquals('http://e.com/base/0/1', (string) Url::factory('http://e.com/base')->addPath('0')->addPath('1'));
}
/**
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Parser/Cookie/CookieParserProvider.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Parser/Cookie/CookieParserProvider.php
index bef5b1c63f..86d43c0b15 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Parser/Cookie/CookieParserProvider.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Parser/Cookie/CookieParserProvider.php
@@ -107,7 +107,7 @@ class CookieParserProvider extends \Guzzle\Tests\GuzzleTestCase
),
// Tests getting the domain and path from a reference request
array(array(
- 'foo=1; port="80,8081"; httponly', 'foo=1; port="80,8081"; domain=www.test.com; HttpOnly;', 'foo=1; ; domain=www.test.com; path=/path/; port="80,8081"; HttpOnly;'),
+ 'foo=1; port="80,8081"; httponly', 'foo=1; port="80,8081"; domain=www.test.com; HttpOnly;', 'foo=1; ; domain=www.test.com; path=/path; port="80,8081"; HttpOnly;'),
array(
'cookies' => array(
'foo' => 1
@@ -117,7 +117,7 @@ class CookieParserProvider extends \Guzzle\Tests\GuzzleTestCase
'domain' => 'www.test.com',
'expires' => null,
'max_age' => null,
- 'path' => '/path/',
+ 'path' => '/path',
'port' => array('80', '8081'),
'secure' => null,
'version' => null,
@@ -135,7 +135,6 @@ class CookieParserProvider extends \Guzzle\Tests\GuzzleTestCase
'justacookie' => 'foo'
),
'domain' => 'example.com',
- 'path' => '',
'data' => array(),
'discard' => null,
'expires' => null,
@@ -249,6 +248,91 @@ class CookieParserProvider extends \Guzzle\Tests\GuzzleTestCase
'http_only' => false
)
),
+ // rfc6265#section-5.1.4
+ array(
+ 'cookie=value',
+ array(
+ 'cookies' => array(
+ 'cookie' => 'value'
+ ),
+ 'domain' => 'example.com',
+ 'data' => array(),
+ 'discard' => null,
+ 'expires' => null,
+ 'max_age' => null,
+ 'path' => '/some/path',
+ 'port' => null,
+ 'secure' => null,
+ 'version' => null,
+ 'comment' => null,
+ 'comment_url' => null,
+ 'http_only' => false
+ ),
+ 'http://example.com/some/path/test.html'
+ ),
+ array(
+ 'empty=path',
+ array(
+ 'cookies' => array(
+ 'empty' => 'path'
+ ),
+ 'domain' => 'example.com',
+ 'data' => array(),
+ 'discard' => null,
+ 'expires' => null,
+ 'max_age' => null,
+ 'path' => '/',
+ 'port' => null,
+ 'secure' => null,
+ 'version' => null,
+ 'comment' => null,
+ 'comment_url' => null,
+ 'http_only' => false
+ ),
+ 'http://example.com/test.html'
+ ),
+ array(
+ 'baz=qux',
+ array(
+ 'cookies' => array(
+ 'baz' => 'qux'
+ ),
+ 'domain' => 'example.com',
+ 'data' => array(),
+ 'discard' => null,
+ 'expires' => null,
+ 'max_age' => null,
+ 'path' => '/',
+ 'port' => null,
+ 'secure' => null,
+ 'version' => null,
+ 'comment' => null,
+ 'comment_url' => null,
+ 'http_only' => false
+ ),
+ 'http://example.com?query=here'
+ ),
+ array(
+ 'test=noSlashPath; path=someString',
+ array(
+ 'cookies' => array(
+ 'test' => 'noSlashPath'
+ ),
+ 'domain' => 'example.com',
+ 'data' => array(),
+ 'discard' => null,
+ 'expires' => null,
+ 'max_age' => null,
+ 'path' => '/real/path',
+ 'port' => null,
+ 'secure' => null,
+ 'version' => null,
+ 'comment' => null,
+ 'comment_url' => null,
+ 'http_only' => false
+ ),
+ 'http://example.com/real/path/'
+ ),
);
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cache/DefaultRevalidationTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cache/DefaultRevalidationTest.php
index 19bcecacef..0699cb2665 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cache/DefaultRevalidationTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cache/DefaultRevalidationTest.php
@@ -176,6 +176,7 @@ class DefaultRevalidationTest extends \Guzzle\Tests\GuzzleTestCase
'Last-Modified' => $lm,
'Content-Length' => 2
), 'hi'),
+ new CurlException('Bleh'),
new CurlException('Bleh')
));
$client->addSubscriber(new CachePlugin());
@@ -184,7 +185,7 @@ class DefaultRevalidationTest extends \Guzzle\Tests\GuzzleTestCase
$response = $client->get()->send();
$this->assertEquals(200, $response->getStatusCode());
$this->assertEquals('hi', $response->getBody(true));
- $this->assertEquals(2, count($mock->getReceivedRequests()));
+ $this->assertEquals(3, count($mock->getReceivedRequests()));
$this->assertEquals(0, count($mock->getQueue()));
}
@@ -198,6 +199,7 @@ class DefaultRevalidationTest extends \Guzzle\Tests\GuzzleTestCase
'Last-Modified' => $lm,
'Content-Length' => 2
), 'hi'),
+ new CurlException('Oh no!'),
new CurlException('Oh no!')
));
$cache = new CachePlugin();
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieJar/ArrayCookieJarTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieJar/ArrayCookieJarTest.php
index 32897d0844..5d0f668a6e 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieJar/ArrayCookieJarTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieJar/ArrayCookieJarTest.php
@@ -350,4 +350,36 @@ class ArrayCookieJarTest extends \Guzzle\Tests\GuzzleTestCase
'domain' => 'bar'
)));
}
+
+ public function testRemoveExistingCookieIfEmpty()
+ {
+ // Add a cookie that should not be affected
+ $a = new Cookie(array(
+ 'name' => 'foo',
+ 'value' => 'nope',
+ 'domain' => 'foo.com',
+ 'path' => '/abc'
+ ));
+ $this->jar->add($a);
+
+ $data = array(
+ 'name' => 'foo',
+ 'value' => 'bar',
+ 'domain' => 'foo.com',
+ 'path' => '/'
+ );
+
+ $b = new Cookie($data);
+ $this->assertTrue($this->jar->add($b));
+ $this->assertEquals(2, count($this->jar));
+
+ // Try to re-set the same cookie with no value: assert that cookie is not added
+ $data['value'] = null;
+ $this->assertFalse($this->jar->add(new Cookie($data)));
+ // assert that original cookie has been deleted
+ $cookies = $this->jar->all('foo.com');
+ $this->assertTrue(in_array($a, $cookies, true));
+ $this->assertFalse(in_array($b, $cookies, true));
+ $this->assertEquals(1, count($this->jar));
+ }
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieTest.php
index 3d8b0e9bbf..9fb0b4310b 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Cookie/CookieTest.php
@@ -164,9 +164,24 @@ class CookieTest extends \Guzzle\Tests\GuzzleTestCase
$this->assertTrue($cookie->matchesPath('/foo'));
$cookie->setPath('/foo');
+
+ // o The cookie-path and the request-path are identical.
$this->assertTrue($cookie->matchesPath('/foo'));
- $this->assertTrue($cookie->matchesPath('/foo/bar'));
$this->assertFalse($cookie->matchesPath('/bar'));
+
+ // o The cookie-path is a prefix of the request-path, and the first
+ // character of the request-path that is not included in the cookie-
+ // path is a %x2F ("/") character.
+ $this->assertTrue($cookie->matchesPath('/foo/bar'));
+ $this->assertFalse($cookie->matchesPath('/fooBar'));
+
+ // o The cookie-path is a prefix of the request-path, and the last
+ // character of the cookie-path is %x2F ("/").
+ $cookie->setPath('/foo/');
+ $this->assertTrue($cookie->matchesPath('/foo/bar'));
+ $this->assertFalse($cookie->matchesPath('/fooBaz'));
+ $this->assertFalse($cookie->matchesPath('/foo'));
+
}
public function cookieValidateProvider()
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Mock/MockPluginTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Mock/MockPluginTest.php
index 52be806099..3760abdbe6 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Mock/MockPluginTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Mock/MockPluginTest.php
@@ -119,8 +119,9 @@ class MockPluginTest extends \Guzzle\Tests\GuzzleTestCase
/**
* @depends testAddsResponseFilesToQueue
+ * @expectedException \OutOfBoundsException
*/
- public function testUpdateIgnoresWhenEmpty()
+ public function testUpdateThrowsExceptionWhenEmpty()
{
$p = new MockPlugin();
$p->onRequestBeforeSend(new Event());
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Oauth/OauthPluginTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Oauth/OauthPluginTest.php
index ed753177ae..3892fb62b9 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Oauth/OauthPluginTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Plugin/Oauth/OauthPluginTest.php
@@ -3,6 +3,7 @@
namespace Guzzle\Tests\Plugin\Oauth;
use Guzzle\Http\Message\RequestFactory;
+use Guzzle\Http\QueryAggregator\CommaAggregator;
use Guzzle\Plugin\Oauth\OauthPlugin;
use Guzzle\Common\Event;
@@ -149,6 +150,21 @@ class OauthPluginTest extends \Guzzle\Tests\GuzzleTestCase
$this->assertContains('a%255Bb%255D%255Bc%255D%3Dd%26a%255Bb%255D%255Be%255D%3Df%26c%3Dd%26e%3Df%26', $p->getStringToSign($request, self::TIMESTAMP, self::NONCE));
}
+ /**
+ * @depends testMultiDimensionalArray
+ */
+ public function testMultiDimensionalArrayWithNonDefaultQueryAggregator()
+ {
+ $p = new OauthPlugin($this->config);
+ $request = $this->getRequest();
+ $aggregator = new CommaAggregator();
+ $query = $request->getQuery()->setAggregator($aggregator)
+ ->set('g', array('h', 'i', 'j'))
+ ->set('k', array('l'))
+ ->set('m', array('n', 'o'));
+ $this->assertContains('a%3Db%26c%3Dd%26e%3Df%26g%3Dh%2Ci%2Cj%26k%3Dl%26m%3Dn%2Co', $p->getStringToSign($request, self::TIMESTAMP, self::NONCE));
+ }
+
/**
* @depends testCreatesStringToSignFromPostRequest
*/
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/ClientTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/ClientTest.php
index 6ca92cd137..aee29ed8da 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/ClientTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/ClientTest.php
@@ -304,4 +304,17 @@ class ClientTest extends \Guzzle\Tests\GuzzleTestCase
}
}
}
+
+ public function testGetCommandAfterTwoSetDescriptions()
+ {
+ $service1 = ServiceDescription::factory(__DIR__ . '/../TestData/test_service.json');
+ $service2 = ServiceDescription::factory(__DIR__ . '/../TestData/test_service_3.json');
+
+ $client = new Mock\MockClient();
+
+ $client->setDescription($service1);
+ $client->getCommand('foo_bar');
+ $client->setDescription($service2);
+ $client->getCommand('baz_qux');
+ }
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/CommandTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/CommandTest.php
index 1b95ac3b8b..b7173d4862 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/CommandTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/CommandTest.php
@@ -134,11 +134,19 @@ class CommandTest extends AbstractCommandTest
*/
public function testConvertsInvalidJsonResponsesToArray()
{
+ $json = '{ "key": "Hi!" }invalid';
+ // Some implementations of php-json extension are not strict enough
+ // and allow to parse invalid json ignoring invalid parts
+ // See https://github.com/remicollet/pecl-json-c/issues/5
+ if (json_decode($json) && JSON_ERROR_NONE === json_last_error()) {
+ $this->markTestSkipped('php-pecl-json library regression issues');
+ }
+
$client = $this->getClient();
$this->setMockResponse($client, array(
new \Guzzle\Http\Message\Response(200, array(
'Content-Type' => 'application/json'
- ), '{ "key": "Hi!" }invalid'
+ ), $json
)
));
$command = new MockCommand();
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/LocationVisitor/Response/XmlVisitorTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/LocationVisitor/Response/XmlVisitorTest.php
index e7acc3247d..f87cec7cd3 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/LocationVisitor/Response/XmlVisitorTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Command/LocationVisitor/Response/XmlVisitorTest.php
@@ -412,4 +412,20 @@ class XmlVisitorTest extends AbstractResponseVisitorTest
$visitor->visit($this->command, $this->response, $param, $this->value);
$this->assertEquals(array('foo' => array('bar' => 15)), $this->value);
}
+
+ public function testProperlyHandlesEmptyStringValues()
+ {
+ $visitor = new Visitor();
+ $param = new Parameter(array(
+ 'name' => 'foo',
+ 'type' => 'object',
+ 'properties' => array(
+ 'bar' => array('type' => 'string')
+ ),
+ ));
+ $xml = ' ';
+ $value = json_decode(json_encode(new \SimpleXMLElement($xml)), true);
+ $visitor->visit($this->command, $this->response, $param, $value);
+ $this->assertEquals(array('foo' => array('bar' => '')), $value);
+ }
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Resource/ResourceIteratorTest.php b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Resource/ResourceIteratorTest.php
index 2cd03187d3..573fb6d6e3 100644
--- a/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Resource/ResourceIteratorTest.php
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/Service/Resource/ResourceIteratorTest.php
@@ -66,7 +66,6 @@ class ResourceIteratorTest extends \Guzzle\Tests\GuzzleTestCase
));
$d = array();
- reset($ri);
foreach ($ri as $data) {
$d[] = $data;
}
diff --git a/vendor/guzzle/guzzle/tests/Guzzle/Tests/TestData/test_service_3.json b/vendor/guzzle/guzzle/tests/Guzzle/Tests/TestData/test_service_3.json
new file mode 100644
index 0000000000..ae2ae0bd49
--- /dev/null
+++ b/vendor/guzzle/guzzle/tests/Guzzle/Tests/TestData/test_service_3.json
@@ -0,0 +1,40 @@
+{
+ "includes": [ "test_service2.json" ],
+ "operations": {
+ "test": {
+ "uri": "/path"
+ },
+ "concrete": {
+ "extends": "abstract"
+ },
+ "baz_qux": {
+ "uri": "/testing",
+ "parameters": {
+ "other": {
+ "location": "json",
+ "location_key": "Other"
+ },
+ "test": {
+ "type": "object",
+ "location": "json",
+ "properties": {
+ "baz": {
+ "type": "boolean",
+ "default": true
+ },
+ "bar": {
+ "type": "string",
+ "filters": [
+ {
+ "method": "strtolower",
+ "args": ["test", "@value"]
+ },
+ "strtoupper"
+ ]
+ }
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/vendor/imagine/imagine/CHANGELOG.md b/vendor/imagine/imagine/CHANGELOG.md
index 46ff1e70f8..b24c4ad62d 100644
--- a/vendor/imagine/imagine/CHANGELOG.md
+++ b/vendor/imagine/imagine/CHANGELOG.md
@@ -22,6 +22,7 @@
* Add width parameter to Drawer::text (@salemgolemugoo).
* Add NotSupportedException when a driver does not support an operation (@rouffj).
* Add support for metadata.
+ * Fix #158: GD alpha detection + Color::isOpaque are broken.
### 0.5.0 (2013-07-10)
diff --git a/vendor/imagine/imagine/README.md b/vendor/imagine/imagine/README.md
index 7c21cead69..837706428e 100644
--- a/vendor/imagine/imagine/README.md
+++ b/vendor/imagine/imagine/README.md
@@ -2,6 +2,8 @@
[](http://stillmaintained.com/avalanche123/Imagine)
[](http://travis-ci.org/avalanche123/Imagine)
+Tweet about it using the [#php_imagine](https://twitter.com/search?q=%23php_imagine) hashtag.
+
Image manipulation library for PHP 5.3 inspired by Python's PIL and other image
libraries.
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Exception/NotSupportedException.html b/vendor/imagine/imagine/docs/API/API/Imagine/Exception/NotSupportedException.html
new file mode 100644
index 0000000000..91fb95c6da
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Exception/NotSupportedException.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+ Imagine\Exception\NotSupportedException |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Exception\NotSupportedException
+
+
+ class
+ NotSupportedException extends RuntimeException implements
+ Exception
+
+
+ Should be used when a driver does not support an operation.
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Filter/Transformation.html b/vendor/imagine/imagine/docs/API/API/Imagine/Filter/Transformation.html
index 376164e287..3c196b36eb 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Filter/Transformation.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Filter/Transformation.html
@@ -303,7 +303,7 @@
- at line 98
+ at line 95
public array
getFilters()
@@ -328,7 +328,7 @@
- at line 111
+ at line 108
public ImageInterface
apply(ImageInterface $image)
@@ -365,7 +365,7 @@
- at line 123
+ at line 120
public ManipulatorInterface
copy()
@@ -401,7 +401,7 @@
- at line 131
+ at line 128
public ManipulatorInterface
crop(PointInterface $start, BoxInterface $size)
@@ -459,7 +459,7 @@
- at line 139
+ at line 136
public ManipulatorInterface
flipHorizontally()
@@ -495,7 +495,7 @@
- at line 147
+ at line 144
public ManipulatorInterface
flipVertically()
@@ -531,7 +531,7 @@
- at line 155
+ at line 152
public ManipulatorInterface
strip()
@@ -567,7 +567,7 @@
- at line 163
+ at line 160
public ManipulatorInterface
paste(ImageInterface $image, PointInterface $start)
@@ -629,7 +629,7 @@
- at line 171
+ at line 168
public ManipulatorInterface
applyMask(ImageInterface $mask)
@@ -666,7 +666,7 @@
- at line 179
+ at line 176
public ManipulatorInterface
fill(FillInterface $fill)
@@ -703,7 +703,7 @@
- at line 187
+ at line 184
public ManipulatorInterface
resize(BoxInterface $size, string $filter = ImageInterface::FILTER_UNDEFINED)
@@ -756,7 +756,7 @@
- at line 195
+ at line 192
public ManipulatorInterface
rotate(integer $angle, ColorInterface $background = null)
@@ -809,7 +809,7 @@ area of rotated image.
- at line 203
+ at line 200
public ManipulatorInterface
save(string $path = null, array $options = array())
@@ -862,7 +862,7 @@ area of rotated image.
- at line 211
+ at line 208
public ManipulatorInterface
show(string $format, array $options = array())
@@ -915,7 +915,7 @@ area of rotated image.
- at line 219
+ at line 216
public ManipulatorInterface
thumbnail(BoxInterface $size, string $mode = ImageInterface::THUMBNAIL_INSET, string $filter = ImageInterface::FILTER_UNDEFINED)
@@ -973,7 +973,7 @@ area of rotated image.
- at line 232
+ at line 229
public Transformation
add(FilterInterface $filter, int $priority)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Drawer.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Drawer.html
index f9fa91c646..c59d986d5b 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Drawer.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Drawer.html
@@ -238,7 +238,7 @@
- at line 81
+ at line 77
public DrawerInterface
chord(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -321,7 +321,7 @@
- at line 113
+ at line 106
public DrawerInterface
ellipse(PointInterface $center, BoxInterface $size, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -392,7 +392,7 @@
- at line 144
+ at line 135
public DrawerInterface
line(PointInterface $start, PointInterface $end, ColorInterface $color, integer $thickness = 1)
@@ -447,7 +447,7 @@
- at line 170
+ at line 158
public DrawerInterface
pieSlice(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -530,7 +530,7 @@
- at line 202
+ at line 187
public DrawerInterface
dot(PointInterface $position, ColorInterface $color)
@@ -583,7 +583,7 @@
- at line 226
+ at line 208
public DrawerInterface
polygon(array $coordinates, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -648,7 +648,7 @@ three coordinates
- at line 265
+ at line 245
public DrawerInterface
text(string $string, AbstractFont $font, PointInterface $position, integer $angle, integer $width = null)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Effects.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Effects.html
index 6d06a40903..b324de60d4 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Effects.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Effects.html
@@ -309,7 +309,7 @@
- at line 88
+ at line 86
public EffectsInterface
sharpen()
@@ -345,7 +345,7 @@
- at line 103
+ at line 101
public EffectsInterface
blur(float|int $sigma = 1)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Image.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Image.html
index d6801a0473..e334281fe2 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Image.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Image.html
@@ -454,7 +454,7 @@
- at line 59
+ at line 58
public
__construct(resource $resource, PaletteInterface $palette, MetadataBag $metadata)
@@ -493,7 +493,7 @@
- at line 69
+ at line 68
public
__destruct()
@@ -509,7 +509,7 @@
- at line 81
+ at line 80
public resource
getGdResource()
@@ -535,7 +535,7 @@
- at line 89
+ at line 88
final public ManipulatorInterface
copy()
@@ -571,7 +571,7 @@
- at line 106
+ at line 103
final public ManipulatorInterface
crop(PointInterface $start, BoxInterface $size)
@@ -629,7 +629,7 @@
- at line 136
+ at line 128
final public ManipulatorInterface
paste(ImageInterface $image, PointInterface $start)
@@ -691,7 +691,7 @@
- at line 170
+ at line 155
final public ManipulatorInterface
resize(BoxInterface $size, string $filter = ImageInterface::FILTER_UNDEFINED)
@@ -744,7 +744,7 @@
- at line 203
+ at line 186
final public ManipulatorInterface
rotate(integer $angle, ColorInterface $background = null)
@@ -797,7 +797,7 @@ area of rotated image.
- at line 223
+ at line 204
final public ManipulatorInterface
save(string $path = null, array $options = array())
@@ -850,7 +850,7 @@ area of rotated image.
- at line 250
+ at line 229
public ManipulatorInterface
show(string $format, array $options = array())
@@ -903,7 +903,7 @@ area of rotated image.
- at line 262
+ at line 241
public string
get(string $format, array $options = array())
@@ -955,7 +955,7 @@ area of rotated image.
- at line 273
+ at line 252
public string
__toString()
@@ -990,7 +990,7 @@ area of rotated image.
- at line 281
+ at line 260
final public ManipulatorInterface
flipHorizontally()
@@ -1026,7 +1026,7 @@ area of rotated image.
- at line 305
+ at line 283
final public ManipulatorInterface
flipVertically()
@@ -1062,7 +1062,7 @@ area of rotated image.
- at line 329
+ at line 306
final public ManipulatorInterface
strip()
@@ -1098,7 +1098,7 @@ area of rotated image.
- at line 341
+ at line 315
public DrawerInterface
draw()
@@ -1124,7 +1124,7 @@ area of rotated image.
- at line 349
+ at line 323
public EffectsInterface
effects()
@@ -1151,7 +1151,7 @@ area of rotated image.
- at line 357
+ at line 331
public BoxInterface
getSize()
@@ -1177,7 +1177,7 @@ area of rotated image.
- at line 365
+ at line 339
public ManipulatorInterface
applyMask(ImageInterface $mask)
@@ -1214,7 +1214,7 @@ area of rotated image.
- at line 406
+ at line 371
public ManipulatorInterface
fill(FillInterface $fill)
@@ -1251,7 +1251,7 @@ area of rotated image.
- at line 428
+ at line 389
public ImageInterface
mask()
@@ -1277,7 +1277,7 @@ area of rotated image.
- at line 442
+ at line 403
public array
histogram()
@@ -1303,7 +1303,7 @@ area of rotated image.
- at line 459
+ at line 420
public ColorInterface
getColorAt(PointInterface $point)
@@ -1350,7 +1350,7 @@ area of rotated image.
- at line 482
+ at line 435
public LayersInterface
layers()
@@ -1389,7 +1389,7 @@ area of rotated image.
- at line 494
+ at line 447
public ImageInterface
interlace(string $scheme)
@@ -1435,7 +1435,7 @@ area of rotated image.
- at line 515
+ at line 468
public PaletteInterface
palette()
@@ -1461,7 +1461,7 @@ area of rotated image.
- at line 523
+ at line 476
public ImageInterface
profile(ProfileInterface $profile)
@@ -1508,7 +1508,7 @@ area of rotated image.
- at line 531
+ at line 484
public ImageInterface
usePalette(PaletteInterface $palette)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Imagine.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Imagine.html
index 420dc59d96..501866677e 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Imagine.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gd/Imagine.html
@@ -218,7 +218,7 @@
- at line 62
+ at line 46
public ImageInterface
create(BoxInterface $size, ColorInterface $color = null)
@@ -276,7 +276,7 @@
- at line 105
+ at line 84
public ImageInterface
open(string $path)
@@ -323,7 +323,7 @@
- at line 127
+ at line 104
public ImageInterface
load(string $string)
@@ -370,7 +370,7 @@
- at line 141
+ at line 112
public ImageInterface
read(resource $resource)
@@ -417,7 +417,7 @@
- at line 159
+ at line 130
public FontInterface
font(string $file, integer $size, ColorInterface $color)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Drawer.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Drawer.html
index 9e6c525624..460e2c721e 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Drawer.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Drawer.html
@@ -135,7 +135,7 @@
Details
- at line 36
+ at line 37
public
__construct(Gmagick $gmagick)
@@ -163,7 +163,7 @@
- at line 44
+ at line 45
public DrawerInterface
arc(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, integer $thickness = 1)
@@ -240,7 +240,7 @@
- at line 84
+ at line 83
public DrawerInterface
chord(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -323,7 +323,7 @@
- at line 130
+ at line 127
public DrawerInterface
ellipse(PointInterface $center, BoxInterface $size, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -394,7 +394,7 @@
- at line 173
+ at line 168
public DrawerInterface
line(PointInterface $start, PointInterface $end, ColorInterface $color, integer $thickness = 1)
@@ -449,7 +449,7 @@
- at line 206
+ at line 199
public DrawerInterface
pieSlice(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -532,7 +532,7 @@
- at line 240
+ at line 233
public DrawerInterface
dot(PointInterface $position, ColorInterface $color)
@@ -585,7 +585,7 @@
- at line 269
+ at line 259
public DrawerInterface
polygon(array $coordinates, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -650,7 +650,7 @@ three coordinates
- at line 312
+ at line 297
public DrawerInterface
text(string $string, AbstractFont $font, PointInterface $position, integer $angle, integer $width = null)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Effects.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Effects.html
index 082ad0b456..684860da34 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Effects.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Effects.html
@@ -226,7 +226,7 @@
- at line 67
+ at line 66
public EffectsInterface
grayscale()
@@ -262,7 +262,7 @@
- at line 81
+ at line 80
public EffectsInterface
colorize(ColorInterface $color)
@@ -309,7 +309,7 @@
- at line 89
+ at line 88
public EffectsInterface
sharpen()
@@ -345,7 +345,7 @@
- at line 97
+ at line 96
public EffectsInterface
blur(float|int $sigma = 1)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Image.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Image.html
index d6f1d85297..5069c175dd 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Image.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Image.html
@@ -639,7 +639,7 @@
- at line 129
+ at line 118
public ManipulatorInterface
flipHorizontally()
@@ -675,7 +675,7 @@
- at line 145
+ at line 132
public ManipulatorInterface
flipVertically()
@@ -711,7 +711,7 @@
- at line 161
+ at line 146
public ManipulatorInterface
strip()
@@ -747,7 +747,7 @@
- at line 178
+ at line 161
public ManipulatorInterface
paste(ImageInterface $image, PointInterface $start)
@@ -809,7 +809,7 @@
- at line 213
+ at line 183
public ManipulatorInterface
resize(BoxInterface $size, string $filter = ImageInterface::FILTER_UNDEFINED)
@@ -862,7 +862,7 @@
- at line 257
+ at line 220
public ManipulatorInterface
rotate(integer $angle, ColorInterface $background = null)
@@ -915,7 +915,7 @@ area of rotated image.
- at line 344
+ at line 305
public ManipulatorInterface
save(string $path = null, array $options = array())
@@ -968,7 +968,7 @@ area of rotated image.
- at line 370
+ at line 327
public ManipulatorInterface
show(string $format, array $options = array())
@@ -1021,7 +1021,7 @@ area of rotated image.
- at line 381
+ at line 338
public string
get(string $format, array $options = array())
@@ -1073,7 +1073,7 @@ area of rotated image.
- at line 429
+ at line 382
public string
__toString()
@@ -1108,7 +1108,7 @@ area of rotated image.
- at line 437
+ at line 390
public DrawerInterface
draw()
@@ -1134,7 +1134,7 @@ area of rotated image.
- at line 445
+ at line 398
public EffectsInterface
effects()
@@ -1161,7 +1161,7 @@ area of rotated image.
- at line 453
+ at line 406
public BoxInterface
getSize()
@@ -1187,7 +1187,7 @@ area of rotated image.
- at line 470
+ at line 421
public ManipulatorInterface
applyMask(ImageInterface $mask)
@@ -1224,7 +1224,7 @@ area of rotated image.
- at line 509
+ at line 447
public ImageInterface
mask()
@@ -1250,7 +1250,7 @@ area of rotated image.
- at line 527
+ at line 463
public ManipulatorInterface
fill(FillInterface $fill)
@@ -1287,7 +1287,7 @@ area of rotated image.
- at line 559
+ at line 493
public array
histogram()
@@ -1313,7 +1313,7 @@ area of rotated image.
- at line 582
+ at line 511
public ColorInterface
getColorAt(PointInterface $point)
@@ -1360,7 +1360,7 @@ area of rotated image.
- at line 617
+ at line 544
public ColorInterface
pixelToColor(GmagickPixel $pixel)
@@ -1405,7 +1405,7 @@ area of rotated image.
- at line 656
+ at line 581
public LayersInterface
layers()
@@ -1444,7 +1444,7 @@ area of rotated image.
- at line 664
+ at line 589
public ImageInterface
interlace(string $scheme)
@@ -1490,7 +1490,7 @@ area of rotated image.
- at line 685
+ at line 610
public ImageInterface
usePalette(PaletteInterface $palette)
@@ -1536,7 +1536,7 @@ area of rotated image.
- at line 723
+ at line 645
public PaletteInterface
palette()
@@ -1562,7 +1562,7 @@ area of rotated image.
- at line 731
+ at line 653
public ImageInterface
profile(ProfileInterface $profile)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Imagine.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Imagine.html
index a561db8044..174db89842 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Imagine.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Imagine.html
@@ -191,7 +191,7 @@
- at line 33
+ at line 34
public
__construct()
@@ -218,7 +218,7 @@
- at line 43
+ at line 44
public ImageInterface
open(string $path)
@@ -265,7 +265,7 @@
- at line 68
+ at line 67
public ImageInterface
create(BoxInterface $size, ColorInterface $color = null)
@@ -323,7 +323,7 @@
- at line 117
+ at line 111
public ImageInterface
load(string $string)
@@ -370,7 +370,7 @@
- at line 134
+ at line 119
public ImageInterface
read(resource $resource)
@@ -417,7 +417,7 @@
- at line 152
+ at line 137
public FontInterface
font(string $file, integer $size, ColorInterface $color)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Layers.html b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Layers.html
index 655a90fd1f..6b06952847 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Layers.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Gmagick/Layers.html
@@ -480,7 +480,7 @@
- at line 46
+ at line 49
public
__construct(Image $image, PaletteInterface $palette, Gmagick $resource)
@@ -520,7 +520,7 @@
- at line 56
+ at line 59
public
merge()
@@ -546,7 +546,7 @@
- at line 73
+ at line 74
public
coalesce()
@@ -562,7 +562,7 @@ the sequence.
- at line 81
+ at line 82
public LayersInterface
animate(string $format, integer $delay, integer $loops)
@@ -621,7 +621,7 @@ the sequence.
- at line 116
+ at line 117
public
current()
@@ -637,7 +637,7 @@ the sequence.
- at line 148
+ at line 146
public
key()
@@ -653,7 +653,7 @@ the sequence.
- at line 156
+ at line 154
public
next()
@@ -669,7 +669,7 @@ the sequence.
- at line 164
+ at line 162
public
rewind()
@@ -685,7 +685,7 @@ the sequence.
- at line 172
+ at line 170
public
valid()
@@ -701,7 +701,7 @@ the sequence.
- at line 180
+ at line 178
public
count()
@@ -717,7 +717,7 @@ the sequence.
- at line 194
+ at line 190
public
offsetExists($offset)
@@ -744,7 +744,7 @@ the sequence.
- at line 202
+ at line 198
public
offsetGet($offset)
@@ -771,7 +771,7 @@ the sequence.
- at line 210
+ at line 206
public
offsetSet($offset, $image)
@@ -804,7 +804,7 @@ the sequence.
- at line 266
+ at line 257
public
offsetUnset($offset)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/AbstractImage.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/AbstractImage.html
new file mode 100644
index 0000000000..88ec5758ca
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/AbstractImage.html
@@ -0,0 +1,177 @@
+
+
+
+
+
+ Imagine\Image\AbstractImage |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Image\AbstractImage
+
+
+ abstract class
+ AbstractImage implements
+ ImageInterface
+
+
+
+
+ Methods
+
+
+
+
+ ManipulatorInterface
+
+
+ thumbnail(BoxInterface $size, string $mode = ImageInterface::THUMBNAIL_INSET, string $filter = ImageInterface::FILTER_UNDEFINED)
+ Generates a thumbnail from a current image Returns it as a new image, doesn't modify the current image
+
+
+
+
+
+ MetadataInterface
+
+
+ metadata()
+ Returns the Image's meta data
+
+
+
+
+
+
+
+
+ __clone()
+ Assures the metadata instance will be cloned, too
+
+
+
+
+
+
+ Details
+
+
+ at line 27
+ public ManipulatorInterface
+ thumbnail(BoxInterface $size, string $mode = ImageInterface::THUMBNAIL_INSET, string $filter = ImageInterface::FILTER_UNDEFINED)
+
+
+ Generates a thumbnail from a current image Returns it as a new image, doesn't modify the current image
+
+
+
+
+
+
+ at line 103
+ public MetadataInterface
+ metadata()
+
+
+ Returns the Image's meta data
+
+
+
+
+
+
+ at line 111
+ public
+ __clone()
+
+
+ Assures the metadata instance will be cloned, too
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/AbstractImagine.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/AbstractImagine.html
new file mode 100644
index 0000000000..e4c0da532d
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/AbstractImagine.html
@@ -0,0 +1,134 @@
+
+
+
+
+
+ Imagine\Image\AbstractImagine |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Image\AbstractImagine
+
+
+ abstract class
+ AbstractImagine implements
+ ImagineInterface
+
+
+
+
+ Methods
+
+
+
+
+ ImagineInterface
+
+
+ setMetadataReader(MetadataReaderInterface $metadataReader)
+
+
+
+
+
+
+
+ MetadataReaderInterface
+
+
+ getMetadataReader()
+
+
+
+
+
+
+
+
+ Details
+
+
+ at line 27
+ public ImagineInterface
+ setMetadataReader(MetadataReaderInterface $metadataReader)
+
+
+
+
+
+
+
+
+
+
+ at line 37
+ public MetadataReaderInterface
+ getMetadataReader()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Box.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Box.html
index 0bfd6fa07d..08931f45a7 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Box.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Box.html
@@ -187,7 +187,7 @@
- at line 55
+ at line 52
public integer
getWidth()
@@ -213,7 +213,7 @@
- at line 63
+ at line 60
public integer
getHeight()
@@ -239,7 +239,7 @@
- at line 71
+ at line 68
public BoxInterface
scale(float $ratio)
@@ -276,7 +276,7 @@
- at line 79
+ at line 76
public BoxInterface
increase(integer $size)
@@ -313,7 +313,7 @@
- at line 87
+ at line 84
public Boolean
contains(BoxInterface $box, PointInterface $start = null)
@@ -356,7 +356,7 @@
- at line 99
+ at line 94
public integer
square()
@@ -382,7 +382,7 @@
- at line 107
+ at line 102
public string
__toString()
@@ -408,7 +408,7 @@
- at line 115
+ at line 110
public BoxInterface
widen(integer $width)
@@ -445,7 +445,7 @@
- at line 123
+ at line 118
public BoxInterface
heighten(integer $height)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Histogram/Range.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Histogram/Range.html
index 08086f4fa8..476eaa97b7 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Histogram/Range.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Histogram/Range.html
@@ -109,7 +109,7 @@
- at line 55
+ at line 52
public Boolean
contains(integer $value)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata.html
new file mode 100644
index 0000000000..87a56953c2
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata.html
@@ -0,0 +1,60 @@
+
+
+
+
+
+ Imagine\Image\Metadata |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Namespace
+ Imagine\Image\Metadata
+
+
+
+
+ AbstractMetadataReader
+
+
+
+
+ DefaultMetadataReader
+ Default metadata reader
+
+
+ ExifMetadataReader
+ Metadata driven by Exif information
+
+
+ MetadataBag
+ An interface for Image Metadata
+
+
+
+ Interfaces
+
+
+ MetadataReaderInterface
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/AbstractMetadataReader.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/AbstractMetadataReader.html
new file mode 100644
index 0000000000..7cdfd5fa50
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/AbstractMetadataReader.html
@@ -0,0 +1,203 @@
+
+
+
+
+
+ Imagine\Image\Metadata\AbstractMetadataReader |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Image\Metadata\AbstractMetadataReader
+
+
+ abstract class
+ AbstractMetadataReader implements
+ MetadataReaderInterface
+
+
+
+
+ Methods
+
+
+
+
+ MetadataBag
+
+
+ readFile($file $file)
+ Reads metadata from a file.
+
+
+
+
+
+ MetadataBag
+
+
+ readData($data $data)
+ Reads metadata from a binary string.
+
+
+
+
+
+ MetadataBag
+
+
+ readStream($resource $resource)
+ Reads metadata from a stream.
+
+
+
+
+
+
+ Details
+
+
+ at line 21
+ public MetadataBag
+ readFile($file $file)
+
+
+ Reads metadata from a file.
+
+
+
+
+
+
+ at line 37
+ public MetadataBag
+ readData($data $data)
+
+
+ Reads metadata from a binary string.
+
+
+
+
+
+
+ at line 45
+ public MetadataBag
+ readStream($resource $resource)
+
+
+ Reads metadata from a stream.
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/DefaultMetadataReader.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/DefaultMetadataReader.html
new file mode 100644
index 0000000000..b8b3e9defb
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/DefaultMetadataReader.html
@@ -0,0 +1,207 @@
+
+
+
+
+
+ Imagine\Image\Metadata\DefaultMetadataReader |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Image\Metadata\DefaultMetadataReader
+
+
+ class
+ DefaultMetadataReader extends AbstractMetadataReader
+
+
+ Default metadata reader
+
+
+
+
+
+
+ Methods
+
+
+
+
+ MetadataBag
+
+
+ readFile($file $file)
+ Reads metadata from a file.
+
+ from AbstractMetadataReader
+
+
+
+ MetadataBag
+
+
+ readData($data $data)
+ Reads metadata from a binary string.
+
+ from AbstractMetadataReader
+
+
+
+ MetadataBag
+
+
+ readStream($resource $resource)
+ Reads metadata from a stream.
+
+ from AbstractMetadataReader
+
+
+
+
+ Details
+
+
+ in AbstractMetadataReader at line 21
+ public MetadataBag
+ readFile($file $file)
+
+
+ Reads metadata from a file.
+
+
+
+
+
+
+ in AbstractMetadataReader at line 37
+ public MetadataBag
+ readData($data $data)
+
+
+ Reads metadata from a binary string.
+
+
+
+
+
+
+ in AbstractMetadataReader at line 45
+ public MetadataBag
+ readStream($resource $resource)
+
+
+ Reads metadata from a stream.
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/ExifMetadataReader.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/ExifMetadataReader.html
new file mode 100644
index 0000000000..d19bb702f6
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/ExifMetadataReader.html
@@ -0,0 +1,235 @@
+
+
+
+
+
+ Imagine\Image\Metadata\ExifMetadataReader |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Image\Metadata\ExifMetadataReader
+
+
+ class
+ ExifMetadataReader extends AbstractMetadataReader
+
+
+ Metadata driven by Exif information
+
+
+
+
+
+
+ Methods
+
+
+
+
+ MetadataBag
+
+
+ readFile($file $file)
+ Reads metadata from a file.
+
+ from AbstractMetadataReader
+
+
+
+ MetadataBag
+
+
+ readData($data $data)
+ Reads metadata from a binary string.
+
+ from AbstractMetadataReader
+
+
+
+ MetadataBag
+
+
+ readStream($resource $resource)
+ Reads metadata from a stream.
+
+ from AbstractMetadataReader
+
+
+
+
+
+
+ __construct()
+
+
+
+
+
+
+
+
+ Details
+
+
+ in AbstractMetadataReader at line 21
+ public MetadataBag
+ readFile($file $file)
+
+
+ Reads metadata from a file.
+
+
+
+
+
+
+ in AbstractMetadataReader at line 37
+ public MetadataBag
+ readData($data $data)
+
+
+ Reads metadata from a binary string.
+
+
+
+
+
+
+ in AbstractMetadataReader at line 45
+ public MetadataBag
+ readStream($resource $resource)
+
+
+ Reads metadata from a stream.
+
+
+
+
+
+
+ at line 22
+ public
+ __construct()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/MetadataBag.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/MetadataBag.html
new file mode 100644
index 0000000000..a8a4c58bad
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/MetadataBag.html
@@ -0,0 +1,306 @@
+
+
+
+
+
+ Imagine\Image\Metadata\MetadataBag |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Class
+ Imagine\Image\Metadata\MetadataBag
+
+
+ class
+ MetadataBag implements
+ ArrayAccess, IteratorAggregate
+
+
+ An interface for Image Metadata
+
+
+
+
+
+
+ Methods
+
+
+
+
+
+
+
+ __construct(array $data = array())
+
+
+
+
+
+
+
+
+
+
+ getIterator()
+ {@inheritdoc}
+
+
+
+
+
+
+
+
+ offsetExists($offset)
+ {@inheritdoc}
+
+
+
+
+
+
+
+
+ offsetSet($offset, $value)
+ {@inheritdoc}
+
+
+
+
+
+
+
+
+ offsetUnset($offset)
+ {@inheritdoc}
+
+
+
+
+
+
+
+
+ offsetGet($offset)
+ {@inheritdoc}
+
+
+
+
+
+ array
+
+
+ toArray()
+ Returns metadata as an array
+
+
+
+
+
+
+ Details
+
+
+ at line 22
+ public
+ __construct(array $data = array())
+
+
+
+
+
+
+
+
+
+
+ at line 30
+ public
+ getIterator()
+
+
+ {@inheritdoc}
+
+
+
+
+
+
+ at line 38
+ public
+ offsetExists($offset)
+
+
+ {@inheritdoc}
+
+
+
+
+
+
+ at line 46
+ public
+ offsetSet($offset, $value)
+
+
+ {@inheritdoc}
+
+
+
+
+
+
+ at line 54
+ public
+ offsetUnset($offset)
+
+
+ {@inheritdoc}
+
+
+
+
+
+
+ at line 62
+ public
+ offsetGet($offset)
+
+
+ {@inheritdoc}
+
+
+
+
+
+
+ at line 72
+ public array
+ toArray()
+
+
+ Returns metadata as an array
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/MetadataReaderInterface.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/MetadataReaderInterface.html
new file mode 100644
index 0000000000..fd66cd7e1e
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/MetadataReaderInterface.html
@@ -0,0 +1,202 @@
+
+
+
+
+
+ Imagine\Image\Metadata\MetadataReaderInterface |
+
+
+
+
+
+ - Classes
+ - Namespaces
+ - Interfaces
+ - Traits
+ - Index
+
+
+
+
+
+ Interface
+ Imagine\Image\Metadata\MetadataReaderInterface
+
+
+ interface
+ MetadataReaderInterface
+
+
+
+
+ Methods
+
+
+
+
+ MetadataBag
+
+
+ readFile($file $file)
+ Reads metadata from a file.
+
+
+
+
+
+ MetadataBag
+
+
+ readData($data $data)
+ Reads metadata from a binary string.
+
+
+
+
+
+ MetadataBag
+
+
+ readStream($resource $resource)
+ Reads metadata from a stream.
+
+
+
+
+
+
+ Details
+
+
+ at line 27
+ public MetadataBag
+ readFile($file $file)
+
+
+ Reads metadata from a file.
+
+
+
+
+
+
+ at line 36
+ public MetadataBag
+ readData($data $data)
+
+
+ Reads metadata from a binary string.
+
+
+
+
+
+
+ at line 47
+ public MetadataBag
+ readStream($resource $resource)
+
+
+ Reads metadata from a stream.
+
+
+
+
+
+
+
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/namespace-frame.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/namespace-frame.html
new file mode 100644
index 0000000000..4ea05d0781
--- /dev/null
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Metadata/namespace-frame.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+ Imagine\Image\Metadata |
+
+
+
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/CMYK.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/CMYK.html
index b3cead88ae..59193e301a 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/CMYK.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/CMYK.html
@@ -265,7 +265,7 @@
- at line 85
+ at line 83
public ColorInterface
blend(ColorInterface $color1, ColorInterface $color2, float $amount)
@@ -313,7 +313,7 @@
- at line 102
+ at line 100
public PaletteInterface
useProfile(ProfileInterface $profile)
@@ -349,7 +349,7 @@
- at line 112
+ at line 110
public ProfileInterface
profile()
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/CMYK.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/CMYK.html
index e005d1227c..682752498f 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/CMYK.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/CMYK.html
@@ -250,7 +250,7 @@
- at line 78
+ at line 76
public integer
getCyan()
@@ -276,7 +276,7 @@
- at line 88
+ at line 86
public integer
getMagenta()
@@ -302,7 +302,7 @@
- at line 98
+ at line 96
public integer
getYellow()
@@ -328,7 +328,7 @@
- at line 108
+ at line 106
public integer
getKeyline()
@@ -354,7 +354,7 @@
- at line 116
+ at line 114
public PaletteInterface
getPalette()
@@ -380,7 +380,7 @@
- at line 124
+ at line 122
public integer
getAlpha()
@@ -406,7 +406,7 @@
- at line 132
+ at line 130
public ColorInterface
dissolve(integer $alpha)
@@ -443,7 +443,7 @@
- at line 140
+ at line 138
public ColorInterface
lighten(integer $shade)
@@ -480,7 +480,7 @@
- at line 155
+ at line 153
public ColorInterface
darken(integer $shade)
@@ -517,7 +517,7 @@
- at line 170
+ at line 168
public ColorInterface
grayscale()
@@ -543,7 +543,7 @@
- at line 186
+ at line 184
public Boolean
isOpaque()
@@ -569,7 +569,7 @@
- at line 196
+ at line 194
public string
__toString()
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/Gray.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/Gray.html
index d42b7eecfc..0c9acd85f8 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/Gray.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/Gray.html
@@ -226,7 +226,7 @@
- at line 62
+ at line 60
public integer
getGray()
@@ -252,7 +252,7 @@
- at line 70
+ at line 68
public PaletteInterface
getPalette()
@@ -278,7 +278,7 @@
- at line 78
+ at line 76
public integer
getAlpha()
@@ -304,7 +304,7 @@
- at line 86
+ at line 84
public ColorInterface
dissolve(integer $alpha)
@@ -341,7 +341,7 @@
- at line 96
+ at line 94
public ColorInterface
lighten(integer $shade)
@@ -378,7 +378,7 @@
- at line 108
+ at line 102
public ColorInterface
darken(integer $shade)
@@ -415,7 +415,7 @@
- at line 120
+ at line 110
public ColorInterface
grayscale()
@@ -441,7 +441,7 @@
- at line 128
+ at line 118
public Boolean
isOpaque()
@@ -467,7 +467,7 @@
- at line 138
+ at line 128
public string
__toString()
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/RGB.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/RGB.html
index 96ab5679bc..04e237805c 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/RGB.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Color/RGB.html
@@ -246,7 +246,7 @@
- at line 76
+ at line 74
public integer
getRed()
@@ -272,7 +272,7 @@
- at line 86
+ at line 84
public integer
getGreen()
@@ -298,7 +298,7 @@
- at line 96
+ at line 94
public integer
getBlue()
@@ -324,7 +324,7 @@
- at line 104
+ at line 102
public PaletteInterface
getPalette()
@@ -350,7 +350,7 @@
- at line 112
+ at line 110
public integer
getAlpha()
@@ -376,7 +376,7 @@
- at line 120
+ at line 118
public ColorInterface
dissolve(integer $alpha)
@@ -413,7 +413,7 @@
- at line 130
+ at line 126
public ColorInterface
lighten(integer $shade)
@@ -450,7 +450,7 @@
- at line 144
+ at line 140
public ColorInterface
darken(integer $shade)
@@ -487,7 +487,7 @@
- at line 158
+ at line 154
public ColorInterface
grayscale()
@@ -513,7 +513,7 @@
- at line 168
+ at line 164
public Boolean
isOpaque()
@@ -539,7 +539,7 @@
- at line 178
+ at line 174
public string
__toString()
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Grayscale.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Grayscale.html
index a219e28f5d..6bfa4d49dd 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Grayscale.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/Grayscale.html
@@ -189,7 +189,7 @@
- at line 63
+ at line 61
public Boolean
supportsAlpha()
@@ -215,7 +215,7 @@
- at line 71
+ at line 69
public PaletteInterface
useProfile(ProfileInterface $profile)
@@ -251,7 +251,7 @@
- at line 81
+ at line 79
public ProfileInterface
profile()
@@ -277,7 +277,7 @@
- at line 95
+ at line 91
public ColorInterface
color(string|array|integer $color, integer|null $alpha = null)
@@ -327,7 +327,7 @@
- at line 114
+ at line 110
public ColorInterface
blend(ColorInterface $color1, ColorInterface $color2, float $amount)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/RGB.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/RGB.html
index 11aac1927d..031c95f2f3 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/RGB.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Palette/RGB.html
@@ -277,7 +277,7 @@
- at line 97
+ at line 95
public ColorInterface
color(string|array|integer $color, integer|null $alpha = null)
@@ -327,7 +327,7 @@
- at line 116
+ at line 114
public ColorInterface
blend(ColorInterface $color1, ColorInterface $color2, float $amount)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Point.html b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Point.html
index 9dd966d120..d237724bae 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Image/Point.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Image/Point.html
@@ -147,7 +147,7 @@
- at line 54
+ at line 52
public integer
getX()
@@ -173,7 +173,7 @@
- at line 62
+ at line 60
public integer
getY()
@@ -199,7 +199,7 @@
- at line 70
+ at line 68
public Boolean
in(BoxInterface $box)
@@ -236,7 +236,7 @@
- at line 78
+ at line 76
public ImageInterface
move(integer $amount)
@@ -273,7 +273,7 @@
- at line 86
+ at line 84
public string
__toString()
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Drawer.html b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Drawer.html
index c8f359961c..4e7642dfcd 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Drawer.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Drawer.html
@@ -240,7 +240,7 @@
- at line 79
+ at line 77
public DrawerInterface
chord(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -323,7 +323,7 @@
- at line 139
+ at line 129
public DrawerInterface
ellipse(PointInterface $center, BoxInterface $size, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -394,7 +394,7 @@
- at line 186
+ at line 174
public DrawerInterface
line(PointInterface $start, PointInterface $end, ColorInterface $color, integer $thickness = 1)
@@ -449,7 +449,7 @@
- at line 221
+ at line 207
public DrawerInterface
pieSlice(PointInterface $center, BoxInterface $size, integer $start, integer $end, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -532,7 +532,7 @@
- at line 255
+ at line 241
public DrawerInterface
dot(PointInterface $position, ColorInterface $color)
@@ -585,7 +585,7 @@
- at line 286
+ at line 270
public DrawerInterface
polygon(array $coordinates, ColorInterface $color, Boolean $fill = false, integer $thickness = 1)
@@ -650,7 +650,7 @@ three coordinates
- at line 336
+ at line 311
public DrawerInterface
text(string $string, AbstractFont $font, PointInterface $position, integer $angle, integer $width = null)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Image.html b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Image.html
index e1d0a6077f..48b6dbc78d 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Image.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Image.html
@@ -581,7 +581,7 @@
- at line 123
+ at line 121
public ManipulatorInterface
crop(PointInterface $start, BoxInterface $size)
@@ -639,7 +639,7 @@
- at line 153
+ at line 141
public ManipulatorInterface
flipHorizontally()
@@ -675,7 +675,7 @@
- at line 169
+ at line 155
public ManipulatorInterface
flipVertically()
@@ -711,7 +711,7 @@
- at line 185
+ at line 169
public ManipulatorInterface
strip()
@@ -747,7 +747,7 @@
- at line 202
+ at line 184
public ManipulatorInterface
paste(ImageInterface $image, PointInterface $start)
@@ -809,7 +809,7 @@
- at line 237
+ at line 206
public ManipulatorInterface
resize(BoxInterface $size, string $filter = ImageInterface::FILTER_UNDEFINED)
@@ -862,7 +862,7 @@
- at line 281
+ at line 243
public ManipulatorInterface
rotate(integer $angle, ColorInterface $background = null)
@@ -915,7 +915,7 @@ area of rotated image.
- at line 304
+ at line 264
public ManipulatorInterface
save(string $path = null, array $options = array())
@@ -968,7 +968,7 @@ area of rotated image.
- at line 328
+ at line 284
public ManipulatorInterface
show(string $format, array $options = array())
@@ -1021,7 +1021,7 @@ area of rotated image.
- at line 339
+ at line 295
public string
get(string $format, array $options = array())
@@ -1073,7 +1073,7 @@ area of rotated image.
- at line 356
+ at line 310
public ImageInterface
interlace(string $scheme)
@@ -1119,7 +1119,7 @@ area of rotated image.
- at line 407
+ at line 360
public string
__toString()
@@ -1154,7 +1154,7 @@ area of rotated image.
- at line 415
+ at line 368
public DrawerInterface
draw()
@@ -1180,7 +1180,7 @@ area of rotated image.
- at line 423
+ at line 376
public EffectsInterface
effects()
@@ -1207,7 +1207,7 @@ area of rotated image.
- at line 431
+ at line 384
public BoxInterface
getSize()
@@ -1233,7 +1233,7 @@ area of rotated image.
- at line 448
+ at line 399
public ManipulatorInterface
applyMask(ImageInterface $mask)
@@ -1270,7 +1270,7 @@ area of rotated image.
- at line 499
+ at line 432
public ImageInterface
mask()
@@ -1296,7 +1296,7 @@ area of rotated image.
- at line 518
+ at line 449
public ManipulatorInterface
fill(FillInterface $fill)
@@ -1333,7 +1333,7 @@ area of rotated image.
- at line 552
+ at line 478
public array
histogram()
@@ -1359,7 +1359,7 @@ area of rotated image.
- at line 575
+ at line 496
public ColorInterface
getColorAt(PointInterface $point)
@@ -1406,7 +1406,7 @@ area of rotated image.
- at line 606
+ at line 522
public ColorInterface
pixelToColor(ImagickPixel $pixel)
@@ -1451,7 +1451,7 @@ area of rotated image.
- at line 637
+ at line 548
public LayersInterface
layers()
@@ -1490,7 +1490,7 @@ area of rotated image.
- at line 645
+ at line 556
public ImageInterface
usePalette(PaletteInterface $palette)
@@ -1536,7 +1536,7 @@ area of rotated image.
- at line 685
+ at line 593
public PaletteInterface
palette()
@@ -1562,7 +1562,7 @@ area of rotated image.
- at line 693
+ at line 601
public ImageInterface
profile(ProfileInterface $profile)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Imagine.html b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Imagine.html
index 56c2606575..6dd6172342 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Imagine.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Imagine.html
@@ -191,7 +191,7 @@
- at line 32
+ at line 33
public
__construct()
@@ -265,7 +265,7 @@
- at line 75
+ at line 74
public ImageInterface
create(BoxInterface $size, ColorInterface $color = null)
@@ -323,7 +323,7 @@
- at line 109
+ at line 103
public ImageInterface
load(string $string)
@@ -370,7 +370,7 @@
- at line 128
+ at line 120
public ImageInterface
read(resource $resource)
@@ -417,7 +417,7 @@
- at line 149
+ at line 139
public FontInterface
font(string $file, integer $size, ColorInterface $color)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Layers.html b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Layers.html
index a4b54c86b7..3e730cddf5 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Layers.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Imagick/Layers.html
@@ -546,7 +546,7 @@
- at line 69
+ at line 67
public LayersInterface
animate(string $format, integer $delay, integer $loops)
@@ -605,7 +605,7 @@
- at line 106
+ at line 104
public
coalesce()
@@ -621,7 +621,7 @@ the sequence.
- at line 132
+ at line 126
public
current()
@@ -637,7 +637,7 @@ the sequence.
- at line 165
+ at line 156
public
key()
@@ -653,7 +653,7 @@ the sequence.
- at line 173
+ at line 164
public
next()
@@ -669,7 +669,7 @@ the sequence.
- at line 181
+ at line 172
public
rewind()
@@ -685,7 +685,7 @@ the sequence.
- at line 189
+ at line 180
public
valid()
@@ -701,7 +701,7 @@ the sequence.
- at line 197
+ at line 188
public
count()
@@ -717,7 +717,7 @@ the sequence.
- at line 211
+ at line 200
public
offsetExists($offset)
@@ -744,7 +744,7 @@ the sequence.
- at line 219
+ at line 208
public
offsetGet($offset)
@@ -771,7 +771,7 @@ the sequence.
- at line 227
+ at line 216
public
offsetSet($offset, $image)
@@ -804,7 +804,7 @@ the sequence.
- at line 272
+ at line 256
public
offsetUnset($offset)
diff --git a/vendor/imagine/imagine/docs/API/API/Imagine/Test/ImagineTestCase.html b/vendor/imagine/imagine/docs/API/API/Imagine/Test/ImagineTestCase.html
index 1a58863769..5a543dbf9b 100644
--- a/vendor/imagine/imagine/docs/API/API/Imagine/Test/ImagineTestCase.html
+++ b/vendor/imagine/imagine/docs/API/API/Imagine/Test/ImagineTestCase.html
@@ -27,6 +27,20 @@
ImagineTestCase extends PHPUnit_Framework_TestCase
+ Constants
+
+
+
+ HTTP_IMAGE
+
+
+
+
+
+
+
+
+
Methods
@@ -37,7 +51,7 @@
static
- assertImageEquals(ImageInterface $expected, ImageInterface $actual, string $message = '', float $delta = 0.1, integer $buckets = 4)
+ assertImageEquals(ImageInterface $expected, ImageInterface $actual, string $message = '', float $delta = 0.1, integer $buckets = 4)
Asserts that two images are equal using color histogram comparison method
@@ -48,9 +62,9 @@
Details
- at line 27
+ at line 29
static public
- assertImageEquals(ImageInterface $expected, ImageInterface $actual, string $message = '', float $delta = 0.1, integer $buckets = 4)
+ assertImageEquals(ImageInterface $expected, ImageInterface $actual, string $message = '', float $delta = 0.1, integer $buckets = 4)
Asserts that two images are equal using color histogram comparison method
@@ -61,13 +75,13 @@