Merge branch '2.7' into 2.8

* 2.7: Revert "bug symfony#21436 [DependencyInjection] check for circular refs caused by method calls (xabbuh)" Static code analysis with Php Inspections (EA Extended) [VarDumper] Added missing persistent stream cast

Author: fabpot

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

@@ -138,7 +138,7 @@ public function fileExcerpt($file, $line)
  $code = @highlight_file($file, true);
  // remove main code/span tags
  $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
- $content = preg_split('#<br />#', $code);
+ $content = explode('<br />', $code);
 
  $lines = array();
  for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {

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

@@ -62,9 +62,7 @@ protected function getFragmentHandler($return)
 
  $context->expects($this->any())->method('getCurrentRequest')->will($this->returnValue(Request::create('/')));
 
- $renderer = new FragmentHandler($context, array($strategy), false);
-
- return $renderer;
+ return new FragmentHandler($context, array($strategy), false);
  }
 
  protected function renderTemplate(FragmentHandler $renderer, $template = '{{ render("foo") }}')

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

@@ -132,7 +132,7 @@ public function fileExcerpt($file, $line)
  $code = @highlight_file($file, true);
  // remove main code/span tags
  $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
- $content = preg_split('#<br />#', $code);
+ $content = explode('<br />', $code);
 
  $lines = array();
  for ($i = max($line - 3, 1), $max = min($line + 3, count($content)); $i <= $max; ++$i) {

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php

@@ -46,4 +46,4 @@
 
 <?php echo $view['translator']->trans('typecast', ['a' => (int) '123'], 'not_messages'); ?>
 <?php echo $view['translator']->transChoice('msg1', 10 + 1, [], 'not_messages'); ?>
-<?php echo $view['translator']->transChoice('msg2', intval(4.5), [], 'not_messages'); ?>
+<?php echo $view['translator']->transChoice('msg2', ceil(4.5), [], 'not_messages'); ?>

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SimpleFormFactory.php

@@ -77,17 +77,4 @@ protected function createListener($container, $id, $config, $userProvider)
 
  return $listenerId;
  }
-
- protected function createEntryPoint($container, $id, $config, $defaultEntryPoint)
- {
- $entryPointId = 'security.authentication.form_entry_point.'.$id;
- $container
- ->setDefinition($entryPointId, new DefinitionDecorator('security.authentication.form_entry_point'))
- ->addArgument(new Reference('security.http_utils'))
- ->addArgument($config['login_path'])
- ->addArgument($config['use_forward'])
- ;
-
- return $entryPointId;
- }
 }

src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

@@ -64,7 +64,6 @@ public function __construct()
  new RemoveUnusedDefinitionsPass(),
  )),
  new CheckExceptionOnInvalidReferenceBehaviorPass(),
- new CheckCircularReferencesPass(),
  );
  }
 

src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php

@@ -113,30 +113,4 @@ public function testProcessInlinesWhenThereAreMultipleReferencesButFromTheSameDe
  $this->assertFalse($container->hasDefinition('b'));
  $this->assertFalse($container->hasDefinition('c'), 'Service C was not inlined.');
  }
-
- /**
- * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException
- */
- public function testCircularReferencesCausedByMethodCallsAreDetectedDuringCompilation()
- {
- $container = new ContainerBuilder();
- $container->setResourceTracking(false);
-
- $container
- ->register('foobar', '\stdClass')
- ->addArgument(new Reference('foo'))
- ;
-
- $container
- ->register('foo', '\stdClass')
- ->addArgument(new Reference('bar'))
- ;
-
- $container
- ->register('foo', '\stdClass')
- ->addMethodCall('addFoobar', array(new Reference('foobar')))
- ;
-
- $container->compile();
- }
 }

src/Symfony/Component/DependencyInjection/Tests/CrossCheckTest.php

@@ -36,7 +36,7 @@ public function testCrossCheck($fixture, $type)
 
  $tmp = tempnam(sys_get_temp_dir(), 'sf');
 
- file_put_contents($tmp, file_get_contents(self::$fixturesPath.'/'.$type.'/'.$fixture));
+ copy(self::$fixturesPath.'/'.$type.'/'.$fixture, $tmp);
 
  $container1 = new ContainerBuilder();
  $loader1 = new $loaderClass($container1, new FileLocator());

src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php

@@ -63,6 +63,7 @@
 ;
 $container
  ->register('baz', 'Baz')
+ ->addMethodCall('setFoo', array(new Reference('foo_with_inline')))
 ;
 $container
  ->register('request', 'Request')

src/Symfony/Component/DependencyInjection/Tests/Fixtures/graphviz/services9.dot

@@ -37,5 +37,6 @@ digraph sc {
  node_method_call1 -> node_foobaz [label="setBar()" style="dashed"];
  node_foo_with_inline -> node_inlined [label="setBar()" style="dashed"];
  node_inlined -> node_baz [label="setBaz()" style="dashed"];
+ node_baz -> node_foo_with_inline [label="setFoo()" style="dashed"];
  node_configurator_service -> node_baz [label="setFoo()" style="dashed"];
 }