Skip to content
This repository was archived by the owner on Apr 17, 2024. It is now read-only.

Commit 056b4ca

Browse files
authored
feat: update to 8.7 and use JSON:API in core (#365)
* feat: make it compatible with 8.7 * fix: use the new filesystem services
1 parent a8f5643 commit 056b4ca

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,15 @@
4545
"require": {
4646
"cweagans/composer-patches": "^1.6.0",
4747
"drupal/admin_toolbar": "^1.23",
48-
"drupal/consumer_image_styles": "^3.0@beta",
48+
"drupal/consumer_image_styles": "^3.0@rc",
4949
"drupal/consumers": "^1.8",
5050
"drupal/contentajs": "^1.0@beta",
51-
"drupal/core": "^8.6.0",
51+
"drupal/core": "^8.7@rc",
5252
"drupal/decoupled_router": "^1.1",
5353
"drupal/dropzonejs": "^2.0@alpha",
5454
"drupal/entity_browser": "^2.0@alpha",
5555
"drupal/image_widget_crop": "^2.1",
5656
"drupal/inline_entity_form": "^1.0@beta",
57-
"drupal/jsonapi": "^2.4",
5857
"drupal/jsonapi_extras": "^3.6",
5958
"drupal/jsonrpc": "^1.0@beta",
6059
"drupal/material_admin": "^1.0@alpha",

contenta_jsonapi.profile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,22 @@ function _contenta_jsonapi_generate_keys() {
5252
$dir_name = 'keys';
5353
/** @var \Drupal\simple_oauth\Service\KeyGeneratorService $key_gen */
5454
$key_gen = \Drupal::service('simple_oauth.key.generator');
55-
/** @var \Drupal\simple_oauth\Service\Filesystem\Filesystem $file_system */
56-
$file_system = \Drupal::service('simple_oauth.filesystem');
55+
/** @var \Drupal\simple_oauth\Service\Filesystem\FileSystemChecker $file_system_checker */
56+
$file_system_checker = \Drupal::service('simple_oauth.filesystem_checker');
57+
/** @var \Drupal\Core\File\FileSystem $file_system */
58+
$file_system = \Drupal::service('file_system');
5759
/** @var \Drupal\Core\Logger\LoggerChannelInterface $logger */
5860
$logger = \Drupal::service('logger.channel.contentacms');
5961

6062
$relative_path = DRUPAL_ROOT . '/../' . $dir_name;
61-
if (!$file_system->isDirectory($relative_path)) {
63+
if (!$file_system_checker->isDirectory($relative_path)) {
6264
$file_system->mkdir($relative_path);
6365
}
6466
$keys_path = $file_system->realpath($relative_path);
6567
$pub_filename = sprintf('%s/public.key', $keys_path);
6668
$pri_filename = sprintf('%s/private.key', $keys_path);
6769

68-
if ($file_system->fileExist($pub_filename) && $file_system->fileExist($pri_filename)) {
70+
if ($file_system_checker->fileExist($pub_filename) && $file_system_checker->fileExist($pri_filename)) {
6971
// 1. If the file already exists, then just set the correct permissions.
7072
$file_system->chmod($pub_filename, 0600);
7173
$file_system->chmod($pri_filename, 0600);

0 commit comments

Comments
 (0)