Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2023 tweaks #11

Merged
merged 26 commits into from
Nov 27, 2023
Merged

2023 tweaks #11

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1bf6b3e
Set default Drupal version as 10.0.0 (for tests)
back-2-95 May 20, 2023
b1a4859
true/false case and use of null coalescing operator for default values
back-2-95 May 20, 2023
a029049
Update constraint for friendsofphp/php-cs-fixer
back-2-95 May 20, 2023
3498d3b
Run tests also with PHP 8.2
back-2-95 May 20, 2023
0cacc9b
Update README.md
back-2-95 May 20, 2023
9639e41
Use PHP 8.1 in local tests
back-2-95 May 20, 2023
071ced6
Remove old DrupalEnvDetector.php
back-2-95 May 20, 2023
1b65755
Fix typo
back-2-95 May 20, 2023
847ab17
Drop PHP 7.4 support
back-2-95 May 21, 2023
8f54d32
Combine defaults to one class and use match(), Add new Features class…
back-2-95 May 21, 2023
6f44b20
assertTrue
back-2-95 May 22, 2023
5167b5b
Add test setup for unknown system
back-2-95 May 22, 2023
61269ce
Refactor testing
back-2-95 May 22, 2023
f996043
Update README.md with latest changes
back-2-95 May 22, 2023
2771623
Rename env to system
back-2-95 May 22, 2023
2c94eb6
Small tweaks
back-2-95 Nov 24, 2023
5d44278
Add PHP 8.3 to tests and use GHA's new syntax
back-2-95 Nov 24, 2023
b2e5716
Use "verbose" as new default value for error level in dev
back-2-95 Nov 24, 2023
2082978
Update GHA action versions
back-2-95 Nov 24, 2023
52b900f
Update PHPUnit tests
back-2-95 Nov 24, 2023
e65b587
Fix some settings
back-2-95 Nov 24, 2023
0bb20a0
Remove support for Drupal 9
back-2-95 Nov 24, 2023
0ec5871
Fix typo in composer.json
back-2-95 Nov 24, 2023
003cbcf
Features class is not yet ready.
back-2-95 Nov 24, 2023
24074a3
Use friendsofphp/php-cs-fixer v3 only
back-2-95 Nov 24, 2023
80ca1a4
Don't allow phpunit 10
back-2-95 Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix some settings
  • Loading branch information
@back-2-95
back-2-95 committed Nov 24, 2023
commit e65b587786e2ac7f07ee82c667e8d1bff3715ce5
13 changes: 4 additions & 9 deletions src/Reader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class Reader
];

const DRUPAL_SETTING_DEFAULTS = [
'config_sync_directory' => 'conf/cmi',
'config_sync_directory' => '../conf/cmi',
'file_public_path' => 'sites/default/files',
'file_private_path' => FALSE,
'file_temp_path' => '/tmp',
Expand Down Expand Up @@ -266,15 +266,10 @@ private function setDatabaseConnection(): void
'host' => getenv('DRUPAL_DB_HOST') ?: 'db',
'port' => getenv('DRUPAL_DB_PORT') ?: 3306,
'prefix' => getenv('DRUPAL_DB_PREFIX') ?: '',
];

$drupal_10 = version_compare($this->getDrupalVersion(), '10.0.0', '>=');

if ($drupal_10) {
$this->databases['default']['default']['init_commands'] = [
'init_commands' => [
'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
];
}
],
];
}

private function setSetting(string $setting): void
Expand Down