Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mnocon committed Jun 22, 2020
2 parents f93157e + 88a76d9 commit 8b875dc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"php": "^7.3",
"ext-ctype": "*",
"ext-iconv": "*",
"doctrine/doctrine-migrations-bundle": "^2.1",
"ezsystems/date-based-publisher": "^4.1@dev",
"ezsystems/doctrine-dbal-schema": "^1.0@dev",
"ezsystems/ez-support-tools": "^2.0@dev",
Expand Down
8 changes: 4 additions & 4 deletions config/packages/doctrine_migrations.yaml
Original file line number Diff line number Diff line change
@@ -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'
File renamed without changes.
15 changes: 15 additions & 0 deletions src/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

0 comments on commit 8b875dc

Please sign in to comment.