From 9cd1c6dece1713e96a85e1125daf29df69e64abe Mon Sep 17 00:00:00 2001 From: Awilum Date: Tue, 24 Nov 2020 23:15:59 +0300 Subject: [PATCH] feat(core): use Atomastic Components #478 --- src/flextype/Endpoints/entries.php | 4 ++-- src/flextype/Endpoints/files.php | 10 +++++----- src/flextype/Endpoints/folders.php | 4 ++-- src/flextype/Endpoints/images.php | 2 +- .../Foundation/Entries/Fields/PublishedAtField.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/flextype/Endpoints/entries.php b/src/flextype/Endpoints/entries.php index b0c05a5b..4dd034a4 100644 --- a/src/flextype/Endpoints/entries.php +++ b/src/flextype/Endpoints/entries.php @@ -82,7 +82,7 @@ flextype()->get('/api/entries', function (Request $request, Response $response) } // Update calls counter - flextype('filesytem')->file($entries_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($entries_token_file_data, ['calls' => $entries_token_file_data['calls'] + 1]))); + filesystem()->file($entries_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($entries_token_file_data, ['calls' => $entries_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response @@ -185,7 +185,7 @@ flextype()->post('/api/entries', function (Request $request, Response $response) $response_code = $create_entry ? 200 : 404; // Update calls counter - flextype('filesytem')->file($entries_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($entries_token_file_data, ['calls' => $entries_token_file_data['calls'] + 1]))); + filesystem()->file($entries_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($entries_token_file_data, ['calls' => $entries_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response diff --git a/src/flextype/Endpoints/files.php b/src/flextype/Endpoints/files.php index 77e7366b..6a32f33b 100644 --- a/src/flextype/Endpoints/files.php +++ b/src/flextype/Endpoints/files.php @@ -393,7 +393,7 @@ flextype()->put('/api/files/copy', function (Request $request, Response $respons $response_code = $copy_file === true ? 200 : 404; // Update calls counter - flextype('filesytem')->file($files_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); + filesystem()->file($files_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response @@ -563,7 +563,7 @@ flextype()->patch('/api/files/meta', function (Request $request, Response $respo // Set files and access token file if (($files_token_file_data = flextype('yaml')->decode(filesystem()->file($files_token_file_path)->get())) && - ($access_token_file_data = flextype('yaml')->decode(flextype('filesytem')->file($access_token_file_path)->get($access_token_file_path)))) { + ($access_token_file_data = flextype('yaml')->decode(filesystem()->file($access_token_file_path)->get($access_token_file_path)))) { if ($files_token_file_data['state'] === 'disabled' || ($files_token_file_data['limit_calls'] !== 0 && $files_token_file_data['calls'] >= $files_token_file_data['limit_calls'])) { return $response @@ -771,8 +771,8 @@ flextype()->delete('/api/files/meta', function (Request $request, Response $resp $access_token_file_path = PATH['project'] . '/tokens/access/' . $access_token . '/token.yaml'; // Set files and access token file - if (($files_token_file_data = flextype('yaml')->decode(flextype('filesytem')->file($files_token_file_path)->get())) && - ($access_token_file_data = flextype('yaml')->decode(flextype('filesytem')->file($access_token_file_path)->get()))) { + if (($files_token_file_data = flextype('yaml')->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('yaml')->decode(filesystem()->file($access_token_file_path)->get()))) { if ($files_token_file_data['state'] === 'disabled' || ($files_token_file_data['limit_calls'] !== 0 && $files_token_file_data['calls'] >= $files_token_file_data['limit_calls'])) { return $response @@ -802,7 +802,7 @@ flextype()->delete('/api/files/meta', function (Request $request, Response $resp $response_code = $delete_file_meta ? 200 : 404; // Update calls counter - flextype('filesytem')->file($files_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); + filesystem()->file($files_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response diff --git a/src/flextype/Endpoints/folders.php b/src/flextype/Endpoints/folders.php index 1cd7c318..eaac2e0e 100644 --- a/src/flextype/Endpoints/folders.php +++ b/src/flextype/Endpoints/folders.php @@ -65,7 +65,7 @@ flextype()->get('/api/folders', function (Request $request, Response $response) $folders_token_file_path = PATH['project'] . '/tokens/folders/' . $token . '/token.yaml'; // Set delivery token file - if ($folders_token_file_data = flextype('yaml')->decode(flextype('filesytem')->file($folders_token_file_path)->get())) { + if ($folders_token_file_data = flextype('yaml')->decode(filesystem()->file($folders_token_file_path)->get())) { if ($folders_token_file_data['state'] === 'disabled' || ($folders_token_file_data['limit_calls'] !== 0 && $folders_token_file_data['calls'] >= $folders_token_file_data['limit_calls'])) { return $response->withStatus($api_errors['0501']['http_status_code']) @@ -395,7 +395,7 @@ flextype()->put('/api/folders', function (Request $request, Response $response) $response_code = $rename_folder ? 200 : 404; // Update calls counter - flextype('filesytem')->file($folders_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); + filesystem()->file($folders_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response diff --git a/src/flextype/Endpoints/images.php b/src/flextype/Endpoints/images.php index ee22bf12..b7c327b4 100644 --- a/src/flextype/Endpoints/images.php +++ b/src/flextype/Endpoints/images.php @@ -63,7 +63,7 @@ flextype()->get('/api/images/{path:.+}', function (Request $request, Response $r } // Update calls counter - flextype('filesytem')->file($delivery_images_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($delivery_images_token_file_data, ['calls' => $delivery_images_token_file_data['calls'] + 1]))); + filesystem()->file($delivery_images_token_file_path)->put(flextype('yaml')->encode(array_replace_recursive($delivery_images_token_file_data, ['calls' => $delivery_images_token_file_data['calls'] + 1]))); if (filesystem()->file(PATH['project'] . '/uploads/entries/' . $args['path'])->exists()) { return flextype('images')->getImageResponse($args['path'], $_GET); diff --git a/src/flextype/Foundation/Entries/Fields/PublishedAtField.php b/src/flextype/Foundation/Entries/Fields/PublishedAtField.php index 5bbb7536..77986100 100644 --- a/src/flextype/Foundation/Entries/Fields/PublishedAtField.php +++ b/src/flextype/Foundation/Entries/Fields/PublishedAtField.php @@ -10,7 +10,7 @@ declare(strict_types=1); if (flextype('registry')->get('flextype.settings.entries.fields.published_at.enabled')) { flextype('emitter')->addListener('onEntryAfterInitialized', static function (): void { if (flextype('entries')->getStorage('fetch_single.data.published_at') === null) { - flextype('entries')->setStorage('fetch_single.data.published_at', (int) flextype('filesytem')->file(flextype('entries')->getFileLocation(flextype('entries')->getStorage('fetch_single.id')))->lastModified()); + flextype('entries')->setStorage('fetch_single.data.published_at', (int) filesystem()->file(flextype('entries')->getFileLocation(flextype('entries')->getStorage('fetch_single.id')))->lastModified()); } else { flextype('entries')->setStorage('fetch_single.data.published_at', (int) strtotime((string) flextype('entries')->getStorage('fetch_single.data.published_at'))); }