diff --git a/composer.json b/composer.json index c5e242b..c420205 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "", "minimum-stability":"dev", "require": { - "omatech/editora-dbinterface": "^1.5" + "omatech/editora-dbinterface": "^1.6" }, "require-dev": { }, diff --git a/src/Omatech/Editora/Connector/ConnectorServiceProvider.php b/src/Omatech/Editora/Connector/ConnectorServiceProvider.php index 746ac64..e13aaf7 100644 --- a/src/Omatech/Editora/Connector/ConnectorServiceProvider.php +++ b/src/Omatech/Editora/Connector/ConnectorServiceProvider.php @@ -69,7 +69,7 @@ private function toDoctrineDB($config) ]; $config['driver'] = $driverSchemeAliases[$config['driver']] ?? $config['driver']; - $config['user'] = $config['username']; + $config['user'] = $config['username'] ?? ''; $config['dbname'] = $config['database']; $config['driverOptions'] = $config['options'] ?? []; if($config['unix_socket'] ?? false) { diff --git a/src/Omatech/Editora/Connector/Routes.php b/src/Omatech/Editora/Connector/Routes.php index b7baa62..b1738f0 100644 --- a/src/Omatech/Editora/Connector/Routes.php +++ b/src/Omatech/Editora/Connector/Routes.php @@ -38,7 +38,11 @@ } } - Route::get($routeString, 'Omatech\Editora\Connector\EditoraController@init'); + $editoraRoute = Route::get($routeString, 'Omatech\Editora\Connector\EditoraController@init'); + + if (config('editora.fullNiceUrlInterpretation')) { + $editoraRoute->where('nice_url', '.*'); + } } }); }