From aa459b5c0becf24753c18e3752f5fed9970f18c4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 14 Jan 2021 08:46:12 +0100
Subject: add upstream patch for Symfony 4

---
 php-bartlett-php-compatinfo-db-3-rpm.patch | 41 +-----------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

(limited to 'php-bartlett-php-compatinfo-db-3-rpm.patch')

diff --git a/php-bartlett-php-compatinfo-db-3-rpm.patch b/php-bartlett-php-compatinfo-db-3-rpm.patch
index f2fdfa5..755d971 100644
--- a/php-bartlett-php-compatinfo-db-3-rpm.patch
+++ b/php-bartlett-php-compatinfo-db-3-rpm.patch
@@ -68,48 +68,9 @@ diff -up src/config/container.php.rpm src/config/container.php
  $loader->load('default.php');
  
  $containerBuilder->compile();
-diff -up src/config/set/common.php.rpm src/config/set/common.php
---- src/config/set/common.php.rpm	2021-01-13 15:52:20.781252210 +0100
-+++ src/config/set/common.php	2021-01-13 15:52:24.199239157 +0100
-@@ -15,7 +15,7 @@ use Symfony\Component\DependencyInjectio
- use Symfony\Component\EventDispatcher\EventDispatcherInterface;
- use Symfony\Component\EventDispatcher\EventSubscriberInterface;
- use Symfony\Component\Stopwatch\Stopwatch;
--use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
-+use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
- use function Symfony\Component\DependencyInjection\Loader\Configurator\tagged_iterator;
- 
- /**
-@@ -43,7 +43,7 @@ return static function (ContainerConfigu
-     ;
- 
-     $services->set(ApplicationInterface::class, Application::class)
--        ->call('setDispatcher', [service(EventDispatcherInterface::class)])
-+        ->call('setDispatcher', [ref(EventDispatcherInterface::class)])
-         // for bin file
-         ->public()
-     ;
-@@ -58,7 +58,7 @@ return static function (ContainerConfigu
-     $services->set(Stopwatch::class);
- 
-     $services->set(ProfileEventSubscriber::class)
--        ->args([service(Stopwatch::class)])
-+        ->args([ref(Stopwatch::class)])
-     ;
-     $services->alias(EventSubscriberInterface::class . ' $profileEventSubscriber', ProfileEventSubscriber::class);
- 
 diff -up src/config/set/default.php.rpm src/config/set/default.php
 --- src/config/set/default.php.rpm	2021-01-09 09:41:56.000000000 +0100
 +++ src/config/set/default.php	2021-01-13 15:52:55.350120197 +0100
-@@ -25,7 +25,7 @@ use Doctrine\ORM\EntityManagerInterface;
- 
- use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
- use Symfony\Component\Messenger\Command\DebugCommand;
--use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
-+use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
- 
- /**
-  * Build the Container with default parameters and services
 @@ -69,7 +69,10 @@ return static function (ContainerConfigu
          ;
      }
@@ -134,7 +95,7 @@ diff -up src/config/set/default.php.rpm src/config/set/default.php
  
      $services->set(EntityManagerInterface::class)
 -        ->factory([service(EntityManagerFactory::class), 'create'])
-+        ->factory([ref(EntityManagerFactory::class), 'create'])
++        ->factory([service(EntityManagerFactory::class), 'create'])
          ->arg('$connection', $connectionParams)
          // for Doctrine Command Line Interface
          ->public()
-- 
cgit