mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-14 09:04:25 +02:00
Code Issues Releases Wiki Activity

refactor(core): fix all flextype settings

Browse Source
This commit is contained in:
Awilum
2020-04-11 17:42:06 +03:00
parent 6103d54c94
commit f0d923c421
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/flextype/core/Cache/Cache.php
View File

@@ -67,7 +67,7 @@ class Cache
$this->now = time();
// Create cache key to allow invalidate all cache on configuration changes.
$this->key = ($this->flextype['registry']->get('flextype.cache.prefix') ?? 'flextype') . '-' . md5(PATH['site'] . 'Flextype::VERSION');
$this->key = ($this->flextype['registry']->get('flextype.settings.cache.prefix') ?? 'flextype') . '-' . md5(PATH['site'] . 'Flextype::VERSION');
// Get Cache Driver
$this->driver = $this->getCacheDriver();
@@ -117,7 +117,7 @@ class Cache
*/
public function fetch(string $id)
{
if ($this->flextype['registry']->get('flextype.cache.enabled')) {
if ($this->flextype['registry']->get('flextype.settings.cache.enabled')) {
return $this->driver->fetch($id);
}
@@ -133,7 +133,7 @@ class Cache
*/
public function contains(string $id) : bool
{
if ($this->flextype['registry']->get('flextype.cache.enabled')) {
if ($this->flextype['registry']->get('flextype.settings.cache.enabled')) {
return $this->driver->contains($id);
}
@@ -153,7 +153,7 @@ class Cache
*/
public function save(string $id, $data, ?int $lifetime = null) : void
{
if (! $this->flextype['registry']->get('flextype.cache.enabled')) {
if (! $this->flextype['registry']->get('flextype.settings.cache.enabled')) {
return;
}
@@ -168,7 +168,7 @@ class Cache
*/
public function delete(string $id) : void
{
if (! $this->flextype['registry']->get('flextype.cache.enabled')) {
if (! $this->flextype['registry']->get('flextype.settings.cache.enabled')) {
return;
}
@@ -237,7 +237,7 @@ class Cache
public function getLifetime()
{
if ($this->lifetime === null) {
$this->lifetime = $this->flextype['registry']->get('flextype.cache.lifetime') ?: 604800;
$this->lifetime = $this->flextype['registry']->get('flextype.settings.cache.lifetime') ?: 604800;
}
return $this->lifetime;

4
src/flextype/core/Cache/MemcachedAdapter.php
View File

@@ -19,8 +19,8 @@ class MemcachedAdapter implements CacheAdapterInterface
{
$memcached = new Memecached();
$memcached->addServer(
$this->flextype['registry']->get('flextype.cache.memcached.server', 'localhost'),
$this->flextype['registry']->get('flextype.cache.memcache.port', 11211)
$this->flextype['registry']->get('flextype.settings.cache.memcached.server', 'localhost'),
$this->flextype['registry']->get('flextype.settings.cache.memcache.port', 11211)
);
$driver = new MemcachedCache();

8
src/flextype/core/Cache/RedisAdapter.php
View File

@@ -19,15 +19,15 @@ class RedisAdapter implements CacheAdapterInterface
public function getDriver() : object
{
$redis = new Redis();
$socket = $this->flextype['registry']->get('flextype.cache.redis.socket', false);
$password = $this->flextype['registry']->get('flextype.cache.redis.password', false);
$socket = $this->flextype['registry']->get('flextype.settings.cache.redis.socket', false);
$password = $this->flextype['registry']->get('flextype.settings.cache.redis.password', false);
if ($socket) {
$redis->connect($socket);
} else {
$redis->connect(
$this->flextype['registry']->get('flextype.cache.redis.server', 'localhost'),
$this->flextype['registry']->get('flextype.cache.redis.port', 6379)
$this->flextype['registry']->get('flextype.settings.cache.redis.server', 'localhost'),
$this->flextype['registry']->get('flextype.settings.cache.redis.port', 6379)
);
}

4
src/flextype/core/Cache/SQLite3Adapter.php
View File

@@ -24,8 +24,8 @@ class SQLite3Adapter implements CacheAdapterInterface
Filesystem::createDir($cache_directory);
}
$db = new SQLite3($cache_directory . $this->flextype['registry']->get('flextype.cache.sqlite3.database', 'flextype') . '.db');
$db = new SQLite3($cache_directory . $this->flextype['registry']->get('flextype.settings.cache.sqlite3.database', 'flextype') . '.db');
return new SQLite3Cache($db, $this->flextype['registry']->get('flextype.cache.sqlite3.table', 'flextype'));
return new SQLite3Cache($db, $this->flextype['registry']->get('flextype.settings.cache.sqlite3.table', 'flextype'));
}
}

4
src/flextype/core/Entries/Entries.php
View File

@@ -503,8 +503,8 @@ class Entries
// Check if new entry file exists
if (! Filesystem::has($entry_file = $entry_dir . '/entry.md')) {
$data['uuid'] = Uuid::uuid4()->toString();
$data['published_at'] = date($this->flextype->registry->get('flextype.date_format'), time());
$data['created_at'] = date($this->flextype->registry->get('flextype.date_format'), time());
$data['published_at'] = date($this->flextype->registry->get('flextype.settings.date_format'), time());
$data['created_at'] = date($this->flextype->registry->get('flextype.settings.date_format'), time());
$data['published_by'] = (Session::exists('uuid') ? Session::get('uuid') : '');
$data['created_by'] = (Session::exists('uuid') ? Session::get('uuid') : '');

8
src/flextype/core/Parsers/Parser.php
View File

@@ -103,7 +103,7 @@ class Parser
{
switch ($parser) {
case 'frontmatter':
if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
$key = md5($input);
if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
@@ -120,7 +120,7 @@ class Parser
break;
case 'json':
if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
$key = md5($input);
if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
@@ -137,7 +137,7 @@ class Parser
break;
case 'yaml':
if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
$key = md5($input);
if ($data_from_cache = $this->flextype['cache']->fetch($key)) {
@@ -154,7 +154,7 @@ class Parser
break;
case 'markdown':
if ($cache === true && $this->flextype['registry']->get('flextype.cache.enabled') === true) {
if ($cache === true && $this->flextype['registry']->get('flextype.settings.cache.enabled') === true) {
$key = md5($input);
if ($data_from_cache = $this->flextype['cache']->fetch($key)) {

2
src/flextype/core/Plugins/Plugins.php
View File

@@ -69,7 +69,7 @@ class Plugins
$this->flextype['registry']->set('plugins', []);
// Set locale
$locale = $this->flextype['registry']->get('flextype.locale');
$locale = $this->flextype['registry']->get('flextype.settings.locale');
// Get plugins list
$plugins_list = $this->getPluginsList();

14
src/flextype/dependencies.php
View File

@@ -74,12 +74,12 @@ $flextype['emitter'] = static function ($container) {
*/
$flextype['slugify'] = static function ($container) {
return new Slugify([
'separator' => $container['registry']->get('flextype.slugify.separator'),
'lowercase' => $container['registry']->get('flextype.slugify.lowercase'),
'trim' => $container['registry']->get('flextype.slugify.trim'),
'regexp' => $container['registry']->get('flextype.slugify.regexp'),
'lowercase_after_regexp' => $container['registry']->get('flextype.slugify.lowercase_after_regexp'),
'strip_tags' => $container['registry']->get('flextype.slugify.strip_tags'),
'separator' => $container['registry']->get('flextype.settings.slugify.separator'),
'lowercase' => $container['registry']->get('flextype.settings.slugify.lowercase'),
'trim' => $container['registry']->get('flextype.settings.slugify.trim'),
'regexp' => $container['registry']->get('flextype.settings.slugify.regexp'),
'lowercase_after_regexp' => $container['registry']->get('flextype.settings.slugify.lowercase_after_regexp'),
'strip_tags' => $container['registry']->get('flextype.settings.slugify.strip_tags'),
]);
};
@@ -87,7 +87,7 @@ $flextype['slugify'] = static function ($container) {
* Adds the cache adapter to the Flextype container
*/
$flextype['cache_adapter'] = static function ($container) use ($flextype) {
$driver_name = $container['registry']->get('flextype.cache.driver');
$driver_name = $container['registry']->get('flextype.settings.cache.driver');
if (! $driver_name || $driver_name === 'auto') {
if (extension_loaded('apcu')) {

6
src/flextype/endpoints/delivery/entries.php
View File

@@ -34,9 +34,9 @@ $app->get('/api/delivery/entries', function (Request $request, Response $respons
// Set variables
$id = $query['id'];
$args = $query['args'] ?? null;
$data = $query['args'] ?? null;
if ($flextype['registry']->get('flextype.api.entries.enabled')) {
if ($flextype['registry']->get('flextype.settings.api.entries.enabled')) {
// Validate delivery token
if (validate_delivery_entries_token($request, $flextype)) {
$delivery_entries_token_file_path = PATH['site'] . '/tokens/delivery/entries/' . $request->getQueryParams()['token'] . '/token.yaml';
@@ -49,7 +49,7 @@ $app->get('/api/delivery/entries', function (Request $request, Response $respons
}
// Fetch entry
$data = $flextype['entries']->fetch($id, $args);
$data = $flextype['entries']->fetch($id, $data);
// Set response code
$response_code = count($data) > 0 ? 200 : 404;

2
src/flextype/endpoints/delivery/images.php
View File

@@ -32,7 +32,7 @@ $app->get('/api/delivery/images/{path:.+}', function (Request $request, Response
// Get Query Params
$query = $request->getQueryParams();
if ($flextype['registry']->get('flextype.api.images.enabled')) {
if ($flextype['registry']->get('flextype.settings.api.images.enabled')) {
// Validate delivery image token
if (validate_delivery_images_token($request, $flextype)) {
$delivery_images_token_file_path = PATH['site'] . '/site/delivery/images/' . $request->getQueryParams()['token'] . '/token.yaml';

2
src/flextype/endpoints/delivery/registry.php
View File

@@ -34,7 +34,7 @@ $app->get('/api/delivery/registry', function (Request $request, Response $respon
// Set variables
$id = $query['id'];
if ($flextype['registry']->get('flextype.api.registry.enabled')) {
if ($flextype['registry']->get('flextype.settings.api.registry.enabled')) {
// Validate delivery token
if (validate_delivery_registry_token($request, $flextype)) {
$delivery_registry_token_file_path = PATH['site'] . '/tokens/delivery/registry/' . $request->getQueryParams()['token'] . '/token.yaml';