Skip to content

Commit 0047d49

Browse files
rmpelMike van den Hoek
rmpel
authored and
Mike van den Hoek
committed
(fix): ensure config defaults to empty array when null
1 parent 02aeace commit 0047d49

11 files changed

+24
-24
lines changed

‎src/Base/Foundation/Plugin.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function boot(): bool
6060
$this->loadTextDomain();
6161
$this->config->boot();
6262

63-
$dependencyChecker = new DependencyChecker($this->config->get('core.dependencies'));
63+
$dependencyChecker = new DependencyChecker($this->config->get('core.dependencies', []));
6464

6565
if ($dependencyChecker->failed()) {
6666
$dependencyChecker->notify();
@@ -148,7 +148,7 @@ public function filterPlugin(): void
148148
public function callServiceProviders(string $method, string $key = ''): void
149149
{
150150
$offset = $key ? "core.providers.{$key}" : 'core.providers';
151-
$services = (array) $this->config->get($offset);
151+
$services = (array) $this->config->get($offset, []);
152152

153153
foreach ($services as $service) {
154154
if (is_array($service)) {

‎src/Base/Metabox/MetaboxServiceProvider.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ public function register()
2222

2323
public function registerMetaboxes(array $rwmbMetaboxes): array
2424
{
25-
$configMetaboxes = $this->plugin->config->get('metaboxes');
25+
$configMetaboxes = $this->plugin->config->get('metaboxes', []);
2626
$configMetaboxes = $this->addOptionsUPL($configMetaboxes);
2727

2828
if ($this->plugin->settings->useIdentifications()) {
29-
$configMetaboxes = array_merge($configMetaboxes, $this->plugin->config->get('identifications_metaboxes'));
29+
$configMetaboxes = array_merge($configMetaboxes, $this->plugin->config->get('identifications_metaboxes', []));
3030
}
3131

3232
if ($this->plugin->settings->useIdentifications() && ! $this->plugin->settings->useCombinedIdentification()) {
3333
$configMetaboxes = $this->removeCombinedIdentification($configMetaboxes);
3434
}
3535

3636
if ($this->plugin->settings->useEscapeElement()) {
37-
$configMetaboxes = array_merge($configMetaboxes, $this->plugin->config->get('escape_element_metabox'));
37+
$configMetaboxes = array_merge($configMetaboxes, $this->plugin->config->get('escape_element_metabox', []));
3838
}
3939

4040
if ($this->plugin->settings->useShowOn()) {
@@ -83,22 +83,22 @@ private function removeCombinedIdentification(array $configMetaboxes): array
8383

8484
protected function getShowOnMetabox(array $configMetaboxes): array
8585
{
86-
return array_merge($configMetaboxes, $this->plugin->config->get('show_on_metabox'));
86+
return array_merge($configMetaboxes, $this->plugin->config->get('show_on_metabox', []));
8787
}
8888

8989
protected function getTilesMetabox(array $configMetaboxes): array
9090
{
91-
return array_merge($configMetaboxes, $this->plugin->config->get('theme_tiles_metabox'));
91+
return array_merge($configMetaboxes, $this->plugin->config->get('theme_tiles_metabox', []));
9292
}
9393

9494
protected function getTableOfContentsMetabox(array $configMetaboxes): array
9595
{
96-
return array_merge($configMetaboxes, $this->plugin->config->get('table_of_contents_metabox'));
96+
return array_merge($configMetaboxes, $this->plugin->config->get('table_of_contents_metabox', []));
9797
}
9898

9999
protected function getFeedbackFormMetabox(array $configMetaboxes): array
100100
{
101-
$feedbackFormMetabox = $this->plugin->config->get('hide_feedback_form_metabox');
101+
$feedbackFormMetabox = $this->plugin->config->get('hide_feedback_form_metabox', []);
102102
$metaboxKeys = ['base', 'pdc-category', 'pdc-subcategory'];
103103

104104
return array_map(function ($key, $metabox) use ($metaboxKeys, $feedbackFormMetabox) {

‎src/Base/PostType/PostTypeServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function register()
3636
public function registerPostTypes()
3737
{
3838
if (function_exists('register_extended_post_type')) {
39-
$this->configPostTypes = $this->plugin->config->get('posttypes');
39+
$this->configPostTypes = $this->plugin->config->get('posttypes', []);
4040

4141
foreach ($this->configPostTypes as $postTypeName => $postType) {
4242
if ('pdc-group' === $postTypeName && ! $this->plugin->settings->useGroupLayer()) {

‎src/Base/PostsToPosts/PostsToPostsServiceProvider.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public function extendPostsToPostsConnections(): void
9292
],
9393
];
9494

95-
$this->plugin->config->set(['p2p_connections.connections' => array_merge($this->plugin->config->get('p2p_connections.connections'), $groupConnections)]);
95+
$this->plugin->config->set(['p2p_connections.connections' => array_merge($this->plugin->config->get('p2p_connections.connections', []), $groupConnections)]);
9696
}
9797

9898
/**
@@ -103,9 +103,9 @@ public function extendPostsToPostsConnections(): void
103103
public function registerPostsToPostsConnections(): void
104104
{
105105
if (function_exists('p2p_register_connection_type')) {
106-
$posttypesInfo = $this->plugin->config->get('p2p_connections.posttypes_info');
106+
$posttypesInfo = $this->plugin->config->get('p2p_connections.posttypes_info', []);
107107
$defaultConnectionArgs = apply_filters('owc/pdc-base/p2p-connection-defaults', $this->connectionDefaults);
108-
$connections = $this->plugin->config->get('p2p_connections.connections');
108+
$connections = $this->plugin->config->get('p2p_connections.connections', []);
109109

110110
foreach ($connections as $connectionArgs) {
111111
$args = array_merge($defaultConnectionArgs, $connectionArgs);

‎src/Base/RestAPI/ItemFields/ConnectedField.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ConnectedField extends CreatesFields
4040
*/
4141
public function create(WP_Post $post): array
4242
{
43-
$connections = array_filter($this->plugin->config->get('p2p_connections.connections'), function ($connection) {
43+
$connections = array_filter($this->plugin->config->get('p2p_connections.connections', []), function ($connection) {
4444
return in_array('pdc-item', $connection, true);
4545
});
4646

@@ -164,14 +164,14 @@ protected function extraQueryArgs(string $type): array
164164
{
165165
$query = [];
166166

167-
$connectionsExcludeInActive = $this->plugin->config->get('p2p_connections.connections_exclude_inactive');
167+
$connectionsExcludeInActive = $this->plugin->config->get('p2p_connections.connections_exclude_inactive', []);
168168

169169
if (in_array($type, $connectionsExcludeInActive)) {
170170
$query = array_merge_recursive($query, $this->excludeInactiveItemsQuery());
171171
}
172172

173173
if ($this->isPluginPDCInternalProductsActive()) {
174-
$connectionsExcludeInternal = $this->plugin->config->get('p2p_connections.connections_exclude_internal');
174+
$connectionsExcludeInternal = $this->plugin->config->get('p2p_connections.connections_exclude_internal', []);
175175

176176
if (in_array($type, $connectionsExcludeInternal)) {
177177
$query = array_merge_recursive($query, $this->excludeInternalItemsQuery());

‎src/Base/RestAPI/ItemFields/SeoPress.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected function condition(): callable
1818
*/
1919
public function create(WP_Post $post): array
2020
{
21-
$seoMetaFields = $this->plugin->config->get('seopress_api.meta');
21+
$seoMetaFields = $this->plugin->config->get('seopress_api.meta', []);
2222

2323
if (! is_array($seoMetaFields) || empty($seoMetaFields)) {
2424
return [];

‎src/Base/RestAPI/ItemFields/TaxonomyField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function create(WP_Post $post): array
2525
{
2626
$result = [];
2727

28-
foreach (array_keys($this->plugin->config->get('taxonomies')) as $taxonomy) {
28+
foreach (array_keys($this->plugin->config->get('taxonomies', [])) as $taxonomy) {
2929
$result[$taxonomy] = $this->getTerms($post->ID, $taxonomy);
3030
}
3131

‎src/Base/RestAPI/ItemFields/Yoast.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function condition(): callable
1919
*/
2020
public function create(WP_Post $post): array
2121
{
22-
$seoMetaFields = $this->plugin->config->get('yoast_api.meta');
22+
$seoMetaFields = $this->plugin->config->get('yoast_api.meta', []);
2323

2424
if (! is_array($seoMetaFields) || empty($seoMetaFields)) {
2525
return [];

‎src/Base/RestAPI/RestAPIServiceProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function whitelist($whitelist): array
183183
private function registerModelFields()
184184
{
185185
// Add global fields for all Models.
186-
foreach ($this->plugin->config->get('api.models') as $posttype => $data) {
186+
foreach ($this->plugin->config->get('api.models', []) as $posttype => $data) {
187187
foreach ($data['fields'] as $key => $creator) {
188188
$class = '\OWC\PDC\Base\Repositories\\' . ucfirst($posttype);
189189
if (class_exists($class)) {

‎src/Base/Settings/SettingsServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function register()
3333
*/
3434
public function registerSettingsPage($rwmbSettingsPages)
3535
{
36-
$settingsPages = $this->plugin->config->get('settings_pages');
36+
$settingsPages = $this->plugin->config->get('settings_pages', []);
3737

3838
return array_merge($rwmbSettingsPages, $settingsPages);
3939
}
@@ -47,7 +47,7 @@ public function registerSettingsPage($rwmbSettingsPages)
4747
*/
4848
public function registerSettings($rwmbMetaboxes)
4949
{
50-
$configMetaboxes = $this->plugin->config->get('settings');
50+
$configMetaboxes = $this->plugin->config->get('settings', []);
5151
$metaboxes = [];
5252

5353
foreach ($configMetaboxes as $metabox) {

‎src/Base/Taxonomy/TaxonomyServiceProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public function registerTaxonomies()
7373
protected function filterConfigTaxonomies(): array
7474
{
7575
if ($this->plugin->settings->useShowOn()) {
76-
return $this->plugin->config->get('taxonomies');
76+
return $this->plugin->config->get('taxonomies', []);
7777
}
7878

79-
return array_filter($this->plugin->config->get('taxonomies'), function ($taxonomyKey) {
79+
return array_filter($this->plugin->config->get('taxonomies', []), function ($taxonomyKey) {
8080
return ('pdc-show-on' !== $taxonomyKey);
8181
}, ARRAY_FILTER_USE_KEY);
8282
}

0 commit comments

Comments
 (0)