Merge branch '2.2'

* 2.2: fixed regression in the Finder component (it was possible to use it without using exec before, closes symfony#6357) fixed a circular call (closes symfony#6864) typo [Security] [Tests] added unit tests for the UserPasswordValidator class and made the validator service for the UserPassword constraint configurable. fixed wrong indentation tweaked previous commit [HttpKernel] Fix the URI signer (closes symfony#6801) Add Arabic translations. [HttpKernel] fixed regression when rendering an inline controller and passing some objects (closes symfony#6822) [FrameworkBundle] fixed typo renamed some classes and Twig functions to more descriptive names (refs symfony#6871) Classcollectionloader: fix traits + enhancements Fix a deprecated method call in the tests Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version Correct comment in NativeSessionStorage regarding session.save_handler [Security] Add PHPDoc to AuthenticationEvents

Author: fabpot

CHANGELOG-2.0.md

@@ -238,7 +238,7 @@ To get the diff between two versions, go to https://github.com/symfony/symfony/c
  * d67d419: [HttpFoundation] added missing trustProxy condition
  * efce640: [Yaml][Parser] throw an exception if not readable
  * aa58330: [Form] fixed flawed condition
- * 253eeba: [BugFix][Validator] Fix for PHP incosistent behaviour of ArrayAccess
+ * 253eeba: [BugFix][Validator] Fix for PHP inconsistent behaviour of ArrayAccess
  * 0507840: Prevent parameters from overwriting the template filename.
  * 9bc41d0: [HttpFoundation] Fixed #3053
  * 9441c46: [DependencyInjection] PhpDumper, fixes #2730

composer.json

@@ -17,8 +17,8 @@
  ],
  "require": {
  "php": ">=5.3.3",
- "doctrine/common": ">2.2,<2.4-dev",
- "twig/twig": ">=1.11.0,<2.0-dev",
+ "doctrine/common": "~2.2",
+ "twig/twig": "~1.11",
  "psr/log": "~1.0"
  },
  "replace": {
@@ -59,10 +59,10 @@
  },
  "require-dev": {
  "doctrine/data-fixtures": "1.0.*",
- "doctrine/dbal": ">=2.2,<2.4-dev",
- "doctrine/orm": ">=2.2.3,<2.4-dev",
+ "doctrine/dbal": "~2.2",
+ "doctrine/orm": "~2.2,>=2.2.3",
  "monolog/monolog": "~1.3",
- "propel/propel1": "dev-master"
+ "propel/propel1": "1.6.*"
  },
  "autoload": {
  "psr-0": { "Symfony\\": "src/" },

src/Symfony/Bridge/Doctrine/composer.json

@@ -17,7 +17,7 @@
  ],
  "require": {
  "php": ">=5.3.3",
- "doctrine/common": ">=2.2,<2.4-dev"
+ "doctrine/common": "~2.2"
  },
  "require-dev": {
  "symfony/stopwatch": "2.2.*",
@@ -27,15 +27,15 @@
  "symfony/security": "2.2.*",
  "symfony/validator": "2.2.*",
  "doctrine/data-fixtures": "1.0.*",
- "doctrine/dbal": ">=2.2,<2.4-dev",
- "doctrine/orm": ">=2.2.3,<2.4-dev"
+ "doctrine/dbal": "~2.2",
+ "doctrine/orm": "~2.2,>=2.2.3"
  },
  "suggest": {
  "symfony/form": "2.2.*",
  "symfony/validator": "2.2.*",
  "doctrine/data-fixtures": "1.0.*",
- "doctrine/dbal": ">=2.2,<2.4-dev",
- "doctrine/orm": ">=2.2.3,<2.4-dev"
+ "doctrine/dbal": "~2.2",
+ "doctrine/orm": "~2.2,>=2.2.3"
  },
  "autoload": {
  "psr-0": { "Symfony\\Bridge\\Doctrine\\": "" }

src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php

@@ -11,7 +11,7 @@
 
 namespace Symfony\Bridge\Twig\Extension;
 
-use Symfony\Component\HttpKernel\HttpContentRenderer;
+use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;
 
 /**
@@ -21,50 +21,61 @@
  */
 class HttpKernelExtension extends \Twig_Extension
 {
- private $renderer;
+ private $handler;
 
  /**
  * Constructor.
  *
- * @param HttpContentRenderer $renderer A HttpContentRenderer instance
+ * @param FragmentHandler $handler A FragmentHandler instance
  */
- public function __construct(HttpContentRenderer $renderer)
+ public function __construct(FragmentHandler $handler)
  {
- $this->renderer = $renderer;
+ $this->handler = $handler;
  }
 
  public function getFunctions()
  {
  return array(
- 'render' => new \Twig_Function_Method($this, 'render', array('is_safe' => array('html'))),
- 'render_*' => new \Twig_Function_Method($this, 'renderStrategy', array('is_safe' => array('html'))),
+ 'render'  => new \Twig_Function_Method($this, 'renderFragment', array('is_safe' => array('html'))),
+ 'render_*'  => new \Twig_Function_Method($this, 'renderFragmentStrategy', array('is_safe' => array('html'))),
  'controller' => new \Twig_Function_Method($this, 'controller'),
  );
  }
 
  /**
- * Renders a URI.
+ * Renders a fragment.
  *
  * @param string $uri A URI
  * @param array $options An array of options
  *
- * @return string The Response content
+ * @return string The fragment content
  *
- * @see Symfony\Component\HttpKernel\HttpContentRenderer::render()
+ * @see Symfony\Component\HttpKernel\Fragment\FragmentHandler::render()
  */
- public function render($uri, $options = array())
+ public function renderFragment($uri, $options = array())
  {
- $options = $this->renderer->fixOptions($options);
+ $options = $this->handler->fixOptions($options);
 
- $strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
+ $strategy = isset($options['strategy']) ? $options['strategy'] : 'inline';
  unset($options['strategy']);
 
- return $this->renderer->render($uri, $strategy, $options);
+ return $this->handler->render($uri, $strategy, $options);
  }
 
- public function renderStrategy($strategy, $uri, $options = array())
+ /**
+ * Renders a fragment.
+ *
+ * @param string $strategy A strategy name
+ * @param string $uri A URI
+ * @param array $options An array of options
+ *
+ * @return string The fragment content
+ *
+ * @see Symfony\Component\HttpKernel\Fragment\FragmentHandler::render()
+ */
+ public function renderFragmentStrategy($strategy, $uri, $options = array())
  {
- return $this->renderer->render($uri, $strategy, $options);
+ return $this->handler->render($uri, $strategy, $options);
  }
 
  public function controller($controller, $attributes = array(), $query = array())

src/Symfony/Bridge/Twig/Tests/Extension/HttpKernelExtensionTest.php

@@ -15,7 +15,7 @@
 use Symfony\Bridge\Twig\Tests\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpContentRenderer;
+use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 
 class HttpKernelExtensionTest extends TestCase
 {
@@ -33,21 +33,21 @@ protected function setUp()
  /**
  * @expectedException \Twig_Error_Runtime
  */
- public function testRenderWithError()
+ public function testFragmentWithError()
  {
- $kernel = $this->getHttpContentRenderer($this->throwException(new \Exception('foo')));
+ $kernel = $this->getFragmentHandler($this->throwException(new \Exception('foo')));
 
- $loader = new \Twig_Loader_Array(array('index' => '{{ render("foo") }}'));
+ $loader = new \Twig_Loader_Array(array('index' => '{{ fragment("foo") }}'));
  $twig = new \Twig_Environment($loader, array('debug' => true, 'cache' => false));
  $twig->addExtension(new HttpKernelExtension($kernel));
 
  $this->renderTemplate($kernel);
  }
 
- protected function getHttpContentRenderer($return)
+ protected function getFragmentHandler($return)
  {
- $strategy = $this->getMock('Symfony\\Component\\HttpKernel\\RenderingStrategy\\RenderingStrategyInterface');
- $strategy->expects($this->once())->method('getName')->will($this->returnValue('default'));
+ $strategy = $this->getMock('Symfony\\Component\\HttpKernel\\Fragment\\FragmentRendererInterface');
+ $strategy->expects($this->once())->method('getName')->will($this->returnValue('inline'));
  $strategy->expects($this->once())->method('render')->will($return);
 
  // simulate a master request
@@ -58,13 +58,13 @@ protected function getHttpContentRenderer($return)
  ->will($this->returnValue(Request::create('/')))
  ;
 
- $renderer = new HttpContentRenderer(array($strategy));
+ $renderer = new FragmentHandler(array($strategy));
  $renderer->onKernelRequest($event);
 
  return $renderer;
  }
 
- protected function renderTemplate(HttpContentRenderer $renderer, $template = '{{ render("foo") }}')
+ protected function renderTemplate(FragmentHandler $renderer, $template = '{{ render("foo") }}')
  {
  $loader = new \Twig_Loader_Array(array('index' => $template));
  $twig = new \Twig_Environment($loader, array('debug' => true, 'cache' => false));

src/Symfony/Bridge/Twig/composer.json

@@ -17,7 +17,7 @@
  ],
  "require": {
  "php": ">=5.3.3",
- "twig/twig": ">=1.9.1,<2.0-dev"
+ "twig/twig": "~1.11"
  },
  "require-dev": {
  "symfony/form": "2.2.*",

src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

@@ -8,11 +8,11 @@ CHANGELOG
  * deprecated `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` and `Symfony\Bundle\FrameworkBundle\HttpKernel::forward()`
  * deprecated the `Symfony\Bundle\FrameworkBundle\HttpKernel` class in favor of `Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel`
  * added support for adding new HTTP content rendering strategies (like ESI and Hinclude)
- in the DIC via the `kernel.content_renderer_strategy` tag
+ in the DIC via the `kernel.fragment_renderer` tag
  * [BC BREAK] restricted the `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` method to only accept URIs or ControllerReference instances
  * `Symfony\Bundle\FrameworkBundle\HttpKernel::render()` method signature changed and the first argument
  must now be a URI or a ControllerReference instance (the `generateInternalUri()` method was removed)
- * The internal routes (`Resources/config/routing/internal.xml`) have been removed and replaced with a listener (`Symfony\Component\HttpKernel\EventListener\RouterProxyListener`)
+ * The internal routes (`Resources/config/routing/internal.xml`) have been removed and replaced with a listener (`Symfony\Component\HttpKernel\EventListener\FragmentListener`)
  * The `render` method of the `actions` templating helper signature and arguments changed
  * replaced Symfony\Bundle\FrameworkBundle\Controller\TraceableControllerResolver by Symfony\Component\HttpKernel\Controller\TraceableControllerResolver
  * replaced Symfony\Component\HttpKernel\Debug\ContainerAwareTraceableEventDispatcher by Symfony\Component\HttpKernel\Debug\TraceableEventDispatcher

src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php

@@ -130,7 +130,7 @@ protected function outputRoute(OutputInterface $output, $name)
 
  $output->writeln(sprintf('<comment>Name</comment> %s', $name));
  $output->writeln(sprintf('<comment>Pattern</comment> %s', $route->getPath()));
- $output->writeln(sprintf('<comment>Host</comment> %s', $host));
+ $output->writeln(sprintf('<comment>Host</comment>  %s', $host));
  $output->writeln(sprintf('<comment>Class</comment> %s', get_class($route)));
 
  $defaults = '';

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/HttpRenderingStrategyPass.php renamed to src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/FragmentRendererPass.php

@@ -16,30 +16,30 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 
 /**
- * Adds services tagged kernel.content_renderer_strategy as HTTP content rendering strategies.
+ * Adds services tagged kernel.fragment_renderer as HTTP content rendering strategies.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class HttpRenderingStrategyPass implements CompilerPassInterface
+class FragmentRendererPass implements CompilerPassInterface
 {
  public function process(ContainerBuilder $container)
  {
- if (false === $container->hasDefinition('http_content_renderer')) {
+ if (false === $container->hasDefinition('fragment.handler')) {
  return;
  }
 
- $definition = $container->getDefinition('http_content_renderer');
- foreach (array_keys($container->findTaggedServiceIds('kernel.content_renderer_strategy')) as $id) {
+ $definition = $container->getDefinition('fragment.handler');
+ foreach (array_keys($container->findTaggedServiceIds('kernel.fragment_renderer')) as $id) {
  // We must assume that the class value has been correctly filled, even if the service is created by a factory
  $class = $container->getDefinition($id)->getClass();
 
  $refClass = new \ReflectionClass($class);
- $interface = 'Symfony\Component\HttpKernel\RenderingStrategy\RenderingStrategyInterface';
+ $interface = 'Symfony\Component\HttpKernel\Fragment\FragmentRendererInterface';
  if (!$refClass->implementsInterface($interface)) {
  throw new \InvalidArgumentException(sprintf('Service "%s" must implement interface "%s".', $id, $interface));
  }
 
- $definition->addMethodCall('addStrategy', array(new Reference($id)));
+ $definition->addMethodCall('addRenderer', array(new Reference($id)));
  }
  }
 }

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

@@ -73,7 +73,7 @@ public function getConfigTreeBuilder()
 
  $this->addFormSection($rootNode);
  $this->addEsiSection($rootNode);
- $this->addRouterProxySection($rootNode);
+ $this->addFragmentsSection($rootNode);
  $this->addProfilerSection($rootNode);
  $this->addRouterSection($rootNode);
  $this->addSessionSection($rootNode);
@@ -115,15 +115,15 @@ private function addEsiSection(ArrayNodeDefinition $rootNode)
  ;
  }
 
- private function addRouterProxySection(ArrayNodeDefinition $rootNode)
+ private function addFragmentsSection(ArrayNodeDefinition $rootNode)
  {
  $rootNode
  ->children()
- ->arrayNode('router_proxy')
- ->info('proxy configuration for the HTTP content renderer')
+ ->arrayNode('fragments')
+ ->info('fragments configuration')
  ->canBeEnabled()
  ->children()
- ->scalarNode('path')->defaultValue('/_proxy')->end()
+ ->scalarNode('path')->defaultValue('/_fragment')->end()
  ->end()
  ->end()
  ->end()