From 6b3d5bcebda262916e64478a9dafe7bbd932b176 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 12 Jul 2021 09:05:30 +0200 Subject: [PATCH 1/3] Duplicate 5.3 recipe into 5.4 --- .../5.4/config/packages/cache.yaml | 19 ++++++++++ .../5.4/config/packages/framework.yaml | 24 ++++++++++++ .../framework-bundle/5.4/config/preload.php | 5 +++ .../5.4/config/routes/framework.yaml | 4 ++ .../framework-bundle/5.4/config/services.yaml | 25 ++++++++++++ symfony/framework-bundle/5.4/manifest.json | 27 +++++++++++++ symfony/framework-bundle/5.4/post-install.txt | 10 +++++ symfony/framework-bundle/5.4/public/index.php | 9 +++++ .../5.4/src/Controller/.gitignore | 0 symfony/framework-bundle/5.4/src/Kernel.php | 38 +++++++++++++++++++ 10 files changed, 161 insertions(+) create mode 100644 symfony/framework-bundle/5.4/config/packages/cache.yaml create mode 100644 symfony/framework-bundle/5.4/config/packages/framework.yaml create mode 100644 symfony/framework-bundle/5.4/config/preload.php create mode 100644 symfony/framework-bundle/5.4/config/routes/framework.yaml create mode 100644 symfony/framework-bundle/5.4/config/services.yaml create mode 100644 symfony/framework-bundle/5.4/manifest.json create mode 100644 symfony/framework-bundle/5.4/post-install.txt create mode 100644 symfony/framework-bundle/5.4/public/index.php create mode 100644 symfony/framework-bundle/5.4/src/Controller/.gitignore create mode 100644 symfony/framework-bundle/5.4/src/Kernel.php diff --git a/symfony/framework-bundle/5.4/config/packages/cache.yaml b/symfony/framework-bundle/5.4/config/packages/cache.yaml new file mode 100644 index 00000000..6899b720 --- /dev/null +++ b/symfony/framework-bundle/5.4/config/packages/cache.yaml @@ -0,0 +1,19 @@ +framework: + cache: + # Unique name of your app: used to compute stable namespaces for cache keys. + #prefix_seed: your_vendor_name/app_name + + # The "app" cache stores to the filesystem by default. + # The data in this cache should persist between deploys. + # Other options include: + + # Redis + #app: cache.adapter.redis + #default_redis_provider: redis://localhost + + # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues) + #app: cache.adapter.apcu + + # Namespaced pools use the above "app" backend by default + #pools: + #my.dedicated.cache: null diff --git a/symfony/framework-bundle/5.4/config/packages/framework.yaml b/symfony/framework-bundle/5.4/config/packages/framework.yaml new file mode 100644 index 00000000..7853e9ed --- /dev/null +++ b/symfony/framework-bundle/5.4/config/packages/framework.yaml @@ -0,0 +1,24 @@ +# see https://symfony.com/doc/current/reference/configuration/framework.html +framework: + secret: '%env(APP_SECRET)%' + #csrf_protection: true + http_method_override: false + + # Enables session support. Note that the session will ONLY be started if you read or write from it. + # Remove or comment this section to explicitly disable session support. + session: + handler_id: null + cookie_secure: auto + cookie_samesite: lax + storage_factory_id: session.storage.factory.native + + #esi: true + #fragments: true + php_errors: + log: true + +when@test: + framework: + test: true + session: + storage_factory_id: session.storage.factory.mock_file diff --git a/symfony/framework-bundle/5.4/config/preload.php b/symfony/framework-bundle/5.4/config/preload.php new file mode 100644 index 00000000..5ebcdb21 --- /dev/null +++ b/symfony/framework-bundle/5.4/config/preload.php @@ -0,0 +1,5 @@ + + What's next? + + + * Run your application: + 1. Go to the project directory + 2. Create your code repository with the git init command + 3. Download the Symfony CLI at https://symfony.com/download to install a development web server + + * Read the documentation at https://symfony.com/doc diff --git a/symfony/framework-bundle/5.4/public/index.php b/symfony/framework-bundle/5.4/public/index.php new file mode 100644 index 00000000..9982c218 --- /dev/null +++ b/symfony/framework-bundle/5.4/public/index.php @@ -0,0 +1,9 @@ +import('../config/{packages}/*.yaml'); + $container->import('../config/{packages}/'.$this->environment.'/*.yaml'); + + if (is_file(\dirname(__DIR__).'/config/services.yaml')) { + $container->import('../config/services.yaml'); + $container->import('../config/{services}_'.$this->environment.'.yaml'); + } else { + $container->import('../config/{services}.php'); + } + } + + protected function configureRoutes(RoutingConfigurator $routes): void + { + $routes->import('../config/{routes}/'.$this->environment.'/*.yaml'); + $routes->import('../config/{routes}/*.yaml'); + + if (is_file(\dirname(__DIR__).'/config/routes.yaml')) { + $routes->import('../config/routes.yaml'); + } else { + $routes->import('../config/{routes}.php'); + } + } +} From 2da7d24cf05f1919b93ce641df581e2b68e864d0 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 12 Jul 2021 09:06:09 +0200 Subject: [PATCH 2/3] Target 5.4 --- symfony/framework-bundle/5.4/src/Kernel.php | 22 ++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/symfony/framework-bundle/5.4/src/Kernel.php b/symfony/framework-bundle/5.4/src/Kernel.php index 8e96873a..c0fede66 100644 --- a/symfony/framework-bundle/5.4/src/Kernel.php +++ b/symfony/framework-bundle/5.4/src/Kernel.php @@ -13,26 +13,30 @@ class Kernel extends BaseKernel protected function configureContainer(ContainerConfigurator $container): void { - $container->import('../config/{packages}/*.yaml'); - $container->import('../config/{packages}/'.$this->environment.'/*.yaml'); + $projectDir = $this->getProjectDir(); + + $container->import($projectDir.'/config/{packages}/*.yaml'); + $container->import($projectDir.'/config/{packages}/'.$this->environment.'/*.yaml'); if (is_file(\dirname(__DIR__).'/config/services.yaml')) { - $container->import('../config/services.yaml'); - $container->import('../config/{services}_'.$this->environment.'.yaml'); + $container->import($projectDir.'/config/services.yaml'); + $container->import($projectDir.'/config/{services}_'.$this->environment.'.yaml'); } else { - $container->import('../config/{services}.php'); + $container->import($projectDir.'/config/{services}.php'); } } protected function configureRoutes(RoutingConfigurator $routes): void { - $routes->import('../config/{routes}/'.$this->environment.'/*.yaml'); - $routes->import('../config/{routes}/*.yaml'); + $projectDir = $this->getProjectDir(); + + $routes->import($projectDir.'/config/{routes}/'.$this->environment.'/*.yaml'); + $routes->import($projectDir.'/config/{routes}/*.yaml'); if (is_file(\dirname(__DIR__).'/config/routes.yaml')) { - $routes->import('../config/routes.yaml'); + $routes->import($projectDir.'/config/routes.yaml'); } else { - $routes->import('../config/{routes}.php'); + $routes->import($projectDir.'/config/{routes}.php'); } } } From 0536f7c6c808dea8bd9f46df01f169ac57b9426f Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Mon, 12 Jul 2021 10:55:42 +0200 Subject: [PATCH 3/3] Change for routes and services too --- symfony/framework-bundle/5.4/src/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/symfony/framework-bundle/5.4/src/Kernel.php b/symfony/framework-bundle/5.4/src/Kernel.php index c0fede66..03debcac 100644 --- a/symfony/framework-bundle/5.4/src/Kernel.php +++ b/symfony/framework-bundle/5.4/src/Kernel.php @@ -18,7 +18,7 @@ class Kernel extends BaseKernel $container->import($projectDir.'/config/{packages}/*.yaml'); $container->import($projectDir.'/config/{packages}/'.$this->environment.'/*.yaml'); - if (is_file(\dirname(__DIR__).'/config/services.yaml')) { + if (is_file($projectDir.'/config/services.yaml')) { $container->import($projectDir.'/config/services.yaml'); $container->import($projectDir.'/config/{services}_'.$this->environment.'.yaml'); } else { @@ -33,7 +33,7 @@ class Kernel extends BaseKernel $routes->import($projectDir.'/config/{routes}/'.$this->environment.'/*.yaml'); $routes->import($projectDir.'/config/{routes}/*.yaml'); - if (is_file(\dirname(__DIR__).'/config/routes.yaml')) { + if (is_file($projectDir.'/config/routes.yaml')) { $routes->import($projectDir.'/config/routes.yaml'); } else { $routes->import($projectDir.'/config/{routes}.php');