Merge pull request #341 from GM-Alex/next

Bump version 2.2.15

composer.json

@@ -3,7 +3,7 @@
   "description": "User Access Manager plugin for Wordpress",
   "type": "wordpress-plugin",
   "license": "GPL-2.0",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "authors": [
     {
       "name": "Alexander Schneider",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "user-access-manager",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "description": "[![Build Status](https://travis-ci.org/GM-Alex/user-access-manager.svg)](https://travis-ci.org/GM-Alex/user-access-manager)",
   "main": "index.js",
   "directories": {

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: admin, access, member area, members, member, member access, page, pages, post, posts, private, privacy, restrict, user, user access manager, user management
 Requires at least: 4.7
 Tested up to: 5.7
-Stable tag: 2.2.14
+Stable tag: 2.2.15
 
 With the "User Access Manager"-plugin you can manage the access to your posts, pages and files.
 
@@ -59,6 +59,8 @@ Here you found the changes in each version.
 
     Version     Date        Changes
 
+    2.2.15      2021/06/07  Fix possible type issues.
+
     2.2.14      2021/04/21  Fix bulk edit.
                             Fix permission issue.
                             Fix redirect typing issue.

src/Controller/Frontend/PostController.php

@@ -250,7 +250,7 @@ private function processPostContent(WP_Post $post): string
      */
     private function processPost(WP_Post $post): ?WP_Post
     {
-        $post->post_title .= $this->adminOutput($post->post_type, $post->ID);
+        $post->post_title .= $this->adminOutput((string) $post->post_type, $post->ID);
 
         if ($this->accessHandler->checkObjectAccess($post->post_type, $post->ID) === false) {
             if ($this->removePostFromList($post->post_type) === true) {

src/Controller/Frontend/RedirectController.php

@@ -347,10 +347,10 @@ private function extractObjectTypeAndId($pageParams, ?string &$objectType, ?stri
      * Redirects to a page or to content.
      * @param array|null $headers The headers which are given from wordpress.
      * @param mixed $pageParams The params of the current page.
-     * @return array
+     * @return array|null
      * @throws UserGroupTypeException
      */
-    public function redirect(?array $headers, $pageParams): array
+    public function redirect(?array $headers, $pageParams): ?array
     {
         $fileUrl = $this->getRequestParameter('uamgetfile');
         $fileType = $this->getRequestParameter('uamfiletype');

src/Controller/Frontend/TermController.php

@@ -232,7 +232,7 @@ private function processTerm($term, &$isEmpty = null)
             return null;
         }
 
-        $term->name .= $this->adminOutput($term->taxonomy, $term->term_id, $term->name);
+        $term->name .= $this->adminOutput((string) $term->taxonomy, $term->term_id, $term->name);
         $term->count = $this->getVisibleElementsCount($term->taxonomy, $term->term_id);
         $isEmpty = $this->isCategoryEmpty($term);
 
@@ -328,7 +328,7 @@ public function showCustomMenu(array $items): array
         $showItems = [];
 
         foreach ($items as $key => $item) {
-            $item->title .= $this->adminOutput($item->object, $item->object_id, $item->title);
+            $item->title .= $this->adminOutput((string) $item->object, $item->object_id, $item->title);
 
             if ($this->objectHandler->isPostType($item->object) === true) {
                 if ($this->processPostMenuItem($item) === false) {

src/UserAccessManager.php

@@ -50,7 +50,7 @@
  */
 class UserAccessManager
 {
-    const VERSION = '2.2.14';
+    const VERSION = '2.2.15';
     const DB_VERSION = '1.6.1';
 
     /**

user-access-manager.php

@@ -3,7 +3,7 @@
  * Plugin Name: User Access Manager
  * Plugin URI: https://wordpress.org/plugins/user-access-manager/
  * Author URI: https://twitter.com/GM_Alex
- * Version: 2.2.14
+ * Version: 2.2.15
  * Requires PHP: 7.2
  * Author: Alexander Schneider
  * Description: Manage the access to your posts, pages, categories and files.