From aade4504232deb9c3775ef47a5dadf5a358bb236 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Tue, 2 Apr 2019 14:06:27 +0200 Subject: [PATCH 1/2] Don't fail build for the 3 known Twig deprecations --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4b2c218ed..b1dbb6ad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ php: env: global: - deps=no + - SYMFONY_DEPRECATIONS_HELPER=3 before_install: - mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{,.disabled} || echo "xdebug not available" From 5bcc477396ea12debd8f99191175dc56cbb4eb8a Mon Sep 17 00:00:00 2001 From: Jan Rosier Date: Thu, 14 Mar 2019 11:33:23 +0100 Subject: [PATCH 2/2] Fix php doc block --- Registry.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Registry.php b/Registry.php index cf1cb5091..4ea2f3990 100644 --- a/Registry.php +++ b/Registry.php @@ -2,9 +2,7 @@ namespace Doctrine\Bundle\DoctrineBundle; -use Doctrine\DBAL\Connection; use Doctrine\ORM\EntityManager; -use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\ORMException; use Symfony\Bridge\Doctrine\ManagerRegistry; use Symfony\Bridge\Doctrine\RegistryInterface; @@ -17,12 +15,10 @@ class Registry extends ManagerRegistry implements RegistryInterface { /** - * Construct. - * - * @param Connection[] $connections - * @param EntityManagerInterface[] $entityManagers - * @param string $defaultConnection - * @param string $defaultEntityManager + * @param string[] $connections + * @param string[] $entityManagers + * @param string $defaultConnection + * @param string $defaultEntityManager */ public function __construct(ContainerInterface $container, array $connections, array $entityManagers, $defaultConnection, $defaultEntityManager) {