From 0ce26dd3314bb316264e1606b41213d11378b558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20W=C3=B3js?= <adam.wojs@ez.no>
Date: Mon, 22 Jun 2020 10:34:51 +0200
Subject: [PATCH 1/2] Upgraded doctrine/migrations to ^3.0 (#570)

---
 composer.json                             | 1 -
 config/packages/doctrine_migrations.yaml  | 8 ++++----
 {src/Migrations => migrations}/.gitignore | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename {src/Migrations => migrations}/.gitignore (100%)

diff --git a/composer.json b/composer.json
index 0ee7113381..cb5f74fceb 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
         "php": "^7.3",
         "ext-ctype": "*",
         "ext-iconv": "*",
-        "doctrine/doctrine-migrations-bundle": "^2.1",
         "ezsystems/doctrine-dbal-schema": "^1.0@dev",
         "ezsystems/ez-support-tools": "^2.0@dev",
         "ezsystems/ezplatform-admin-ui": "^2.1@dev",
diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml
index 3bf0fbcae9..61e6612408 100644
--- a/config/packages/doctrine_migrations.yaml
+++ b/config/packages/doctrine_migrations.yaml
@@ -1,5 +1,5 @@
 doctrine_migrations:
-    dir_name: '%kernel.project_dir%/src/Migrations'
-    # namespace is arbitrary but should be different from App\Migrations
-    # as migrations classes should NOT be autoloaded
-    namespace: DoctrineMigrations
+    migrations_paths:
+        # namespace is arbitrary but should be different from App\Migrations
+        # as migrations classes should NOT be autoloaded
+        'DoctrineMigrations': '%kernel.project_dir%/migrations'
diff --git a/src/Migrations/.gitignore b/migrations/.gitignore
similarity index 100%
rename from src/Migrations/.gitignore
rename to migrations/.gitignore

From 88a76d9ef204beebb553aa2fcdcdb400feb502e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Morel?= <morel.seb@gmail.com>
Date: Mon, 22 Jun 2020 01:35:11 -0700
Subject: [PATCH 2/2] Bring back SYMFONY_TMP_DIR for Docker optimization (#543)

But also platform.sh
---
 src/Kernel.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/Kernel.php b/src/Kernel.php
index a61f2a96b5..c0e3db748c 100644
--- a/src/Kernel.php
+++ b/src/Kernel.php
@@ -46,4 +46,19 @@ protected function configureRoutes(RouteCollectionBuilder $routes): void
         $routes->import($confDir.'/{routes}/*'.self::CONFIG_EXTS, '/', 'glob');
         $routes->import($confDir.'/{routes}'.self::CONFIG_EXTS, '/', 'glob');
     }
+
+    // can be removed when bumping to Symfony 5.2
+    public function getCacheDir()
+    {
+        if (isset($_SERVER['APP_CACHE_DIR'])) {
+            return $_SERVER['APP_CACHE_DIR'].'/'.$this->environment;
+        }
+        return parent::getCacheDir();
+    }
+
+    // can be removed when bumping to Symfony 5.2
+    public function getLogDir()
+    {
+        return $_SERVER['APP_LOG_DIR'] ?? parent::getLogDir();
+    }
 }