mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-08 22:26:46 +02:00
Code Issues Releases Wiki Activity

fix(core): fix bug - Cannot use object of type Flextype\App\Foundation\Flextype as array #461

Browse Source
This commit is contained in:
Awilum
2020-08-21 17:30:47 +03:00
parent 7f1a685365
commit 2e214780d9
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/flextype/app/Endpoints/entries.php
View File

@@ -70,9 +70,9 @@ $flextype->get('/api/entries', function (Request $request, Response $response) u
}
if ($filter === null) {
$response_data['data'] = $flextype['entries']->fetchSingle($id);
$response_data['data'] = $flextype->container('entries')->fetchSingle($id);
} else {
$response_data['data'] = $flextype['entries']->fetchCollection($id, $filter);
$response_data['data'] = $flextype->container('entries')->fetchCollection($id, $filter);
}
// Set response code
@@ -174,10 +174,10 @@ $flextype->post('/api/entries', function (Request $request, Response $response)
}
// Create entry
$create_entry = $flextype['entries']->create($id, $data);
$create_entry = $flextype->container('entries')->create($id, $data);
if ($create_entry) {
$response_data['data'] = $flextype['entries']->fetch($id);
$response_data['data'] = $flextype->container('entries')->fetch($id);
} else {
$response_data['data'] = [];
}
@@ -278,10 +278,10 @@ $flextype->patch('/api/entries', function (Request $request, Response $response)
}
// Update entry
$update_entry = $flextype['entries']->update($id, $data);
$update_entry = $flextype->container('entries')->update($id, $data);
if ($update_entry) {
$response_data['data'] = $flextype['entries']->fetch($id);
$response_data['data'] = $flextype->container('entries')->fetch($id);
} else {
$response_data['data'] = [];
}
@@ -382,11 +382,11 @@ $flextype->put('/api/entries', function (Request $request, Response $response) u
}
// Rename entry
$rename_entry = $flextype['entries']->rename($id, $new_id);
$rename_entry = $flextype->container('entries')->rename($id, $new_id);
// Get entry data
if ($rename_entry) {
$response_data['data'] = $flextype['entries']->fetch($new_id);
$response_data['data'] = $flextype->container('entries')->fetch($new_id);
} else {
$response_data['data'] = [];
}
@@ -487,11 +487,11 @@ $flextype->put('/api/entries/copy', function (Request $request, Response $respon
}
// Copy entry
$copy_entry = $flextype['entries']->copy($id, $new_id, true);
$copy_entry = $flextype->container('entries')->copy($id, $new_id, true);
// Get entry data
if ($copy_entry === null) {
$response_data['data'] = $flextype['entries']->fetch($new_id);
$response_data['data'] = $flextype->container('entries')->fetch($new_id);
} else {
$response_data['data'] = [];
}
@@ -590,7 +590,7 @@ $flextype->delete('/api/entries', function (Request $request, Response $response
}
// Delete entry
$delete_entry = $flextype['entries']->delete($id);
$delete_entry = $flextype->container('entries')->delete($id);
// Set response code
$response_code = $delete_entry ? 204 : 404;

30
src/flextype/app/Endpoints/files.php
View File

@@ -71,9 +71,9 @@ $flextype->get('/api/files', function (Request $request, Response $response) use
// Get list if file or files for specific folder
if (is_dir(PATH['project'] . '/uploads/' . $path)) {
$files = $flextype['media_files']->fetchCollection($path);
$files = $flextype->container('media_files')->fetchCollection($path);
} else {
$files = $flextype['media_files']->fetchSingle($path);
$files = $flextype->container('media_files')->fetchSingle($path);
}
// Write response data
@@ -175,12 +175,12 @@ $flextype->post('/api/files', function (Request $request, Response $response) us
}
// Create file
$create_file = $flextype['media_files']->upload($file, $folder);
$create_file = $flextype->container('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->container('media_files')->fetch($folder . '/' . basename($create_file));
}
// Set response code
@@ -279,12 +279,12 @@ $flextype->put('/api/files', function (Request $request, Response $response) use
}
// Rename file
$rename_file = $flextype['media_files']->rename($path, $new_path);
$rename_file = $flextype->container('media_files')->rename($path, $new_path);
$response_data['data'] = [];
if ($rename_file) {
$response_data['data'] = $flextype['media_files']->fetch($new_path);
$response_data['data'] = $flextype->container('media_files')->fetch($new_path);
}
// Set response code
@@ -382,12 +382,12 @@ $flextype->put('/api/files/copy', function (Request $request, Response $response
}
// Copy file
$copy_file = $flextype['media_files']->copy($path, $new_path);
$copy_file = $flextype->container('media_files')->copy($path, $new_path);
$response_data['data'] = [];
if ($copy_file) {
$response_data['data'] = $flextype['media_files']->fetch($new_path);
$response_data['data'] = $flextype->container('media_files')->fetch($new_path);
}
// Set response code
@@ -483,7 +483,7 @@ $flextype->delete('/api/files', function (Request $request, Response $response)
}
// Delete file
$delete_file = $flextype['media_files']->delete($path);
$delete_file = $flextype->container('media_files')->delete($path);
// Set response code
$response_code = $delete_file ? 204 : 404;
@@ -582,12 +582,12 @@ $flextype->patch('/api/files/meta', function (Request $request, Response $respon
}
// Update file meta
$update_file_meta = $flextype['media_files_meta']->update($path, $field, $value);
$update_file_meta = $flextype->container('media_files_meta')->update($path, $field, $value);
$response_data['data'] = [];
if ($update_file_meta) {
$response_data['data'] = $flextype['media_files']->fetch($path);
$response_data['data'] = $flextype->container('media_files')->fetch($path);
}
// Set response code
@@ -687,12 +687,12 @@ $flextype->post('/api/files/meta', function (Request $request, Response $respons
}
// Add file meta
$add_file_meta = $flextype['media_files_meta']->add($path, $field, $value);
$add_file_meta = $flextype->container('media_files_meta')->add($path, $field, $value);
$response_data['data'] = [];
if ($add_file_meta) {
$response_data['data'] = $flextype['media_files']->fetch($path);
$response_data['data'] = $flextype->container('media_files')->fetch($path);
}
// Set response code
@@ -791,12 +791,12 @@ $flextype->delete('/api/files/meta', function (Request $request, Response $respo
}
// Delete file meta
$delete_file_meta = $flextype['media_files_meta']->delete($path, $field);
$delete_file_meta = $flextype->container('media_files_meta')->delete($path, $field);
$response_data['data'] = [];
if ($delete_file_meta) {
$response_data['data'] = $flextype['media_files']->fetch($path);
$response_data['data'] = $flextype->container('media_files')->fetch($path);
}
// Set response code

18
src/flextype/app/Endpoints/folders.php
View File

@@ -79,9 +79,9 @@ $flextype->get('/api/folders', function (Request $request, Response $response) u
// Get list if folder or fodlers for specific folder
if ($collection) {
$folders = $flextype['media_folders']->fetchCollection($path);
$folders = $flextype->container('media_folders')->fetchCollection($path);
} else {
$folders = $flextype['media_folders']->fetchSingle($path);
$folders = $flextype->container('media_folders')->fetchSingle($path);
}
// Write response data
@@ -180,12 +180,12 @@ $flextype->post('/api/folders', function (Request $request, Response $response)
}
// Create folder
$create_folder = $flextype['media_folders']->create($path);
$create_folder = $flextype->container('media_folders')->create($path);
$response_data = [];
if ($create_folder) {
$response_data['data'] = $flextype['media_folders']->fetch($path);
$response_data['data'] = $flextype->container('media_folders')->fetch($path);
}
// Set response code
@@ -281,12 +281,12 @@ $flextype->put('/api/folders/copy', function (Request $request, Response $respon
}
// Copy folder
$copy_folder = $flextype['media_folders']->copy($path, $new_path);
$copy_folder = $flextype->container('media_folders')->copy($path, $new_path);
$response_data = [];
if ($copy_folder) {
$response_data['data'] = $flextype['media_folders']->fetch($new_path);
$response_data['data'] = $flextype->container('media_folders')->fetch($new_path);
} else {
$response_data['data'] = $copy_folder;
}
@@ -384,12 +384,12 @@ $flextype->put('/api/folders', function (Request $request, Response $response) u
}
// Rename folder
$rename_folder = $flextype['media_folders']->rename($path, $new_path);
$rename_folder = $flextype->container('media_folders')->rename($path, $new_path);
$response_data = [];
if ($rename_folder) {
$response_data['data'] = $flextype['media_folders']->fetch($new_path);
$response_data['data'] = $flextype->container('media_folders')->fetch($new_path);
}
// Set response code
@@ -483,7 +483,7 @@ $flextype->delete('/api/folders', function (Request $request, Response $response
}
// Delete folder
$delete_folder = $flextype['media_folders']->delete($path);
$delete_folder = $flextype->container('media_folders')->delete($path);
// Set response code
$response_code = $delete_folder ? 204 : 404;

2
src/flextype/app/Endpoints/images.php
View File

@@ -67,7 +67,7 @@ $flextype->get('/api/images/{path:.+}', function (Request $request, Response $re
Filesystem::write($delivery_images_token_file_path, $flextype->container('yaml')->encode(array_replace_recursive($delivery_images_token_file_data, ['calls' => $delivery_images_token_file_data['calls'] + 1])));
if (Filesystem::has(PATH['project'] . '/uploads/entries/' . $args['path'])) {
return $flextype['images']->getImageResponse($args['path'], $_GET);
return $flextype->container('images')->getImageResponse($args['path'], $_GET);
}
return $response

2
src/flextype/app/Support/Parsers/Shortcodes/EntriesShortcode.php
View File

@@ -13,6 +13,6 @@ use Thunder\Shortcode\Shortcode\ShortcodeInterface;
if ($flextype->container('registry')->get('flextype.settings.shortcode.shortcodes.entries.enabled')) {
// Shortcode: [entries_fetch id="entry-id" field="field-name" default="default-value"]
$flextype->container('shortcode')->addHandler('entries_fetch', static function (ShortcodeInterface $s) use ($flextype) {
return Arrays::get($flextype['entries']->fetch($s->getParameter('id')), $s->getParameter('field'), $s->getParameter('default'));
return Arrays::get($flextype->container('entries')->fetch($s->getParameter('id')), $s->getParameter('field'), $s->getParameter('default'));
});
}