From e21e82ba33fddf9bbdcb6007e6a5b734efef98d7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Nov 2019 12:51:54 +0100 Subject: duplicate v1 stuff --- php-doctrine-doctrine-bundle2-vendor.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 php-doctrine-doctrine-bundle2-vendor.patch (limited to 'php-doctrine-doctrine-bundle2-vendor.patch') diff --git a/php-doctrine-doctrine-bundle2-vendor.patch b/php-doctrine-doctrine-bundle2-vendor.patch new file mode 100644 index 0000000..8903194 --- /dev/null +++ b/php-doctrine-doctrine-bundle2-vendor.patch @@ -0,0 +1,24 @@ +diff -up ./Tests/ProfilerTest.php.rpm ./Tests/ProfilerTest.php +--- ./Tests/ProfilerTest.php.rpm 2019-11-20 15:05:37.038969160 +0100 ++++ ./Tests/ProfilerTest.php 2019-11-20 15:07:34.760380533 +0100 +@@ -41,7 +41,7 @@ class ProfilerTest extends BaseTestCase + $this->collector->addLogger('foo', $this->logger); + + $twigLoaderFilesystem = new FilesystemLoader(__DIR__ . '/../Resources/views/Collector'); +- $twigLoaderFilesystem->addPath(__DIR__ . '/../vendor/symfony/web-profiler-bundle/Resources/views', 'WebProfiler'); ++ $twigLoaderFilesystem->addPath('/usr/share/php/Symfony4/Bundle/WebProfilerBundle/Resources/views', 'WebProfiler'); + $this->twig = new Environment($twigLoaderFilesystem, ['debug' => true, 'strict_variables' => true]); + + $fragmentHandler = $this->getMockBuilder(FragmentHandler::class)->disableOriginalConstructor()->getMock(); +diff -up ./Tests/ServiceRepositoryTest.php.rpm ./Tests/ServiceRepositoryTest.php +--- ./Tests/ServiceRepositoryTest.php.rpm 2019-11-20 14:45:37.000000000 +0100 ++++ ./Tests/ServiceRepositoryTest.php 2019-11-20 15:05:37.038969160 +0100 +@@ -36,7 +36,7 @@ class ServiceRepositoryTest extends Test + public function testRepositoryServiceWiring() + { + // needed for older versions of Doctrine +- AnnotationRegistry::registerFile(__DIR__ . '/../vendor/doctrine/orm/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); ++ AnnotationRegistry::registerFile('/usr/share/php/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); + + $container = new ContainerBuilder(new ParameterBag([ + 'kernel.name' => 'app', -- cgit