- Some bugfixes made in skeleton dir and fixed 'email' route pattern
This commit is contained in:
parent
ec313ff269
commit
e526ba7128
@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
use Tell\I18n;
|
use Tell\I18n;
|
||||||
use Psr\Container\ContainerInterface;
|
use Psr\Container\ContainerInterface;
|
||||||
use Notes\Tell\LanguageHandler;
|
|
||||||
|
|
||||||
use function DI\autowire, DI\create, DI\get, DI\add;
|
use function DI\autowire, DI\create, DI\get, DI\add;
|
||||||
|
|
||||||
|
|||||||
@ -65,7 +65,7 @@ return [
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$router->addPatternMatcher('email', '[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+');
|
$router->addPatternMatcher('email', '[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n/]+');
|
||||||
|
|
||||||
$routing = $container->get(Lean\Routing::class);
|
$routing = $container->get(Lean\Routing::class);
|
||||||
$routing->registerRoute($container, getenv('URL_BASE'));
|
$routing->registerRoute($container, getenv('URL_BASE'));
|
||||||
|
|||||||
@ -5,7 +5,8 @@ CRON_KEY = dev
|
|||||||
|
|
||||||
# Route
|
# Route
|
||||||
URL_BASE = ""
|
URL_BASE = ""
|
||||||
APP_URL = "dev.mcnd.ca"
|
APP_URL = "myapp.ca"
|
||||||
|
ASSET_PATH = "static/"
|
||||||
|
|
||||||
# Path
|
# Path
|
||||||
CACHE_DIR = "var/cache"
|
CACHE_DIR = "var/cache"
|
||||||
@ -23,19 +24,18 @@ DEFAULT_TIME = "fr.UTF-8"
|
|||||||
DEFAULT_TIME_FALLBACK = "french.UTF-8"
|
DEFAULT_TIME_FALLBACK = "french.UTF-8"
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
#SQLITE_PATH = "var/home.sqlite3"
|
SQLITE_PATH = "var/myapp.sqlite3"
|
||||||
#SQLITE_ADAPTER = "SQLite"
|
SQLITE_ADAPTER = "SQLite"
|
||||||
#SQLITE_PRAGMA_BEGIN = "foreign_keys=ON,synchronous=NORMAL"
|
SQLITE_PRAGMA_BEGIN = "foreign_keys=ON,synchronous=NORMAL"
|
||||||
#SQLITE_PRAGMA_DEBUG_BEGIN = "journal_mode=WAL"
|
SQLITE_PRAGMA_DEBUG_BEGIN = "journal_mode=WAL"
|
||||||
#SQLITE_PRAGMA_CLOSE = "analysis_limit=500,optimize"
|
SQLITE_PRAGMA_CLOSE = "analysis_limit=500,optimize"
|
||||||
|
|
||||||
DATABASE_PORT = ""
|
#DATABASE_PORT = ""
|
||||||
DATABASE_HOST = ""
|
#DATABASE_HOST = ""
|
||||||
DATABASE_NAME = ""
|
#DATABASE_NAME = ""
|
||||||
DATABASE_USERNAME = ""
|
#DATABASE_USERNAME = ""
|
||||||
DATABASE_PASSWORD = ""
|
#DATABASE_PASSWORD = ""
|
||||||
DATABASE_CHARSET = "utf8"
|
#DATABASE_CHARSET = "utf8"
|
||||||
DATABASE_ADAPTER = "MariaDB"
|
#DATABASE_ADAPTER = "MariaDB"
|
||||||
|
|
||||||
LEAN_RANDOM = "%RAND64%"
|
LEAN_RANDOM = "%RAND64%"
|
||||||
|
|
||||||
|
|||||||
@ -19,7 +19,7 @@ return [
|
|||||||
|
|
||||||
'ulmus' => [
|
'ulmus' => [
|
||||||
'connections' => [
|
'connections' => [
|
||||||
'default' => [
|
/*'default' => [
|
||||||
'adapter' => getenv("DATABASE_ADAPTER"),
|
'adapter' => getenv("DATABASE_ADAPTER"),
|
||||||
'host' => getenv("DATABASE_HOST"),
|
'host' => getenv("DATABASE_HOST"),
|
||||||
'port' => getenv("DATABASE_PORT"),
|
'port' => getenv("DATABASE_PORT"),
|
||||||
@ -29,9 +29,9 @@ return [
|
|||||||
'settings' => [
|
'settings' => [
|
||||||
'charset' => getenv("DATABASE_CHARSET"),
|
'charset' => getenv("DATABASE_CHARSET"),
|
||||||
],
|
],
|
||||||
],
|
],*/
|
||||||
|
|
||||||
'sqlite' => [
|
'default' => [
|
||||||
'adapter' => getenv("SQLITE_ADAPTER"),
|
'adapter' => getenv("SQLITE_ADAPTER"),
|
||||||
'path' => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . getenv("SQLITE_PATH"),
|
'path' => getenv('PROJECT_PATH') . DIRECTORY_SEPARATOR . getenv("SQLITE_PATH"),
|
||||||
'pragma' => explode(',', getenv("SQLITE_PRAGMA")),
|
'pragma' => explode(',', getenv("SQLITE_PRAGMA")),
|
||||||
|
|||||||
@ -7,6 +7,7 @@ use Storage\Session;
|
|||||||
use Ulmus\User\Entity\User;
|
use Ulmus\User\Entity\User;
|
||||||
use Notes\Route\Attribute\Object\Route;
|
use Notes\Route\Attribute\Object\Route;
|
||||||
use Notes\Security\Attribute\Security;
|
use Notes\Security\Attribute\Security;
|
||||||
|
use DI\Attribute\Inject;
|
||||||
|
|
||||||
use %NAMESPACE%\{ Entity, Lib, Form };
|
use %NAMESPACE%\{ Entity, Lib, Form };
|
||||||
|
|
||||||
@ -18,9 +19,9 @@ use Notes\Attribute\Ignore;use Ulmus\User\Entity\UserInterface;
|
|||||||
trait ControllerTrait {
|
trait ControllerTrait {
|
||||||
use \Lean\ControllerTrait;
|
use \Lean\ControllerTrait;
|
||||||
|
|
||||||
#[Ignore]
|
#[Inject]
|
||||||
public ? UserInterface $user;
|
public ? UserInterface $user;
|
||||||
|
|
||||||
#[Ignore]
|
#[Inject]
|
||||||
protected EventManager $eventManager;
|
protected EventManager $eventManager;
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user