diff --git a/composer.lock b/composer.lock
index ae58fc2e3895d3dce0e8e9c4535d6491b6abbc19..cde083896ee552939508c9985a0bc4ee27eec3da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -524,17 +524,17 @@
},
{
"name": "symfony/yaml",
- "version": "v2.6.6",
+ "version": "v2.6.7",
"target-dir": "Symfony/Component/Yaml",
"source": {
"type": "git",
"url": "https://github.com/symfony/Yaml.git",
- "reference": "174f009ed36379a801109955fc5a71a49fe62dd4"
+ "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4",
- "reference": "174f009ed36379a801109955fc5a71a49fe62dd4",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
+ "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
"shasum": ""
},
"require": {
@@ -559,18 +559,18 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
- "homepage": "http://symfony.com",
- "time": "2015-03-30 15:54:10"
+ "homepage": "https://symfony.com",
+ "time": "2015-05-02 15:18:45"
},
{
"name": "vufind-org/vufindcode",
@@ -1211,17 +1211,17 @@
},
{
"name": "symfony/css-selector",
- "version": "v2.6.6",
+ "version": "v2.6.7",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
- "reference": "db2c48df9658423a8c168d89f7b971b73d3d74a4"
+ "reference": "189cf0f7f56d7c4be3b778df15a7f16a29f3680d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/db2c48df9658423a8c168d89f7b971b73d3d74a4",
- "reference": "db2c48df9658423a8c168d89f7b971b73d3d74a4",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/189cf0f7f56d7c4be3b778df15a7f16a29f3680d",
+ "reference": "189cf0f7f56d7c4be3b778df15a7f16a29f3680d",
"shasum": ""
},
"require": {
@@ -1246,10 +1246,6 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Jean-François Simon",
"email": "jeanfrancois.simon@sensiolabs.com"
@@ -1257,25 +1253,29 @@
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony CssSelector Component",
- "homepage": "http://symfony.com",
- "time": "2015-03-22 16:55:57"
+ "homepage": "https://symfony.com",
+ "time": "2015-05-02 15:18:45"
},
{
"name": "symfony/process",
- "version": "v2.6.6",
+ "version": "v2.6.7",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552"
+ "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/a8bebaec1a9dc6cde53e0250e32917579b0be552",
- "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
+ "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
"shasum": ""
},
"require": {
@@ -1300,18 +1300,18 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
- "homepage": "http://symfony.com",
- "time": "2015-03-30 15:54:10"
+ "homepage": "https://symfony.com",
+ "time": "2015-05-02 15:18:45"
}
],
"aliases": [],
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c99227f11d089c16343080da23d6d7b9f9d4f24c..0499853ad6a52c4e9a8bbfa7cd97e86d558477aa 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1093,58 +1093,6 @@
"issues": "https://github.com/zendframework/zf2/issues"
}
},
- {
- "name": "symfony/yaml",
- "version": "v2.6.6",
- "version_normalized": "2.6.6.0",
- "target-dir": "Symfony/Component/Yaml",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/Yaml.git",
- "reference": "174f009ed36379a801109955fc5a71a49fe62dd4"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/Yaml/zipball/174f009ed36379a801109955fc5a71a49fe62dd4",
- "reference": "174f009ed36379a801109955fc5a71a49fe62dd4",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "require-dev": {
- "symfony/phpunit-bridge": "~2.7"
- },
- "time": "2015-03-30 15:54:10",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.6-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-0": {
- "Symfony\\Component\\Yaml\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- }
- ],
- "description": "Symfony Yaml Component",
- "homepage": "http://symfony.com"
- },
{
"name": "zf-commons/zfc-rbac",
"version": "v2.5.1",
@@ -1254,20 +1202,72 @@
],
"description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
},
+ {
+ "name": "symfony/yaml",
+ "version": "v2.6.7",
+ "version_normalized": "2.6.7.0",
+ "target-dir": "Symfony/Component/Yaml",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/Yaml.git",
+ "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/Yaml/zipball/f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
+ "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "require-dev": {
+ "symfony/phpunit-bridge": "~2.7"
+ },
+ "time": "2015-05-02 15:18:45",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Symfony\\Component\\Yaml\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony Yaml Component",
+ "homepage": "https://symfony.com"
+ },
{
"name": "symfony/process",
- "version": "v2.6.6",
- "version_normalized": "2.6.6.0",
+ "version": "v2.6.7",
+ "version_normalized": "2.6.7.0",
"target-dir": "Symfony/Component/Process",
"source": {
"type": "git",
"url": "https://github.com/symfony/Process.git",
- "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552"
+ "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Process/zipball/a8bebaec1a9dc6cde53e0250e32917579b0be552",
- "reference": "a8bebaec1a9dc6cde53e0250e32917579b0be552",
+ "url": "https://api.github.com/repos/symfony/Process/zipball/9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
+ "reference": "9f3c4baaf840ed849e1b1f7bfd5ae246e8509562",
"shasum": ""
},
"require": {
@@ -1276,7 +1276,7 @@
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-03-30 15:54:10",
+ "time": "2015-05-02 15:18:45",
"type": "library",
"extra": {
"branch-alias": {
@@ -1294,32 +1294,32 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Process Component",
- "homepage": "http://symfony.com"
+ "homepage": "https://symfony.com"
},
{
"name": "symfony/css-selector",
- "version": "v2.6.6",
- "version_normalized": "2.6.6.0",
+ "version": "v2.6.7",
+ "version_normalized": "2.6.7.0",
"target-dir": "Symfony/Component/CssSelector",
"source": {
"type": "git",
"url": "https://github.com/symfony/CssSelector.git",
- "reference": "db2c48df9658423a8c168d89f7b971b73d3d74a4"
+ "reference": "189cf0f7f56d7c4be3b778df15a7f16a29f3680d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/CssSelector/zipball/db2c48df9658423a8c168d89f7b971b73d3d74a4",
- "reference": "db2c48df9658423a8c168d89f7b971b73d3d74a4",
+ "url": "https://api.github.com/repos/symfony/CssSelector/zipball/189cf0f7f56d7c4be3b778df15a7f16a29f3680d",
+ "reference": "189cf0f7f56d7c4be3b778df15a7f16a29f3680d",
"shasum": ""
},
"require": {
@@ -1328,7 +1328,7 @@
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-03-22 16:55:57",
+ "time": "2015-05-02 15:18:45",
"type": "library",
"extra": {
"branch-alias": {
@@ -1346,10 +1346,6 @@
"MIT"
],
"authors": [
- {
- "name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
- },
{
"name": "Jean-François Simon",
"email": "jeanfrancois.simon@sensiolabs.com"
@@ -1357,9 +1353,13 @@
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony CssSelector Component",
- "homepage": "http://symfony.com"
+ "homepage": "https://symfony.com"
}
]
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php
index 8184b832b3c2529aee32f8eed002eb0fe095a279..c0525d7a833642e279016d779d12c2ba4dc9a32f 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/Parser/TokenStream.php
@@ -100,7 +100,7 @@ class TokenStream
throw new InternalErrorException('Unexpected token stream end.');
}
- return $this->tokens[$this->cursor ++];
+ return $this->tokens[$this->cursor++];
}
/**
diff --git a/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json b/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json
index 831b8eb45efa97ec196d6e6a1835629cf27d730c..bf3cbb27e46299ed25441e077ec393f3d257156f 100644
--- a/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json
+++ b/vendor/symfony/css-selector/Symfony/Component/CssSelector/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony CssSelector Component",
"keywords": [],
- "homepage": "http://symfony.com",
+ "homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@@ -16,7 +16,7 @@
},
{
"name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
+ "homepage": "https://symfony.com/contributors"
}
],
"require": {
diff --git a/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php b/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
index 0f4cb89e6b483aa92c1d7bf3e05e86c1994ecb7f..60701a6cde96e2c8ab7f2fe6ef565100e1931ea6 100644
--- a/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
+++ b/vendor/symfony/process/Symfony/Component/Process/ProcessUtils.php
@@ -48,7 +48,7 @@ class ProcessUtils
}
$escapedArgument = '';
- $quote = false;
+ $quote = false;
foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
if ('"' === $part) {
$escapedArgument .= '\\"';
diff --git a/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php b/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
index 2b9c36d08a73ddaf4bdcfd1ff12871c21693e562..7e26976d62ac54b8fa26302722c7b6bcf5839cf2 100644
--- a/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
+++ b/vendor/symfony/process/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -800,9 +800,6 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($process->isSuccessful());
}
- /**
- * @group idle-timeout
- */
public function testIdleTimeout()
{
$process = $this->getProcess('php -r "sleep(3);"');
@@ -820,21 +817,18 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
}
- /**
- * @group idle-timeout
- */
public function testIdleTimeoutNotExceededWhenOutputIsSent()
{
- $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); "');
+ $process = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 30; while ($n--) {echo "foo\n"; usleep(100000); }')));
$process->setTimeout(2);
- $process->setIdleTimeout(1.5);
+ $process->setIdleTimeout(1);
try {
$process->run();
$this->fail('A timeout exception was expected.');
} catch (ProcessTimedOutException $ex) {
- $this->assertTrue($ex->isGeneralTimeout());
- $this->assertFalse($ex->isIdleTimeout());
+ $this->assertTrue($ex->isGeneralTimeout(), 'A general timeout is expected.');
+ $this->assertFalse($ex->isIdleTimeout(), 'No idle timeout is expected.');
$this->assertEquals(2, $ex->getExceededTimeout());
}
}
diff --git a/vendor/symfony/process/Symfony/Component/Process/composer.json b/vendor/symfony/process/Symfony/Component/Process/composer.json
index 0c05fc788e5614da46d6cf79119f5c5f4f141948..8ad68519e1fa491e5a19fa95175add73ef11ce14 100644
--- a/vendor/symfony/process/Symfony/Component/Process/composer.json
+++ b/vendor/symfony/process/Symfony/Component/Process/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Process Component",
"keywords": [],
- "homepage": "http://symfony.com",
+ "homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
+ "homepage": "https://symfony.com/contributors"
}
],
"require": {
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
index f4987652aa5d656eb879d4c66fd6d62291dde4cc..ac325a2c2f259b5ae23ddee69b36707ace88f2aa 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Escaper.php
@@ -33,11 +33,11 @@ class Escaper
"\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
"\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",);
private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
- "\\0", "\\x01", "\\x02", "\\x03", "\\x04", "\\x05", "\\x06", "\\a",
- "\\b", "\\t", "\\n", "\\v", "\\f", "\\r", "\\x0e", "\\x0f",
- "\\x10", "\\x11", "\\x12", "\\x13", "\\x14", "\\x15", "\\x16", "\\x17",
- "\\x18", "\\x19", "\\x1a", "\\e", "\\x1c", "\\x1d", "\\x1e", "\\x1f",
- "\\N", "\\_", "\\L", "\\P",);
+ '\\0', '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
+ '\\b', '\\t', '\\n', '\\v', '\\f', '\\r', '\\x0e', '\\x0f',
+ '\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
+ '\\x18', '\\x19', '\\x1a', '\\e', '\\x1c', '\\x1d', '\\x1e', '\\x1f',
+ '\\N', '\\_', '\\L', '\\P',);
/**
* Determines if a PHP value would require double quoting in YAML.
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
index 065e650b4c0905928f8de6cca5cb32ca2f5352ae..d72c7639c8337ef663dfc8472e35f82ea0f3d168 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Parser.php
@@ -93,7 +93,7 @@ class Parser
// array
if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) {
$c = $this->getRealCurrentLineNb() + 1;
- $parser = new Parser($c);
+ $parser = new self($c);
$parser->refs = &$this->refs;
$data[] = $parser->parse($this->getNextEmbedBlock(null, true), $exceptionOnInvalidType, $objectSupport, $objectForMap);
} else {
@@ -102,7 +102,7 @@ class Parser
) {
// this is a compact notation element, add to next block and parse
$c = $this->getRealCurrentLineNb();
- $parser = new Parser($c);
+ $parser = new self($c);
$parser->refs = &$this->refs;
$block = $values['value'];
@@ -159,7 +159,7 @@ class Parser
$value = $this->getNextEmbedBlock();
}
$c = $this->getRealCurrentLineNb() + 1;
- $parser = new Parser($c);
+ $parser = new self($c);
$parser->refs = &$this->refs;
$parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport, $objectForMap);
@@ -210,7 +210,7 @@ class Parser
}
} else {
$c = $this->getRealCurrentLineNb() + 1;
- $parser = new Parser($c);
+ $parser = new self($c);
$parser->refs = &$this->refs;
$value = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport, $objectForMap);
// Spec: Keys MUST be unique; first one wins.
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
index bbff1760383ac75c3651751825848239f899ced9..320eb5072132bc349a1a70fd0edb2f88937a6f91 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/Tests/InlineTest.php
@@ -222,8 +222,8 @@ class InlineTest extends \PHPUnit_Framework_TestCase
array('{ foo : bar, bar : foo, false : false, null : null, integer : 12 }', array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12)),
array('{foo: \'bar\', bar: \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
array('{\'foo\': \'bar\', "bar": \'foo: bar\'}', array('foo' => 'bar', 'bar' => 'foo: bar')),
- array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', array('foo\'' => 'bar', "bar\"" => 'foo: bar')),
- array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', array('foo: ' => 'bar', "bar: " => 'foo: bar')),
+ array('{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}', array('foo\'' => 'bar', 'bar"' => 'foo: bar')),
+ array('{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}', array('foo: ' => 'bar', 'bar: ' => 'foo: bar')),
// nested sequences and mappings
array('[foo, [bar, foo]]', array('foo', array('bar', 'foo'))),
diff --git a/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json b/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
index b38eec29e9ac2e8ce2dc292aaec5156a00050112..bb0beeec45764ecdb67e59f787e996a7fdd93d2a 100644
--- a/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
+++ b/vendor/symfony/yaml/Symfony/Component/Yaml/composer.json
@@ -3,7 +3,7 @@
"type": "library",
"description": "Symfony Yaml Component",
"keywords": [],
- "homepage": "http://symfony.com",
+ "homepage": "https://symfony.com",
"license": "MIT",
"authors": [
{
@@ -12,7 +12,7 @@
},
{
"name": "Symfony Community",
- "homepage": "http://symfony.com/contributors"
+ "homepage": "https://symfony.com/contributors"
}
],
"require": {