Feat/upgrade composer deps

.php-cs-fixer.php

@@ -27,7 +27,6 @@
         'align_multiline_comment' => true,
         'array_indentation' => true,
         'no_superfluous_elseif' => true,
-        'single_blank_line_before_namespace' => true,
         'blank_line_after_opening_tag' => true,
         'no_blank_lines_after_phpdoc' => true,
         'phpdoc_separation' => true,

composer.json

@@ -11,12 +11,12 @@
   "type": "wordpress-plugin",
   "require": {
     "php": "^7.4|^8.0",
-    "johnbillion/extended-cpts": "^4.0",
+    "johnbillion/extended-cpts": "^5.0",
     "yahnis-elsts/plugin-update-checker": "^5.0"
   },
   "require-dev": {
     "10up/wp_mock": "~0.5",
-    "friendsofphp/php-cs-fixer": "^2.0",
+    "friendsofphp/php-cs-fixer": "^3.0",
     "mockery/mockery": "^1.5",
     "phpunit/phpunit": "~9.0",
     "szepeviktor/phpstan-wordpress": "^1.1"
@@ -33,7 +33,7 @@
   },
   "scripts": {
     "format": "./vendor/bin/php-cs-fixer fix",
-    "phpstan": "./vendor/bin/phpstan analyse --no-progress  --memory-limit 500M",
+    "phpstan": "./vendor/bin/phpstan analyse --no-progress  --memory-limit 1G",
     "test": [
       "@unit"
     ],

config/api.php

@@ -30,7 +30,7 @@
                 'seopress' => OWC\PDC\Base\RestAPI\ItemFields\SeoPress::class,
                 'yoast' => OWC\PDC\Base\RestAPI\ItemFields\Yoast::class,
                 'hide_feedback_form' => OWC\PDC\Base\RestAPI\SharedFields\HideFeedbackForm::class,
-				'table_of_contents_is_active' => OWC\PDC\Base\RestAPI\ItemFields\TableOfContentsField::class
+                'table_of_contents_is_active' => OWC\PDC\Base\RestAPI\ItemFields\TableOfContentsField::class
             ],
         ],
         'subthema' => [
@@ -60,7 +60,7 @@
                 'yoast' => OWC\PDC\Base\RestAPI\ItemFields\Yoast::class,
                 'date_modified' => OWC\PDC\Base\RestAPI\ItemFields\DateModified::class,
                 'hide_feedback_form' => OWC\PDC\Base\RestAPI\SharedFields\HideFeedbackForm::class,
-				'tiles' => OWC\PDC\Base\RestAPI\ThemaFields\TilesField::class
+                'tiles' => OWC\PDC\Base\RestAPI\ThemaFields\TilesField::class
             ],
         ],
     ],

config/core.php

@@ -41,17 +41,16 @@
             'label' => 'RWMB Metabox',
             'version' => '4.14.0',
             'file' => 'meta-box/meta-box.php'
-        ],
-        [
+        ],        [
             'type' => 'plugin',
-            'label' => 'Posts 2 Posts',
-            'version' => '1.6.6',
-            'file' => 'posts-to-posts/posts-to-posts.php',
+            'label' => 'RWMB Metabox',
+            'version' => '1.4.2',
+            'file' => 'meta-box-group/meta-box-group.php'
         ],
         [
-            'type' => 'class',
+            'type' => 'function',
             'label' => '<a href="https://github.com/johnbillion/extended-cpts" target="_blank">Extended CPT library</a>',
-            'name' => 'Extended_CPT'
+            'name' => 'register_extended_post_type'
         ],
     ]
 

config/settings.php

@@ -82,13 +82,13 @@
                     'id' => 'setting_pdc_use_feedback_form',
                     'type' => 'checkbox',
                 ],
-				'pdc_use_theme_tiles' => [
+                'pdc_use_theme_tiles' => [
                     'name' => __('Theme tiles', 'pdc-base'),
                     'desc' => __('Enable theme tiles.', 'pdc-base'),
                     'id' => 'setting_pdc_use_theme_tiles',
                     'type' => 'checkbox',
                 ],
-				'pdc_use_table_of_contents' => [
+                'pdc_use_table_of_contents' => [
                     'name' => __('Table of contents', 'pdc-base'),
                     'desc' => __('Enable use of table of contents.', 'pdc-base'),
                     'id' => 'setting_pdc_use_table_of_contents',

config/table_of_contents_metabox.php

@@ -10,12 +10,12 @@
         'autosave' => true,
         'fields' => [
             'table_of_contents' => [
-				[
-					'name' => __('Table of contents', 'pdc-base'),
-					'desc' => __('Use this option if you want to use a table of contents', 'pdc-base'),
-					'id' => 'pdc_use_table_of_contents',
-					'type' => 'checkbox',
-				]
+                [
+                    'name' => __('Table of contents', 'pdc-base'),
+                    'desc' => __('Use this option if you want to use a table of contents', 'pdc-base'),
+                    'id' => 'pdc_use_table_of_contents',
+                    'type' => 'checkbox',
+                ]
             ],
         ]
     ]

config/taxonomies.php

@@ -27,7 +27,7 @@
                 'back_to_items' => __('← Back to tags', 'pdc-base'),
             ],
             'meta_box' => 'simple',
-			'show_in_rest' => true,
+            'show_in_rest' => true,
         ],
         'names' => [
             'singular' => __('Audience', 'pdc-base'),

config/theme_tiles_metabox.php

@@ -11,24 +11,24 @@
         'fields' => [
             'tiles' => [
                 'group' => [
-                    'id'         => 'pdc_tiles_group',
-                    'type'       => 'group',
-                    'clone'      => true,
+                    'id' => 'pdc_tiles_group',
+                    'type' => 'group',
+                    'clone' => true,
                     'sort_clone' => true,
                     'add_button' => __('Add new tile', 'pdc-base'),
-                    'fields'     => [
+                    'fields' => [
                         [
-                            'id'   => 'pdc_tile_title',
+                            'id' => 'pdc_tile_title',
                             'name' => __('Title', 'pdc-base'),
                             'type' => 'text',
                         ],
-						[
-                            'id'   => 'pdc_tile_url',
+                        [
+                            'id' => 'pdc_tile_url',
                             'name' => __('URL', 'pdc-base'),
                             'type' => 'url',
                         ],
-						[
-                            'id'   => 'pdc_tile_icon',
+                        [
+                            'id' => 'pdc_tile_icon',
                             'name' => __('Icon', 'pdc-base'),
                             'type' => 'text',
                         ],

src/Base/Admin/AdminServiceProvider.php

@@ -2,10 +2,10 @@
 
 namespace OWC\PDC\Base\Admin;
 
-use OWC\PDC\Base\Foundation\ServiceProvider;
-use OWC\PDC\Base\Models\Item;
 use WP_Post;
 use WP_REST_Response;
+use OWC\PDC\Base\Models\Item;
+use OWC\PDC\Base\Foundation\ServiceProvider;
 
 class AdminServiceProvider extends ServiceProvider
 {

src/Base/Exceptions/PropertyNotExistsException.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Exception when property is not found on object.
  */

src/Base/Foundation/Config.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Config object to store, save and retrieve configurations.
  */

src/Base/Foundation/DependencyChecker.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Checks if dependencies are valid.
  */
@@ -53,6 +54,10 @@ public function failed(): bool
                 case 'plugin':
                     $this->checkPlugin($dependency);
 
+                    break;
+                case 'function':
+                    $this->checkFunction($dependency);
+
                     break;
             }
         }
@@ -139,6 +144,16 @@ private function checkPlugin(array $dependency)
         }
     }
 
+    /**
+     * Checks if required function exists.
+     */
+    private function checkFunction(array $dependency): void
+    {
+        if (! function_exists($dependency['name'])) {
+            $this->markFailed($dependency, __('Function does not exist:', 'pdc-base') . ' <b>' . $dependency['name'] . '</b>');
+        }
+    }
+
     /**
      * Checks the installed version of the plugin.
      */

src/Base/Foundation/Loader.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Provider which handles the hooks in the WordPress ecosystem.
  */

src/Base/Metabox/Handlers/UPLResourceHandler.php

@@ -2,9 +2,9 @@
 
 namespace OWC\PDC\Base\Metabox\Handlers;
 
-use OWC\PDC\Base\Support\Traits\RequestUPL;
 use WP_Post;
 use WP_REST_Request;
+use OWC\PDC\Base\Support\Traits\RequestUPL;
 
 class UPLResourceHandler
 {

src/Base/Metabox/MetaboxServiceProvider.php

@@ -2,9 +2,9 @@
 
 namespace OWC\PDC\Base\Metabox;
 
+use OWC\PDC\Base\Support\Traits\RequestUPL;
 use OWC\PDC\Base\Metabox\Handlers\UPLNameHandler;
 use OWC\PDC\Base\Metabox\Handlers\UPLResourceHandler;
-use OWC\PDC\Base\Support\Traits\RequestUPL;
 
 class MetaboxServiceProvider extends MetaboxBaseServiceProvider
 {
@@ -41,13 +41,13 @@ public function registerMetaboxes(array $rwmbMetaboxes): array
             $configMetaboxes = $this->getShowOnMetabox($configMetaboxes);
         }
 
-		if ($this->plugin->settings->useThemeTiles()) {
-			$configMetaboxes = $this->getTilesMetabox($configMetaboxes);
-		}
+        if ($this->plugin->settings->useThemeTiles()) {
+            $configMetaboxes = $this->getTilesMetabox($configMetaboxes);
+        }
 
-		if ($this->plugin->settings->useTableOfContents()) {
-			$configMetaboxes = $this->getTableOfContentsMetabox($configMetaboxes);
-		}
+        if ($this->plugin->settings->useTableOfContents()) {
+            $configMetaboxes = $this->getTableOfContentsMetabox($configMetaboxes);
+        }
 
         if ($this->plugin->settings->useFeedbackForm()) {
             $configMetaboxes = $this->getFeedbackFormMetabox($configMetaboxes);
@@ -86,12 +86,12 @@ protected function getShowOnMetabox(array $configMetaboxes): array
         return array_merge($configMetaboxes, $this->plugin->config->get('show_on_metabox'));
     }
 
-	protected function getTilesMetabox(array $configMetaboxes): array
+    protected function getTilesMetabox(array $configMetaboxes): array
     {
         return array_merge($configMetaboxes, $this->plugin->config->get('theme_tiles_metabox'));
     }
 
-	protected function getTableOfContentsMetabox(array $configMetaboxes): array
+    protected function getTableOfContentsMetabox(array $configMetaboxes): array
     {
         return array_merge($configMetaboxes, $this->plugin->config->get('table_of_contents_metabox'));
     }

src/Base/Models/Item.php

@@ -254,14 +254,14 @@ public function getEscapeElement(): bool
     {
         $value = $this->getMeta('escape_element_active', '0', true, '_owc_');
 
-		return boolval($value);
+        return boolval($value);
     }
 
-	public function useTableOfContents(): bool
+    public function useTableOfContents(): bool
     {
         $value = $this->getMeta('pdc_use_table_of_contents', '0', true, '_owc_');
 
-		return boolval($value);
+        return boolval($value);
     }
 
     /**

src/Base/Models/PortalLinkGenerator.php

@@ -2,8 +2,8 @@
 
 namespace OWC\PDC\Base\Models;
 
-use OWC\PDC\Base\Settings\SettingsPageOptions;
 use WP_Term;
+use OWC\PDC\Base\Settings\SettingsPageOptions;
 
 class PortalLinkGenerator
 {

src/Base/PostType/PostTypeServiceProvider.php

@@ -43,6 +43,8 @@ public function registerPostTypes()
                     continue;
                 }
 
+				$postType = apply_filters('owc/pdc-base/before-register-extended-post-type', $postType, $postTypeName);
+
                 register_extended_post_type($postTypeName, $postType['args'], $postType['names']);
             }
         }

src/Base/PostType/PostTypes/PdcSubcategoryModel.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Model for the sub-category
  */

src/Base/Repositories/AbstractRepository.php

@@ -7,11 +7,11 @@
 namespace OWC\PDC\Base\Repositories;
 
 use Closure;
-use OWC\PDC\Base\Exceptions\PropertyNotExistsException;
-use OWC\PDC\Base\Support\CreatesFields;
-use OWC\PDC\Base\Support\Traits\QueryHelpers;
 use WP_Post;
 use WP_Query;
+use OWC\PDC\Base\Support\CreatesFields;
+use OWC\PDC\Base\Support\Traits\QueryHelpers;
+use OWC\PDC\Base\Exceptions\PropertyNotExistsException;
 
 /**
  * PDC item object with default quering and methods.

src/Base/RestAPI/Controllers/BaseController.php

@@ -6,9 +6,9 @@
 
 namespace OWC\PDC\Base\RestAPI\Controllers;
 
-use OWC\PDC\Base\Foundation\Plugin;
 use WP_Query;
 use WP_REST_Request;
+use OWC\PDC\Base\Foundation\Plugin;
 
 /**
  * Controller which handels general quering, such as pagination.

src/Base/RestAPI/Controllers/ItemController.php

@@ -6,11 +6,11 @@
 
 namespace OWC\PDC\Base\RestAPI\Controllers;
 
-use OWC\PDC\Base\Repositories\Item;
-use OWC\PDC\Base\Support\Traits\CheckPluginActive;
-use OWC\PDC\Base\Support\Traits\QueryHelpers;
 use WP_Error;
 use WP_REST_Request;
+use OWC\PDC\Base\Repositories\Item;
+use OWC\PDC\Base\Support\Traits\QueryHelpers;
+use OWC\PDC\Base\Support\Traits\CheckPluginActive;
 
 /**
  * Controller which handles the (requested) pdc-item(s).

src/Base/RestAPI/Controllers/SubthemaController.php

@@ -32,9 +32,9 @@ public function getSubthemas(WP_REST_Request $request): array
             $items->filterSource($request->get_param('source'));
         }
 
-		if ($language = $request->get_param('language')) {
-			$items->filterLanguage((string) $language);
-		}
+        if ($language = $request->get_param('language')) {
+            $items->filterLanguage((string) $language);
+        }
 
         $data = $items->all();
         $query = $items->getQuery();
@@ -59,9 +59,9 @@ public function getSubthema(WP_REST_Request $request)
             $thema->filterSource($request->get_param('source'));
         }
 
-		if ($language = $request->get_param('language')) {
-			$thema->filterLanguage((string) $language);
-		}
+        if ($language = $request->get_param('language')) {
+            $thema->filterLanguage((string) $language);
+        }
 
         $thema = $thema->find($id);
 
@@ -91,9 +91,9 @@ public function getSubthemeBySlug(WP_REST_Request $request)
             $subtheme->filterSource($request->get_param('source'));
         }
 
-		if ($language = $request->get_param('language')) {
-			$subtheme->filterLanguage((string) $language);
-		}
+        if ($language = $request->get_param('language')) {
+            $subtheme->filterLanguage((string) $language);
+        }
 
         $subtheme = $subtheme->findBySlug($slug);