Merge branch '4.2' into 4.3

fabpot · fabpot · commit 98c36025cdff · 2019-07-03T19:15:34.000+02:00
* 4.2:
  Fixes windows error
  Removed unused field.
  [Lock] Stores must implement `putOffExpiration`
  Annotated correct return type for getInEdges()/getOutEdges().
diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php
@@ -128,7 +128,7 @@
     $prevRoot = getenv('COMPOSER_ROOT_VERSION');
     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
-    $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 : ''));
     if ($exit) {
         exit($exit);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -34,7 +34,6 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
     private $onlyConstructorArguments;
     private $hasProxyDumper;
     private $lazy;
-    private $expressionLanguage;
     private $byConstructor;
     private $definitions;
     private $aliases;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphNode.php
@@ -81,7 +81,7 @@ public function getId()
     /**
      * Returns the in edges.
      *
-     * @return array The in ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getInEdges()
     {
@@ -91,7 +91,7 @@ public function getInEdges()
     /**
      * Returns the out edges.
      *
-     * @return array The out ServiceReferenceGraphEdge array
+     * @return ServiceReferenceGraphEdge[]
      */
     public function getOutEdges()
     {
diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php
@@ -95,7 +95,7 @@ public function waitAndSave(Key $key)
      */
     public function putOffExpiration(Key $key, $ttl)
     {
-        throw new NotSupportedException();
+        // do nothing, zookeeper locks forever.
     }
 
     /**
diff --git a/src/Symfony/Component/Lock/StoreInterface.php b/src/Symfony/Component/Lock/StoreInterface.php
@@ -49,7 +49,6 @@ public function waitAndSave(Key $key);
      * @param float $ttl amount of seconds to keep the lock in the store
      *
      * @throws LockConflictedException
-     * @throws NotSupportedException
      */
     public function putOffExpiration(Key $key, $ttl);
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function getId()`
`81`	`81`	`/**`
`82`	`82`	`* Returns the in edges.`
`83`	`83`	`*`
`84`		`- * @return array The in ServiceReferenceGraphEdge array`
	`84`	`+ * @return ServiceReferenceGraphEdge[]`
`85`	`85`	`*/`
`86`	`86`	`public function getInEdges()`
`87`	`87`	`{`
`@@ -91,7 +91,7 @@ public function getInEdges()`
`91`	`91`	`/**`
`92`	`92`	`* Returns the out edges.`
`93`	`93`	`*`
`94`		`- * @return array The out ServiceReferenceGraphEdge array`
	`94`	`+ * @return ServiceReferenceGraphEdge[]`
`95`	`95`	`*/`
`96`	`96`	`public function getOutEdges()`
`97`	`97`	`{`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function waitAndSave(Key $key)`
`95`	`95`	`*/`
`96`	`96`	`public function putOffExpiration(Key $key, $ttl)`
`97`	`97`	`{`
`98`		`- throw new NotSupportedException();`
	`98`	`+ // do nothing, zookeeper locks forever.`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ public function waitAndSave(Key $key);`
`49`	`49`	`* @param float $ttl amount of seconds to keep the lock in the store`
`50`	`50`	`*`
`51`	`51`	`* @throws LockConflictedException`
`52`		`- * @throws NotSupportedException`
`53`	`52`	`*/`
`54`	`53`	`public function putOffExpiration(Key $key, $ttl);`
`55`	`54`