Merge branch '4.3'

nicolas-grekas · nicolas-grekas · commit 58fb8d4cc03c · 2019-05-28T09:51:04.000+02:00
* 4.3:
  fix tests
  [Messenger] Use real memory usage for --memory-limit
diff --git a/Worker/StopWhenMemoryUsageIsExceededWorker.php b/Worker/StopWhenMemoryUsageIsExceededWorker.php
@@ -33,7 +33,7 @@ public function __construct(WorkerInterface $decoratedWorker, int $memoryLimit,
         $this->memoryLimit = $memoryLimit;
         $this->logger = $logger;
         $this->memoryResolver = $memoryResolver ?: function () {
-            return \memory_get_usage();
+            return \memory_get_usage(true);
         };
     }
 
diff --git a/composer.json b/composer.json
@@ -31,6 +31,7 @@
         "symfony/process": "~3.4|~4.0",
         "symfony/property-access": "~3.4|~4.0",
         "symfony/serializer": "~3.4|~4.0",
+        "symfony/service-contracts": "^1.1",
         "symfony/stopwatch": "~3.4|~4.0",
         "symfony/validator": "~3.4|~4.0",
         "symfony/var-dumper": "~3.4|~4.0"

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(WorkerInterface $decoratedWorker, int $memoryLimit,`
`33`	`33`	`$this->memoryLimit = $memoryLimit;`
`34`	`34`	`$this->logger = $logger;`
`35`	`35`	`$this->memoryResolver = $memoryResolver ?: function () {`
`36`		`- return \memory_get_usage();`
	`36`	`+ return \memory_get_usage(true);`
`37`	`37`	`};`
`38`	`38`	`}`
`39`	`39`