Skip to content

Commit d062b52

Browse files
Merge branch '4.4' into 5.0
* 4.4: [DI] Fix CheckTypeDeclarationPass [Security/Http] don't require the session to be started when tracking its id [DI] fix preloading script generation
2 parents 7322d50 + 1842e12 commit d062b52

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

FrameworkBundle.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TestServiceContainerWeakRefPass;
2323
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\UnusedTagsPass;
2424
use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\WorkflowGuardListenerPass;
25+
use Symfony\Component\Cache\Adapter\ApcuAdapter;
26+
use Symfony\Component\Cache\Adapter\ArrayAdapter;
27+
use Symfony\Component\Cache\Adapter\ChainAdapter;
28+
use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
29+
use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
2530
use Symfony\Component\Cache\DependencyInjection\CacheCollectorPass;
2631
use Symfony\Component\Cache\DependencyInjection\CachePoolClearerPass;
2732
use Symfony\Component\Cache\DependencyInjection\CachePoolPass;
@@ -31,6 +36,7 @@
3136
use Symfony\Component\DependencyInjection\Compiler\PassConfig;
3237
use Symfony\Component\DependencyInjection\Compiler\RegisterReverseContainerPass;
3338
use Symfony\Component\DependencyInjection\ContainerBuilder;
39+
use Symfony\Component\Dotenv\Dotenv;
3440
use Symfony\Component\ErrorHandler\ErrorHandler;
3541
use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass;
3642
use Symfony\Component\Form\DependencyInjection\FormPass;
@@ -57,6 +63,19 @@
5763
use Symfony\Component\Validator\DependencyInjection\AddAutoMappingConfigurationPass;
5864
use Symfony\Component\Validator\DependencyInjection\AddConstraintValidatorsPass;
5965
use Symfony\Component\Validator\DependencyInjection\AddValidatorInitializersPass;
66+
use Symfony\Component\VarExporter\Internal\Hydrator;
67+
use Symfony\Component\VarExporter\Internal\Registry;
68+
69+
// Help opcache.preload discover always-needed symbols
70+
class_exists(ApcuAdapter::class);
71+
class_exists(ArrayAdapter::class);
72+
class_exists(ChainAdapter::class);
73+
class_exists(PhpArrayAdapter::class);
74+
class_exists(PhpFilesAdapter::class);
75+
class_exists(Dotenv::class);
76+
class_exists(ErrorHandler::class);
77+
class_exists(Hydrator::class);
78+
class_exists(Registry::class);
6079

6180
/**
6281
* Bundle.

Routing/Router.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@
1919
use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
2020
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
2121
use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
22+
use Symfony\Component\Routing\Annotation\Route;
2223
use Symfony\Component\Routing\RequestContext;
2324
use Symfony\Component\Routing\RouteCollection;
2425
use Symfony\Component\Routing\Router as BaseRouter;
2526
use Symfony\Contracts\Service\ServiceSubscriberInterface;
2627

28+
// Help opcache.preload discover always-needed symbols
29+
class_exists(RedirectableCompiledUrlMatcher::class);
30+
class_exists(Route::class);
31+
2732
/**
2833
* This Router creates the Loader only when the cache is empty.
2934
*

0 commit comments

Comments
 (0)