From 1cf1c560c04f0bae84b166c464f073d29ebf31d6 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 18 Dec 2020 11:44:05 +0300 Subject: [PATCH] feat(media): standardise media container names for Media API #517 --- src/flextype/Endpoints/images.php | 16 +- src/flextype/Endpoints/media.php | 326 +++++++++--------- .../Foundation/Entries/Fields/MediaField.php | 8 +- src/flextype/Foundation/Media/Media.php | 36 ++ src/flextype/Foundation/Media/MediaFiles.php | 43 ++- .../Foundation/Media/MediaFilesMeta.php | 12 +- .../Foundation/Media/MediaFolders.php | 33 +- .../Entries/Fields/MediaFieldTest.php | 10 +- tests/Foundation/Media/MediaFilesMetaTest.php | 22 +- tests/Foundation/Media/MediaFilesTest.php | 48 +-- .../Foundation/Media/MediaFoldersMetaTest.php | 2 +- tests/Foundation/Media/MediaFoldersTest.php | 28 +- 12 files changed, 319 insertions(+), 265 deletions(-) create mode 100644 src/flextype/Foundation/Media/Media.php diff --git a/src/flextype/Endpoints/images.php b/src/flextype/Endpoints/images.php index ec223dad..c9d32958 100644 --- a/src/flextype/Endpoints/images.php +++ b/src/flextype/Endpoints/images.php @@ -45,7 +45,7 @@ flextype()->get('/api/images/{path:.+}', function (Request $request, Response $r if (! isset($query['token'])) { return $response->withStatus($api_errors['0400']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0400'])); + ->write(flextype('serializers')->json()->encode($api_errors['0400'])); } // Set variables @@ -57,18 +57,18 @@ flextype()->get('/api/images/{path:.+}', function (Request $request, Response $r $delivery_images_token_file_path = PATH['project'] . '/tokens/images/' . $token . '/token.yaml'; // Set delivery token file - if ($delivery_images_token_file_data = flextype('yaml')->decode(filesystem()->file($delivery_images_token_file_path)->get())) { + if ($delivery_images_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($delivery_images_token_file_path)->get())) { if ( $delivery_images_token_file_data['state'] === 'disabled' || ($delivery_images_token_file_data['limit_calls'] !== 0 && $delivery_images_token_file_data['calls'] >= $delivery_images_token_file_data['limit_calls']) ) { return $response->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Update calls counter - 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]))); + filesystem()->file($delivery_images_token_file_path)->put(flextype('serializers')->yaml()->encode(array_replace_recursive($delivery_images_token_file_data, ['calls' => $delivery_images_token_file_data['calls'] + 1]))); if (filesystem()->file(PATH['project'] . '/media/' . $args['path'])->exists()) { return flextype('images')->getImageResponse($args['path'], $_GET); @@ -77,23 +77,23 @@ flextype()->get('/api/images/{path:.+}', function (Request $request, Response $r return $response ->withStatus($api_errors['0402']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0402'])); + ->write(flextype('serializers')->json()->encode($api_errors['0402'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); diff --git a/src/flextype/Endpoints/media.php b/src/flextype/Endpoints/media.php index bdd3f595..62f96f98 100644 --- a/src/flextype/Endpoints/media.php +++ b/src/flextype/Endpoints/media.php @@ -55,7 +55,7 @@ flextype()->get('/api/media/files', function (Request $request, Response $respon if (! isset($query['id']) || ! isset($query['token'])) { return $response->withStatus($api_errors['0500']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0500'])); + ->write(flextype('serializers')->json()->encode($api_errors['0500'])); } // Set variables @@ -70,7 +70,7 @@ flextype()->get('/api/media/files', function (Request $request, Response $respon $files_token_file_path = PATH['project'] . '/tokens/media/files/' . $token . '/token.yaml'; // Set delivery token file - if ($files_token_file_data = flextype('yaml')->decode(filesystem()->file($files_token_file_path)->get())) { + if ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_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']) @@ -78,7 +78,7 @@ flextype()->get('/api/media/files', function (Request $request, Response $respon return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Create files array @@ -86,14 +86,14 @@ flextype()->get('/api/media/files', function (Request $request, Response $respon if (isset($method) && strpos($method, 'fetch') !== false && - is_callable([flextype('media.files'), $method])) { + is_callable([flextype('media')->files(), $method])) { $fetchFromCallbackMethod = $method; } else { $fetchFromCallbackMethod = 'fetch'; } // Get fetch result - $files = flextype('media.files')->{$fetchFromCallbackMethod}($id, $options); + $files = flextype('media')->files()->{$fetchFromCallbackMethod}($id, $options); $files = ($files instanceof Arrays) ? $files->toArray() : $files; // Write response data @@ -104,39 +104,39 @@ flextype()->get('/api/media/files', function (Request $request, Response $respon $response_code = count($response_data['data']) > 0 ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -160,7 +160,7 @@ flextype()->post('/api/media/files', function (Request $request, Response $respo if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['folder']) || ! isset($_FILES['file'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -177,8 +177,8 @@ flextype()->post('/api/media/files', 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(filesystem()->file($access_token_file_path)->get())) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -187,7 +187,7 @@ flextype()->post('/api/media/files', function (Request $request, Response $respo return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -197,55 +197,55 @@ flextype()->post('/api/media/files', function (Request $request, Response $respo return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Create file - $create_file = flextype('media.files')->upload($file, $folder); + $create_file = flextype('media')->files()->upload($file, $folder); $response_data['data'] = []; if ($create_file) { - $response_data['data'] = flextype('media.files')->fetch($folder . '/' . basename($create_file)); + $response_data['data'] = flextype('media')->files()->fetch($folder . '/' . basename($create_file)); } // Set response code $response_code = filesystem()->file($create_file)->exists() ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); @@ -270,7 +270,7 @@ flextype()->put('/api/media/files', function (Request $request, Response $respon if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['new_id'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -287,8 +287,8 @@ flextype()->put('/api/media/files', function (Request $request, Response $respon // 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(filesystem()->file($access_token_file_path)->get())) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -297,7 +297,7 @@ flextype()->put('/api/media/files', function (Request $request, Response $respon return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -307,55 +307,55 @@ flextype()->put('/api/media/files', function (Request $request, Response $respon return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Rename file - $rename_file = flextype('media.files')->move($id, $new_id); + $rename_file = flextype('media')->files()->move($id, $new_id); $response_data['data'] = []; if ($rename_file) { - $response_data['data'] = flextype('media.files')->fetch($new_id); + $response_data['data'] = flextype('media')->files()->fetch($new_id); } // Set response code $response_code = $rename_file === true ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -379,7 +379,7 @@ flextype()->put('/api/media/files/copy', function (Request $request, Response $r if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['new_id'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -396,8 +396,8 @@ flextype()->put('/api/media/files/copy', function (Request $request, Response $r // 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(filesystem()->file($access_token_file_path)->get())) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -406,7 +406,7 @@ flextype()->put('/api/media/files/copy', function (Request $request, Response $r return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -416,55 +416,55 @@ flextype()->put('/api/media/files/copy', function (Request $request, Response $r return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Copy file - $copy_file = flextype('media.files')->copy($id, $new_id); + $copy_file = flextype('media')->files()->copy($id, $new_id); $response_data['data'] = []; if ($copy_file) { - $response_data['data'] = flextype('media.files')->fetch($new_id); + $response_data['data'] = flextype('media')->files()->fetch($new_id); } // Set response code $response_code = $copy_file === true ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -487,7 +487,7 @@ flextype()->delete('/api/media/files', function (Request $request, Response $res if (! isset($post_data['id']) || ! isset($post_data['access_token']) || ! isset($post_data['id'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -503,8 +503,8 @@ flextype()->delete('/api/media/files', function (Request $request, Response $res // 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(filesystem()->file($access_token_file_path)->get())) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -513,7 +513,7 @@ flextype()->delete('/api/media/files', function (Request $request, Response $res return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -523,49 +523,49 @@ flextype()->delete('/api/media/files', function (Request $request, Response $res return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Delete file - $delete_file = flextype('media.files')->delete($id); + $delete_file = flextype('media')->files()->delete($id); // Set response code $response_code = $delete_file ? 204 : 404; // Update calls counter - filesystem()->file($files_token_file_path)->get(flextype('yaml')->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); + filesystem()->file($files_token_file_path)->get(flextype('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($delete_file)); + ->write(flextype('serializers')->json()->encode($delete_file)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -590,7 +590,7 @@ flextype()->patch('/api/media/files/meta', function (Request $request, Response if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['field']) || ! isset($post_data['value'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -608,8 +608,8 @@ flextype()->patch('/api/media/files/meta', function (Request $request, Response // 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(filesystem()->file($access_token_file_path)->get($access_token_file_path))) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get($access_token_file_path))) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -618,7 +618,7 @@ flextype()->patch('/api/media/files/meta', function (Request $request, Response return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -628,55 +628,55 @@ flextype()->patch('/api/media/files/meta', function (Request $request, Response return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Update file meta - $update_file_meta = flextype('media.files.meta')->update($id, $field, $value); + $update_file_meta = flextype('media')->files()->meta()->update($id, $field, $value); $response_data['data'] = []; if ($update_file_meta) { - $response_data['data'] = flextype('media.files')->fetch($id); + $response_data['data'] = flextype('media')->files()->fetch($id); } // Set response code $response_code = $update_file_meta ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -701,7 +701,7 @@ flextype()->post('/api/media/files/meta', function (Request $request, Response $ if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['field']) || ! isset($post_data['value'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -719,8 +719,8 @@ flextype()->post('/api/media/files/meta', function (Request $request, Response $ // 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(filesystem()->file($access_token_file_path)->get())) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -729,7 +729,7 @@ flextype()->post('/api/media/files/meta', function (Request $request, Response $ return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -739,55 +739,55 @@ flextype()->post('/api/media/files/meta', function (Request $request, Response $ return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Add file meta - $add_file_meta = flextype('media.files.meta')->add($id, $field, $value); + $add_file_meta = flextype('media')->files()->meta()->add($id, $field, $value); $response_data['data'] = []; if ($add_file_meta) { - $response_data['data'] = flextype('media.files')->fetch($id); + $response_data['data'] = flextype('media')->files()->fetch($id); } // Set response code $response_code = $add_file_meta ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); @@ -812,7 +812,7 @@ flextype()->delete('/api/media/files/meta', function (Request $request, Response if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['field'])) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Set variables @@ -829,8 +829,8 @@ flextype()->delete('/api/media/files/meta', function (Request $request, Response // 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(filesystem()->file($access_token_file_path)->get())) + ($files_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($files_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $files_token_file_data['state'] === 'disabled' || @@ -839,7 +839,7 @@ flextype()->delete('/api/media/files/meta', function (Request $request, Response return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } if ( @@ -849,55 +849,55 @@ flextype()->delete('/api/media/files/meta', function (Request $request, Response return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } // Delete file meta - $delete_file_meta = flextype('media.files.meta')->delete($id, $field); + $delete_file_meta = flextype('media')->files()->meta()->delete($id, $field); $response_data['data'] = []; if ($delete_file_meta) { - $response_data['data'] = flextype('media.files')->fetch($id); + $response_data['data'] = flextype('media')->files()->fetch($id); } // Set response code $response_code = $delete_file_meta ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($files_token_file_data, ['calls' => $files_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0502']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0502'])); + ->write(flextype('serializers')->json()->encode($api_errors['0502'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); @@ -921,7 +921,7 @@ flextype()->get('/api/media/folders', function (Request $request, Response $resp if (! isset($query['id']) || ! isset($query['token'])) { return $response->withStatus($api_errors['0600']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0600'])); + ->write(flextype('serializers')->json()->encode($api_errors['0600'])); } // Set variables @@ -936,14 +936,14 @@ flextype()->get('/api/media/folders', function (Request $request, Response $resp $folders_token_file_path = PATH['project'] . '/tokens/media/folders/' . $token . '/token.yaml'; // Set delivery token file - if ($folders_token_file_data = flextype('yaml')->decode(filesystem()->file($folders_token_file_path)->get())) { + if ($folders_token_file_data = flextype('serializers')->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']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Create folders array @@ -951,14 +951,14 @@ flextype()->get('/api/media/folders', function (Request $request, Response $resp if (isset($method) && strpos($method, 'fetch') !== false && - is_callable([flextype('media.folders'), $method])) { + is_callable([flextype('media')->folders(), $method])) { $fetchFromCallbackMethod = $method; } else { $fetchFromCallbackMethod = 'fetch'; } // Get fetch result - $folders = flextype('media.folders')->{$fetchFromCallbackMethod}($id, $options); + $folders = flextype('media')->folders()->{$fetchFromCallbackMethod}($id, $options); $folders = ($folders instanceof Arrays) ? $folders->toArray() : $folders; // Write response data @@ -969,39 +969,39 @@ flextype()->get('/api/media/folders', function (Request $request, Response $resp $response_code = count($response_data['data']) > 0 ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0602']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0602'])); + ->write(flextype('serializers')->json()->encode($api_errors['0602'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); @@ -1025,7 +1025,7 @@ flextype()->post('/api/media/folders', function (Request $request, Response $res if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id'])) { return $response->withStatus($api_errors['0601']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0601'])); + ->write(flextype('serializers')->json()->encode($api_errors['0601'])); } // Set variables @@ -1041,8 +1041,8 @@ flextype()->post('/api/media/folders', function (Request $request, Response $res // Set files and access token file if ( - ($folders_token_file_data = flextype('yaml')->decode(filesystem()->file($folders_token_file_path)->get())) && - ($access_token_file_data = flextype('yaml')->decode(filesystem()->file($access_token_file_path)->get())) + ($folders_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($folders_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $folders_token_file_data['state'] === 'disabled' || @@ -1050,7 +1050,7 @@ flextype()->post('/api/media/folders', function (Request $request, Response $res ) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } if ( @@ -1059,55 +1059,55 @@ flextype()->post('/api/media/folders', function (Request $request, Response $res ) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Create folder - $create_folder = flextype('media.folders')->create($id); + $create_folder = flextype('media')->folders()->create($id); $response_data = []; if ($create_folder) { - $response_data['data'] = flextype('media.folders')->fetch($id); + $response_data['data'] = flextype('media')->folders()->fetch($id); } // Set response code $response_code = $create_folder ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0602']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0602'])); + ->write(flextype('serializers')->json()->encode($api_errors['0602'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -1131,7 +1131,7 @@ flextype()->put('/api/media/folders/copy', function (Request $request, Response if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['new_id'])) { return $response->withStatus($api_errors['0601']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0601'])); + ->write(flextype('serializers')->json()->encode($api_errors['0601'])); } // Set variables @@ -1148,8 +1148,8 @@ flextype()->put('/api/media/folders/copy', function (Request $request, Response // Set files and access token file if ( - ($folders_token_file_data = flextype('yaml')->decode(filesystem()->file($folders_token_file_path)->get())) && - ($access_token_file_data = flextype('yaml')->decode(filesystem()->file($access_token_file_path)->get())) + ($folders_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($folders_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $folders_token_file_data['state'] === 'disabled' || @@ -1157,7 +1157,7 @@ flextype()->put('/api/media/folders/copy', function (Request $request, Response ) { return $response->withStatus($api_errors['0601']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0601'])); + ->write(flextype('serializers')->json()->encode($api_errors['0601'])); } if ( @@ -1166,16 +1166,16 @@ flextype()->put('/api/media/folders/copy', function (Request $request, Response ) { return $response->withStatus($api_errors['0601']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0601'])); + ->write(flextype('serializers')->json()->encode($api_errors['0601'])); } // Copy folder - $copy_folder = flextype('media.folders')->copy($id, $new_id); + $copy_folder = flextype('media')->folders()->copy($id, $new_id); $response_data = []; if ($copy_folder) { - $response_data['data'] = flextype('media.folders')->fetch($new_id); + $response_data['data'] = flextype('media')->folders()->fetch($new_id); } else { $response_data['data'] = $copy_folder; } @@ -1184,39 +1184,39 @@ flextype()->put('/api/media/folders/copy', function (Request $request, Response $response_code = $copy_folder ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0602']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0602'])); + ->write(flextype('serializers')->json()->encode($api_errors['0602'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -1240,7 +1240,7 @@ flextype()->put('/api/media/folders', function (Request $request, Response $resp if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id']) || ! isset($post_data['new_id'])) { return $response->withStatus($api_errors['0601']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0601'])); + ->write(flextype('serializers')->json()->encode($api_errors['0601'])); } // Set variables @@ -1257,8 +1257,8 @@ flextype()->put('/api/media/folders', function (Request $request, Response $resp // Set files and access token file if ( - ($folders_token_file_data = flextype('yaml')->decode(filesystem()->file($folders_token_file_path)->get())) && - ($access_token_file_data = flextype('yaml')->decode(filesystem()->file($access_token_file_path)->get())) + ($folders_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($folders_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $folders_token_file_data['state'] === 'disabled' || @@ -1266,7 +1266,7 @@ flextype()->put('/api/media/folders', function (Request $request, Response $resp ) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } if ( @@ -1275,55 +1275,55 @@ flextype()->put('/api/media/folders', function (Request $request, Response $resp ) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Rename folder - $move_folder = flextype('media.folders')->move($id, $new_id); + $move_folder = flextype('media')->folders()->move($id, $new_id); $response_data = []; if ($move_folder) { - $response_data['data'] = flextype('media.folders')->fetch($new_id); + $response_data['data'] = flextype('media')->folders()->fetch($new_id); } // Set response code $response_code = $move_folder ? 200 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0602']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0602'])); + ->write(flextype('serializers')->json()->encode($api_errors['0602'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($response_data)); + ->write(flextype('serializers')->json()->encode($response_data)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); /** @@ -1346,7 +1346,7 @@ flextype()->delete('/api/media/folders', function (Request $request, Response $r if (! isset($post_data['token']) || ! isset($post_data['access_token']) || ! isset($post_data['id'])) { return $response->withStatus($api_errors['0601']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0601'])); + ->write(flextype('serializers')->json()->encode($api_errors['0601'])); } // Set variables @@ -1362,8 +1362,8 @@ flextype()->delete('/api/media/folders', function (Request $request, Response $r // Set files and access token file if ( - ($folders_token_file_data = flextype('yaml')->decode(filesystem()->file($folders_token_file_path)->get())) && - ($access_token_file_data = flextype('yaml')->decode(filesystem()->file($access_token_file_path)->get())) + ($folders_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($folders_token_file_path)->get())) && + ($access_token_file_data = flextype('serializers')->yaml()->decode(filesystem()->file($access_token_file_path)->get())) ) { if ( $folders_token_file_data['state'] === 'disabled' || @@ -1371,7 +1371,7 @@ flextype()->delete('/api/media/folders', function (Request $request, Response $r ) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } if ( @@ -1380,47 +1380,47 @@ flextype()->delete('/api/media/folders', function (Request $request, Response $r ) { return $response->withStatus($api_errors['0501']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0501'])); + ->write(flextype('serializers')->json()->encode($api_errors['0501'])); } // Delete folder - $delete_folder = flextype('media.folders')->delete($id); + $delete_folder = flextype('media')->folders()->delete($id); // Set response code $response_code = $delete_folder ? 204 : 404; // Update calls counter - filesystem()->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('serializers')->yaml()->encode(array_replace_recursive($folders_token_file_data, ['calls' => $folders_token_file_data['calls'] + 1]))); if ($response_code === 404) { // Return response return $response ->withStatus($api_errors['0602']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0602'])); + ->write(flextype('serializers')->json()->encode($api_errors['0602'])); } // Return response return $response ->withStatus($response_code) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($delete_folder)); + ->write(flextype('serializers')->json()->encode($delete_folder)); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); } return $response ->withStatus($api_errors['0003']['http_status_code']) ->withHeader('Content-Type', 'application/json;charset=' . flextype('registry')->get('flextype.settings.charset')) - ->write(flextype('json')->encode($api_errors['0003'])); + ->write(flextype('serializers')->json()->encode($api_errors['0003'])); }); diff --git a/src/flextype/Foundation/Entries/Fields/MediaField.php b/src/flextype/Foundation/Entries/Fields/MediaField.php index ca6d599d..80d815af 100644 --- a/src/flextype/Foundation/Entries/Fields/MediaField.php +++ b/src/flextype/Foundation/Entries/Fields/MediaField.php @@ -31,7 +31,7 @@ if (flextype('registry')->get('flextype.settings.entries.fields.media.files.fetc if (isset($body['method']) && strpos($body['method'], 'fetch') !== false && - is_callable([flextype('media.files'), $body['method']])) { + is_callable([flextype('media')->files(), $body['method']])) { $fetchFromCallbackMethod = $body['method']; } else { $fetchFromCallbackMethod = 'fetch'; @@ -40,7 +40,7 @@ if (flextype('registry')->get('flextype.settings.entries.fields.media.files.fetc $result = isset($body['result']) && in_array($body['result'], ['toArray', 'toObject']) ? $body['result'] : $resultTo; - $data[$field] = flextype('media.files')->{$fetchFromCallbackMethod}($body['id'], + $data[$field] = flextype('media')->files()->{$fetchFromCallbackMethod}($body['id'], isset($body['options']) ? $body['options'] : []); @@ -80,7 +80,7 @@ if (flextype('registry')->get('flextype.settings.entries.fields.media.folders.fe if (isset($body['method']) && strpos($body['method'], 'fetch') !== false && - is_callable([flextype('media.folders'), $body['method']])) { + is_callable([flextype('media')->folders(), $body['method']])) { $fetchFromCallbackMethod = $body['method']; } else { $fetchFromCallbackMethod = 'fetch'; @@ -89,7 +89,7 @@ if (flextype('registry')->get('flextype.settings.entries.fields.media.folders.fe $result = isset($body['result']) && in_array($body['result'], ['toArray', 'toObject']) ? $body['result'] : $resultTo; - $data[$field] = flextype('media.folders')->{$fetchFromCallbackMethod}($body['id'], + $data[$field] = flextype('media')->folders()->{$fetchFromCallbackMethod}($body['id'], isset($body['options']) ? $body['options'] : []); diff --git a/src/flextype/Foundation/Media/Media.php b/src/flextype/Foundation/Media/Media.php new file mode 100644 index 00000000..5d4eec4f --- /dev/null +++ b/src/flextype/Foundation/Media/Media.php @@ -0,0 +1,36 @@ +file($uploadMetadataFolder . basename($filename) . '.yaml') - ->put(flextype('yaml')->encode($metadata)); + ->put(flextype('serializers')->yaml()->encode($metadata)); // Return new file path return $filename; @@ -224,12 +233,12 @@ class MediaFiles strings($options['collection'])->isTrue()) { $result = []; - foreach (filesystem()->find()->files()->in(flextype('media.folders.meta')->getDirectoryMetaLocation($id)) as $file) { + foreach (filesystem()->find()->files()->in(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id)) as $file) { $basename = $file->getBasename('.' . $file->getExtension()); - $result[$basename] = flextype('yaml')->decode(filesystem()->file($file->getPathname())->get()); - $result[$basename]['filename'] = pathinfo(str_replace('/.meta', '', flextype('media.files.meta')->getFileMetaLocation($basename)))['filename']; - $result[$basename]['basename'] = explode('.', basename(flextype('media.files.meta')->getFileMetaLocation($basename)))[0]; + $result[$basename] = flextype('serializers')->yaml()->decode(filesystem()->file($file->getPathname())->get()); + $result[$basename]['filename'] = pathinfo(str_replace('/.meta', '', flextype('media')->files()->meta()->getFileMetaLocation($basename)))['filename']; + $result[$basename]['basename'] = explode('.', basename(flextype('media')->files()->meta()->getFileMetaLocation($basename)))[0]; $result[$basename]['extension'] = ltrim(strstr($basename, '.'), '.'); $result[$basename]['dirname'] = pathinfo(str_replace('/.meta', '', $file->getPathname()))['dirname']; $result[$basename]['url'] = 'project/media/' . $id . '/' . $basename; @@ -249,13 +258,13 @@ class MediaFiles } else { $result = []; - if (filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($id))->exists()) { - $result = flextype('yaml')->decode(filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($id))->get()); + if (filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->exists()) { + $result = flextype('serializers')->yaml()->decode(filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->get()); - $result['filename'] = pathinfo(str_replace('/.meta', '', flextype('media.files.meta')->getFileMetaLocation($id)))['filename']; - $result['basename'] = explode('.', basename(flextype('media.files.meta')->getFileMetaLocation($id)))[0]; + $result['filename'] = pathinfo(str_replace('/.meta', '', flextype('media')->files()->meta()->getFileMetaLocation($id)))['filename']; + $result['basename'] = explode('.', basename(flextype('media')->files()->meta()->getFileMetaLocation($id)))[0]; $result['extension'] = ltrim(strstr($id, '.'), '.'); - $result['dirname'] = pathinfo(str_replace('/.meta', '', flextype('media.files.meta')->getFileMetaLocation($id)))['dirname']; + $result['dirname'] = pathinfo(str_replace('/.meta', '', flextype('media')->files()->meta()->getFileMetaLocation($id)))['dirname']; $result['url'] = 'project/media/' . $id; @@ -286,9 +295,9 @@ class MediaFiles */ public function move(string $id, string $newID): bool { - if (! filesystem()->file($this->getFileLocation($newID))->exists() && ! filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($newID))->exists()) { + if (! filesystem()->file($this->getFileLocation($newID))->exists() && ! filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($newID))->exists()) { return filesystem()->file($this->getFileLocation($id))->move($this->getFileLocation($newID)) && - filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($id))->move(flextype('media.files.meta')->getFileMetaLocation($newID)); + filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->move(flextype('media')->files()->meta()->getFileMetaLocation($newID)); } return false; @@ -306,7 +315,7 @@ class MediaFiles public function delete(string $id): bool { return filesystem()->file($this->getFileLocation($id))->delete() && - filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($id))->delete(); + filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->delete(); } /** @@ -321,7 +330,7 @@ class MediaFiles public function has(string $id): bool { return filesystem()->file($this->getFileLocation($id))->exists() && - filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($id))->exists(); + filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->exists(); } /** @@ -336,12 +345,12 @@ class MediaFiles */ public function copy(string $id, string $newID): bool { - if (! filesystem()->file($this->getFileLocation($newID))->exists() && ! filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($newID))->exists()) { + if (! filesystem()->file($this->getFileLocation($newID))->exists() && ! filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($newID))->exists()) { filesystem()->file($this->getFileLocation($id))->copy($this->getFileLocation($newID)); - filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($id))->copy(flextype('media.files.meta')->getFileMetaLocation($newID)); + filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($id))->copy(flextype('media')->files()->meta()->getFileMetaLocation($newID)); return filesystem()->file($this->getFileLocation($newID))->exists() && - filesystem()->file(flextype('media.files.meta')->getFileMetaLocation($newID))->exists(); + filesystem()->file(flextype('media')->files()->meta()->getFileMetaLocation($newID))->exists(); } return false; diff --git a/src/flextype/Foundation/Media/MediaFilesMeta.php b/src/flextype/Foundation/Media/MediaFilesMeta.php index f9027642..446402ba 100644 --- a/src/flextype/Foundation/Media/MediaFilesMeta.php +++ b/src/flextype/Foundation/Media/MediaFilesMeta.php @@ -32,12 +32,12 @@ class MediaFilesMeta */ public function update(string $id, string $field, string $value): bool { - $fileData = flextype('yaml')->decode(filesystem()->file($this->getFileMetaLocation($id))->get()); + $fileData = flextype('serializers')->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get()); if (arrays($fileData)->has($field)) { $fileData = arrays($fileData)->set($field, $value); - return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('yaml')->encode($fileData->toArray())); + return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('serializers')->yaml()->encode($fileData->toArray())); } return false; @@ -56,12 +56,12 @@ class MediaFilesMeta */ public function add(string $id, string $field, string $value): bool { - $fileData = flextype('yaml')->decode(filesystem()->file($this->getFileMetaLocation($id))->get()); + $fileData = flextype('serializers')->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get()); if (! arrays($fileData)->has($field)) { $fileData = arrays($fileData)->set($field, $value); - return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('yaml')->encode($fileData->toArray())); + return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('serializers')->yaml()->encode($fileData->toArray())); } return false; @@ -79,12 +79,12 @@ class MediaFilesMeta */ public function delete(string $id, string $field): bool { - $fileData = flextype('yaml')->decode(filesystem()->file($this->getFileMetaLocation($id))->get()); + $fileData = flextype('serializers')->yaml()->decode(filesystem()->file($this->getFileMetaLocation($id))->get()); if (arrays($fileData)->has($field)) { $fileData = arrays($fileData)->delete($field); - return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('yaml')->encode($fileData->toArray())); + return (bool) filesystem()->file($this->getFileMetaLocation($id))->put(flextype('serializers')->yaml()->encode($fileData->toArray())); } return false; diff --git a/src/flextype/Foundation/Media/MediaFolders.php b/src/flextype/Foundation/Media/MediaFolders.php index ff78e3b9..ac3c90a4 100644 --- a/src/flextype/Foundation/Media/MediaFolders.php +++ b/src/flextype/Foundation/Media/MediaFolders.php @@ -13,6 +13,7 @@ use Atomastic\Arrays\Arrays; use Atomastic\Macroable\Macroable; use Slim\Http\Environment; use Slim\Http\Uri; +use Flextype\Foundation\Media\MediaFoldersMeta; use function arrays; use function filesystem; @@ -24,6 +25,14 @@ class MediaFolders { use Macroable; + /** + * Create a Media Folders Meta instance. + */ + public function meta(): MediaFoldersMeta + { + return new MediaFoldersMeta(); + } + /** * Fetch. * @@ -43,9 +52,9 @@ class MediaFolders $single = function ($id, $options) { $result = []; - if (filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($id))->exists()) { + if (filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id))->exists()) { $result['path'] = $id; - $result['full_path'] = str_replace('/.meta', '', flextype('media.folders.meta')->getDirectoryMetaLocation($id)); + $result['full_path'] = str_replace('/.meta', '', flextype('media')->folders()->meta()->getDirectoryMetaLocation($id)); $result['url'] = 'project/media/' . $id; if (flextype('registry')->has('flextype.settings.url') && flextype('registry')->get('flextype.settings.url') !== '') { @@ -66,7 +75,7 @@ class MediaFolders strings($options['collection'])->isTrue()) { $result = []; - foreach (filesystem()->find()->directories()->in(flextype('media.folders.meta')->getDirectoryMetaLocation($id)) as $folder) { + foreach (filesystem()->find()->directories()->in(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id)) as $folder) { $result[$folder->getFilename()] = $single($id . '/' . $folder->getFilename(), [])->toArray(); } @@ -91,10 +100,10 @@ class MediaFolders { if ( ! filesystem()->directory($this->getDirectoryLocation($id))->exists() && - ! filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($id))->exists() + ! filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id))->exists() ) { return filesystem()->directory($this->getDirectoryLocation($id))->create(0755, true) && - filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($id))->create(0755, true); + filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id))->create(0755, true); } return false; @@ -114,10 +123,10 @@ class MediaFolders { if ( (filesystem()->directory($this->getDirectoryLocation($newID))->exists() === false && - filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($newID))->exists() === false) + filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($newID))->exists() === false) ) { return filesystem()->directory($this->getDirectoryLocation($id))->move($this->getDirectoryLocation($newID)) && - filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($id))->move(flextype('media.folders.meta')->getDirectoryMetaLocation($newID)); + filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id))->move(flextype('media')->folders()->meta()->getDirectoryMetaLocation($newID)); } return false; @@ -137,17 +146,17 @@ class MediaFolders { if ( (filesystem()->directory($this->getDirectoryLocation($newID))->exists() === false && - filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($newID))->exists() === false) + filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($newID))->exists() === false) ) { filesystem() ->directory($this->getDirectoryLocation($id)) ->copy($this->getDirectoryLocation($newID)); filesystem() - ->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($id)) - ->copy(flextype('media.folders.meta')->getDirectoryMetaLocation($newID)); + ->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id)) + ->copy(flextype('media')->folders()->meta()->getDirectoryMetaLocation($newID)); return filesystem()->directory($this->getDirectoryLocation($newID))->exists() && - filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($newID))->exists(); + filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($newID))->exists(); } return false; @@ -165,7 +174,7 @@ class MediaFolders public function delete(string $id): bool { return filesystem()->directory($this->getDirectoryLocation($id))->delete() && - filesystem()->directory(flextype('media.folders.meta')->getDirectoryMetaLocation($id))->delete(); + filesystem()->directory(flextype('media')->folders()->meta()->getDirectoryMetaLocation($id))->delete(); } /** diff --git a/tests/Foundation/Entries/Fields/MediaFieldTest.php b/tests/Foundation/Entries/Fields/MediaFieldTest.php index 4f1a6d44..6f44b8fc 100644 --- a/tests/Foundation/Entries/Fields/MediaFieldTest.php +++ b/tests/Foundation/Entries/Fields/MediaFieldTest.php @@ -19,17 +19,17 @@ afterEach(function (): void { test('test media.files field', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); filesystem()->file(PATH['project'] . '/media/bar.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/bar.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Bar', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/bar.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Bar', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - flextype('entries')->create('media', flextype('frontmatter')->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/media/entry.md')->get())); + flextype('entries')->create('media', flextype('serializers')->frontmatter()->decode(filesystem()->file(ROOT_DIR . '/tests/Foundation/Entries/Fields/fixtures/entries/media/entry.md')->get())); - flextype('media.files')::macro('fetchExtraData', function ($id, $options) { + flextype('media')->files()::macro('fetchExtraData', function ($id, $options) { return ['id' => $id, 'options' => $options]; }); - flextype('media.folders')::macro('fetchExtraData', function ($id, $options) { + flextype('media')->folders()::macro('fetchExtraData', function ($id, $options) { return ['id' => $id, 'options' => $options]; }); diff --git a/tests/Foundation/Media/MediaFilesMetaTest.php b/tests/Foundation/Media/MediaFilesMetaTest.php index 7087ef41..76b6e252 100644 --- a/tests/Foundation/Media/MediaFilesMetaTest.php +++ b/tests/Foundation/Media/MediaFilesMetaTest.php @@ -14,31 +14,31 @@ afterEach(function (): void { test('test update() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files.meta')->update('foo.txt', 'description', 'Foo description')); - $this->assertEquals('Foo description', flextype('yaml')->decode(filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->get())['description']); + $this->assertTrue(flextype('media')->files()->meta()->update('foo.txt', 'description', 'Foo description')); + $this->assertEquals('Foo description', flextype('serializers')->yaml()->decode(filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->get())['description']); }); test('test add() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files.meta')->add('foo.txt', 'bar', 'Bar')); - $this->assertEquals('Bar', flextype('yaml')->decode(filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->get())['bar']); + $this->assertTrue(flextype('media')->files()->meta()->add('foo.txt', 'bar', 'Bar')); + $this->assertEquals('Bar', flextype('serializers')->yaml()->decode(filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->get())['bar']); }); test('test delete() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files.meta')->delete('foo.txt', 'title')); - $this->assertTrue(empty(flextype('yaml')->decode(filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->get())['bar'])); + $this->assertTrue(flextype('media')->files()->meta()->delete('foo.txt', 'title')); + $this->assertTrue(empty(flextype('serializers')->yaml()->decode(filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->get())['bar'])); }); test('test getFileMetaLocation() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); $this->assertStringContainsString('foo.txt.yaml', - flextype('media.files.meta')->getFileMetaLocation('foo.txt')); + flextype('media')->files()->meta()->getFileMetaLocation('foo.txt')); }); diff --git a/tests/Foundation/Media/MediaFilesTest.php b/tests/Foundation/Media/MediaFilesTest.php index 6dedf660..94b40791 100644 --- a/tests/Foundation/Media/MediaFilesTest.php +++ b/tests/Foundation/Media/MediaFilesTest.php @@ -14,55 +14,55 @@ afterEach(function (): void { test('test fetch() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); filesystem()->file(PATH['project'] . '/media/bar.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/bar.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Bar', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/bar.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Bar', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(count(flextype('media.files')->fetch('foo.txt')) > 0); - $this->assertEquals('Foo', flextype('media.files')->fetch('foo.txt')['title']); + $this->assertTrue(count(flextype('media')->files()->fetch('foo.txt')) > 0); + $this->assertEquals('Foo', flextype('media')->files()->fetch('foo.txt')['title']); - $this->assertTrue(count(flextype('media.files')->fetch('/', ['collection' => true])) == 2); - $this->assertEquals('Foo', flextype('media.files')->fetch('/', ['collection' => true])['foo.txt']['title']); + $this->assertTrue(count(flextype('media')->files()->fetch('/', ['collection' => true])) == 2); + $this->assertEquals('Foo', flextype('media')->files()->fetch('/', ['collection' => true])['foo.txt']['title']); }); test('test move() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files')->move('foo.txt', 'bar.txt')); - $this->assertTrue(flextype('media.files')->move('bar.txt', 'foo.txt')); - $this->assertFalse(flextype('media.files')->move('bar.txt', 'foo.txt')); + $this->assertTrue(flextype('media')->files()->move('foo.txt', 'bar.txt')); + $this->assertTrue(flextype('media')->files()->move('bar.txt', 'foo.txt')); + $this->assertFalse(flextype('media')->files()->move('bar.txt', 'foo.txt')); }); test('test copy() method', function () { - $this->assertTrue(flextype('media.folders')->create('foo')); - $this->assertTrue(flextype('media.folders')->create('bar')); + $this->assertTrue(flextype('media')->folders()->create('foo')); + $this->assertTrue(flextype('media')->folders()->create('bar')); filesystem()->file(PATH['project'] . '/media/foo/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files')->copy('foo/foo.txt', 'bar/foo.txt')); - $this->assertTrue(flextype('media.files')->copy('foo/foo.txt', 'bar/bar.txt')); - $this->assertFalse(flextype('media.files')->copy('foo/foo.txt', 'bar/foo.txt')); + $this->assertTrue(flextype('media')->files()->copy('foo/foo.txt', 'bar/foo.txt')); + $this->assertTrue(flextype('media')->files()->copy('foo/foo.txt', 'bar/bar.txt')); + $this->assertFalse(flextype('media')->files()->copy('foo/foo.txt', 'bar/foo.txt')); }); test('test has() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files')->has('foo.txt')); - $this->assertFalse(flextype('media.files')->has('bar.txt')); + $this->assertTrue(flextype('media')->files()->has('foo.txt')); + $this->assertFalse(flextype('media')->files()->has('bar.txt')); }); test('test getFileLocation() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertStringContainsString('foo.txt', flextype('media.files')->getFileLocation('foo.txt')); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + $this->assertStringContainsString('foo.txt', flextype('media')->files()->getFileLocation('foo.txt')); }); test('test delete() method', function () { filesystem()->file(PATH['project'] . '/media/foo.txt')->put('foo'); - filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('yaml')->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); - $this->assertTrue(flextype('media.files')->delete('foo.txt')); - $this->assertFalse(flextype('media.files')->delete('foo.txt')); + filesystem()->file(PATH['project'] . '/media/.meta/foo.txt.yaml')->put(flextype('serializers')->yaml()->encode(['title' => 'Foo', 'description' => '', 'type' => 'text/plain', 'filesize' => 3, 'uploaded_on' => 1603090370, 'exif' => []])); + $this->assertTrue(flextype('media')->files()->delete('foo.txt')); + $this->assertFalse(flextype('media')->files()->delete('foo.txt')); }); diff --git a/tests/Foundation/Media/MediaFoldersMetaTest.php b/tests/Foundation/Media/MediaFoldersMetaTest.php index eac7663f..f1bfcb44 100644 --- a/tests/Foundation/Media/MediaFoldersMetaTest.php +++ b/tests/Foundation/Media/MediaFoldersMetaTest.php @@ -14,5 +14,5 @@ afterEach(function (): void { test('test getDirectoryMetaLocation() method', function () { $this->assertStringContainsString('/.meta/foo', - flextype('media.folders.meta')->getDirectoryMetaLocation('foo')); + flextype('media')->folders()->meta()->getDirectoryMetaLocation('foo')); }); diff --git a/tests/Foundation/Media/MediaFoldersTest.php b/tests/Foundation/Media/MediaFoldersTest.php index 8e9486a6..162f1d85 100644 --- a/tests/Foundation/Media/MediaFoldersTest.php +++ b/tests/Foundation/Media/MediaFoldersTest.php @@ -14,34 +14,34 @@ afterEach(function (): void { test('test fetch() method', function () { - $this->assertTrue(flextype('media.folders')->create('foo')); - $this->assertTrue(flextype('media.folders')->create('foo/bar')); - $this->assertTrue(flextype('media.folders')->create('foo/zed')); - $this->assertTrue(count(flextype('media.folders')->fetch('foo', ['collection' => true])) == 2); - $this->assertTrue(count(flextype('media.folders')->fetch('foo')) > 0); + $this->assertTrue(flextype('media')->folders()->create('foo')); + $this->assertTrue(flextype('media')->folders()->create('foo/bar')); + $this->assertTrue(flextype('media')->folders()->create('foo/zed')); + $this->assertTrue(count(flextype('media')->folders()->fetch('foo', ['collection' => true])) == 2); + $this->assertTrue(count(flextype('media')->folders()->fetch('foo')) > 0); }); test('test create() method', function () { - $this->assertTrue(flextype('media.folders')->create('foo')); + $this->assertTrue(flextype('media')->folders()->create('foo')); }); test('test move() method', function () { - $this->assertTrue(flextype('media.folders')->create('foo')); - $this->assertTrue(flextype('media.folders')->move('foo', 'bar')); + $this->assertTrue(flextype('media')->folders()->create('foo')); + $this->assertTrue(flextype('media')->folders()->move('foo', 'bar')); }); test('test copy() method', function () { - $this->assertTrue(flextype('media.folders')->create('foo')); - $this->assertTrue(flextype('media.folders')->copy('foo', 'bar')); + $this->assertTrue(flextype('media')->folders()->create('foo')); + $this->assertTrue(flextype('media')->folders()->copy('foo', 'bar')); }); test('test delete() method', function () { - $this->assertTrue(flextype('media.folders')->create('foo')); - $this->assertTrue(flextype('media.folders')->delete('foo')); - $this->assertFalse(flextype('media.folders')->delete('bar')); + $this->assertTrue(flextype('media')->folders()->create('foo')); + $this->assertTrue(flextype('media')->folders()->delete('foo')); + $this->assertFalse(flextype('media')->folders()->delete('bar')); }); test('test getDirectoryLocation() method', function () { $this->assertStringContainsString('/foo', - flextype('media.folders')->getDirectoryLocation('foo')); + flextype('media')->folders()->getDirectoryLocation('foo')); });