Merge branch '4.3' into 4.4

* 4.3: Fixes windows error [Messenger] Added more test for MessageBus fixed typo [Filesystem] added missing deprecations to UPGRADE-4.3.md Fix authentication for redis transport only decorate when an event dispatcher was passed [FrmaeworkBundle] More simplifications in the DI configuration Fixing validation for messenger transports retry_strategy service key Removed unused field. Remove @internal annotations for the serilize methods [Lock] Stores must implement `putOffExpiration` Annotated correct return type for getInEdges()/getOutEdges(). deprecate the framework.templating option

Author: fabpot

UPGRADE-4.3.md

@@ -57,6 +57,12 @@ EventDispatcher
  * The signature of the `EventDispatcherInterface::dispatch()` method should be updated to `dispatch($event, string $eventName = null)`, not doing so is deprecated
  * The `Event` class has been deprecated, use `Symfony\Contracts\EventDispatcher\Event` instead
 
+Filesystem
+----------
+
+ * Support for passing arrays to `Filesystem::dumpFile()` is deprecated.
+ * Support for passing arrays to `Filesystem::appendToFile()` is deprecated.
+
 Form
 ----
 
@@ -71,6 +77,7 @@ Form
 FrameworkBundle
 ---------------
 
+ * Deprecated the `framework.templating` option, use Twig instead.
  * Not passing the project directory to the constructor of the `AssetsInstallCommand` is deprecated. This argument will
  be mandatory in 5.0.
  * Deprecated the "Psr\SimpleCache\CacheInterface" / "cache.app.simple" service, use "Symfony\Contracts\Cache\CacheInterface" / "cache.app" instead.

UPGRADE-5.0.md

@@ -207,8 +207,8 @@ Form
 FrameworkBundle
 ---------------
 
+ * Removed the `framework.templating` option, use Twig instead.
  * The project dir argument of the constructor of `AssetsInstallCommand` is required.
-
  * Removed support for `bundle:controller:action` syntax to reference controllers. Use `serviceOrFqcn::method`
  instead where `serviceOrFqcn` is either the service ID when using controllers as services or the FQCN of the controller.
 

src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php

@@ -131,7 +131,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);

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

@@ -12,6 +12,7 @@ CHANGELOG
 4.3.0
 -----
 
+ * Deprecated the `framework.templating` option, use Twig instead.
  * Added `WebTestAssertionsTrait` (included by default in `WebTestCase`)
  * Renamed `Client` to `KernelBrowser`
  * Not passing the project directory to the constructor of the `AssetsInstallCommand` is deprecated. This argument will

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -339,10 +339,7 @@ private function addWorkflowSection(ArrayNodeDefinition $rootNode)
  ->defaultNull()
  ->end()
  ->arrayNode('initial_marking')
- ->beforeNormalization()
- ->ifTrue(function ($v) { return !\is_array($v); })
- ->then(function ($v) { return [$v]; })
- ->end()
+ ->beforeNormalization()->castToArray()->end()
  ->defaultValue([])
  ->prototype('scalar')->end()
  ->end()
@@ -602,6 +599,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
  ->arrayNode('templating')
  ->info('templating configuration')
  ->canBeEnabled()
+ ->setDeprecated('The "%path%.%node%" configuration is deprecated since Symfony 4.3. Use the "twig" service directly instead.')
  ->beforeNormalization()
  ->ifTrue(function ($v) { return false === $v || \is_array($v) && false === $v['enabled']; })
  ->then(function () { return ['enabled' => false, 'engines' => false]; })
@@ -1180,9 +1178,14 @@ function ($a) {
  ->end()
  ->arrayNode('retry_strategy')
  ->addDefaultsIfNotSet()
- ->validate()
- ->ifTrue(function ($v) { return null !== $v['service'] && (isset($v['max_retries']) || isset($v['delay']) || isset($v['multiplier']) || isset($v['max_delay'])); })
- ->thenInvalid('"service" cannot be used along with the other retry_strategy options.')
+ ->beforeNormalization()
+ ->always(function ($v) {
+ if (isset($v['service']) && (isset($v['max_retries']) || isset($v['delay']) || isset($v['multiplier']) || isset($v['max_delay']))) {
+ throw new \InvalidArgumentException('The "service" cannot be used along with the other "retry_strategy" options.');
+ }
+
+ return $v;
+ })
  ->end()
  ->children()
  ->scalarNode('service')->defaultNull()->info('Service id to override the retry strategy entirely')->end()

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -35,6 +35,9 @@ public function testDefaultConfig()
  );
  }
 
+ /**
+ * @group legacy
+ */
  public function testDoNoDuplicateDefaultFormResources()
  {
  $input = ['templating' => [

src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -602,6 +602,9 @@ public function testTemplating()
  $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'), '->registerTemplatingConfiguration() registers the global hinclude.js template');
  }
 
+ /**
+ * @group legacy
+ */
  public function testTemplatingCanBeDisabled()
  {
  $container = $this->createContainerFromFile('templating_disabled');
@@ -872,6 +875,7 @@ public function testTranslatorMultipleFallbacks()
  }
 
  /**
+ * @group legacy
  * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
  */
  public function testTemplatingRequiresAtLeastOneEngine()

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;

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()
  {

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.
  }
 
  /**