Merge branch '4.2' into 4.3
* 4.2: Fixes windows error Removed unused field. [Lock] Stores must implement `putOffExpiration` Annotated correct return type for getInEdges()/getOutEdges().
This commit is contained in:
commit
98c36025cd
@ -128,7 +128,7 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
|
|||||||
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
|
$prevRoot = getenv('COMPOSER_ROOT_VERSION');
|
||||||
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
|
putenv("COMPOSER_ROOT_VERSION=$PHPUNIT_VERSION.99");
|
||||||
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
|
// --no-suggest is not in the list to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS
|
||||||
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p, getcwd(), null, array('bypass_shell' => true)));
|
$exit = proc_close(proc_open("$COMPOSER install --no-dev --prefer-dist --no-progress --ansi", array(), $p));
|
||||||
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
|
putenv('COMPOSER_ROOT_VERSION'.(false !== $prevRoot ? '='.$prevRoot : ''));
|
||||||
if ($exit) {
|
if ($exit) {
|
||||||
exit($exit);
|
exit($exit);
|
||||||
|
@ -34,7 +34,6 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
|
|||||||
private $onlyConstructorArguments;
|
private $onlyConstructorArguments;
|
||||||
private $hasProxyDumper;
|
private $hasProxyDumper;
|
||||||
private $lazy;
|
private $lazy;
|
||||||
private $expressionLanguage;
|
|
||||||
private $byConstructor;
|
private $byConstructor;
|
||||||
private $definitions;
|
private $definitions;
|
||||||
private $aliases;
|
private $aliases;
|
||||||
|
@ -81,7 +81,7 @@ class ServiceReferenceGraphNode
|
|||||||
/**
|
/**
|
||||||
* Returns the in edges.
|
* Returns the in edges.
|
||||||
*
|
*
|
||||||
* @return array The in ServiceReferenceGraphEdge array
|
* @return ServiceReferenceGraphEdge[]
|
||||||
*/
|
*/
|
||||||
public function getInEdges()
|
public function getInEdges()
|
||||||
{
|
{
|
||||||
@ -91,7 +91,7 @@ class ServiceReferenceGraphNode
|
|||||||
/**
|
/**
|
||||||
* Returns the out edges.
|
* Returns the out edges.
|
||||||
*
|
*
|
||||||
* @return array The out ServiceReferenceGraphEdge array
|
* @return ServiceReferenceGraphEdge[]
|
||||||
*/
|
*/
|
||||||
public function getOutEdges()
|
public function getOutEdges()
|
||||||
{
|
{
|
||||||
|
@ -95,7 +95,7 @@ class ZookeeperStore implements StoreInterface
|
|||||||
*/
|
*/
|
||||||
public function putOffExpiration(Key $key, $ttl)
|
public function putOffExpiration(Key $key, $ttl)
|
||||||
{
|
{
|
||||||
throw new NotSupportedException();
|
// do nothing, zookeeper locks forever.
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -49,7 +49,6 @@ interface StoreInterface
|
|||||||
* @param float $ttl amount of seconds to keep the lock in the store
|
* @param float $ttl amount of seconds to keep the lock in the store
|
||||||
*
|
*
|
||||||
* @throws LockConflictedException
|
* @throws LockConflictedException
|
||||||
* @throws NotSupportedException
|
|
||||||
*/
|
*/
|
||||||
public function putOffExpiration(Key $key, $ttl);
|
public function putOffExpiration(Key $key, $ttl);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user