diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.2' 

* 4.2:
  [TwigBridge] fix tests
  [FrameworkBundle] Fix Controller deprecated when using composer --optimized
This commit is contained in:
Nicolas Grekas 2019-04-12 15:50:47 +02:00
parent 371b55ac7e 1d02ef2ccb
commit 0cf183375a
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -48,6 +48,8 @@ before_install:
# Enable Sury ppa
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
sudo add-apt-repository -y ppa:ondrej/php
sudo rm /etc/apt/sources.list.d/google-chrome.list
sudo rm /etc/apt/sources.list.d/mongodb-3.4.list
sudo apt update
sudo apt install -y librabbitmq-dev libsodium-dev

7
src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
View File

@ -30,9 +30,14 @@ class FormThemeTokenParserTest extends TestCase
{
$env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
$env->addTokenParser(new FormThemeTokenParser());
$stream = $env->tokenize(new Source($source, ''));
$source = new Source($source, '');
$stream = $env->tokenize($source);
$parser = new Parser($env);
if (method_exists($expected, 'setSourceContext')) {
$expected->setSourceContext($source);
}
$this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
}

4
src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
View File

@ -14,14 +14,12 @@ namespace Symfony\Bundle\FrameworkBundle\Controller;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerAwareTrait;
@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2, use %s instead.', Controller::class, AbstractController::class), E_USER_DEPRECATED);
/**
* Controller is a simple implementation of a Controller.
*
* It provides methods to common features needed in controllers.
*
* @deprecated since Symfony 4.2, use {@see AbstractController} instead.
* @deprecated since Symfony 4.2, use "Symfony\Bundle\FrameworkBundle\Controller\AbstractController" instead.
*
* @author Fabien Potencier <fabien@symfony.com>
*/