Merge pull request #324 from GM-Alex/next

Bump version 2.2.6
GM-Alex · Feb 14, 2021 · 0e95abc · 0e95abc
2 parents 923bd5c + 6f3c68b
commit 0e95abc
Show file tree

Hide file tree

Showing 15 changed files with 95 additions and 93 deletions.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "User Access Manager plugin for Wordpress",
   "type": "wordpress-plugin",
   "license": "GPL-2.0",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "authors": [
     {
       "name": "Alexander Schneider",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "user-access-manager",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "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": {

diff --git a/readme.txt b/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.6
-Stable tag: 2.2.5
+Stable tag: 2.2.6
 
 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.6       2021/02/14  Fix more possible type errors.
+
     2.2.5       2021/02/14  Fix more possible type errors if wordpress switches int to string.
 
     2.2.4       2021/02/13  Fix type error for user object controller.

diff --git a/src/Controller/BaseControllerTrait.php b/src/Controller/BaseControllerTrait.php
@@ -45,7 +45,7 @@ abstract protected function getWordpressConfig(): WordpressConfig;
 
     /**
      * Returns the current request url.
-      * @return string
+     * @return string
      */
     public function getRequestUrl(): string
     {
@@ -54,8 +54,8 @@ public function getRequestUrl(): string
 
     /**
      * Sanitize the given value.
-      * @param mixed $value
-      * @return array|string
+     * @param mixed $value
+     * @return array|string
      */
     private function sanitizeValue($value)
     {
@@ -81,9 +81,9 @@ private function sanitizeValue($value)
 
     /**
      * Returns the request parameter.
-      * @param string $name
+     * @param string $name
      * @param mixed $default
-      * @return mixed
+     * @return mixed
      */
     public function getRequestParameter(string $name, $default = null)
     {
@@ -98,8 +98,8 @@ public function getRequestParameter(string $name, $default = null)
 
     /**
      * Returns the content of the excluded php file.
-      * @param string $fileName The view file name
-      * @return string
+     * @param string $fileName The view file name
+     * @return string
      */
     protected function getIncludeContents(string $fileName): string
     {

diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -58,7 +58,7 @@ abstract class Controller
 
     /**
      * Controller constructor.
-      * @param Php             $php
+     * @param Php             $php
      * @param Wordpress       $wordpress
      * @param WordpressConfig $wordpressConfig
      */
@@ -87,8 +87,8 @@ protected function getWordpressConfig(): WordpressConfig
 
     /**
      * Returns the nonce field.
-      * @param string $name
-      * @return string
+     * @param string $name
+     * @return string
      */
     public function createNonceField(string $name): string
     {
@@ -97,8 +97,8 @@ public function createNonceField(string $name): string
 
     /**
      * Returns the nonce.
-      * @param string $name
-      * @return string
+     * @param string $name
+     * @return string
      */
     public function getNonce(string $name): string
     {
@@ -107,7 +107,7 @@ public function getNonce(string $name): string
 
     /**
      * Verifies the nonce and terminates the application if the nonce is wrong.
-      * @param string $name
+     * @param string $name
      */
     protected function verifyNonce(string $name)
     {
@@ -120,7 +120,7 @@ protected function verifyNonce(string $name)
 
     /**
      * Sets the update message.
-      * @param string $message
+     * @param string $message
      */
     protected function setUpdateMessage(string $message)
     {
@@ -129,7 +129,7 @@ protected function setUpdateMessage(string $message)
 
     /**
      * Adds an error message.
-      * @param string $message
+     * @param string $message
      */
     protected function addErrorMessage(string $message)
     {
@@ -142,7 +142,7 @@ protected function addErrorMessage(string $message)
 
     /**
      * Returns the update message.
-      * @return string
+     * @return string
      */
     public function getUpdateMessage(): ?string
     {
@@ -151,7 +151,7 @@ public function getUpdateMessage(): ?string
 
     /**
      * Returns true if a update message is set.
-      * @return bool
+     * @return bool
      */
     public function hasUpdateMessage(): bool
     {

diff --git a/src/Controller/ControllerFactory.php b/src/Controller/ControllerFactory.php
@@ -169,7 +169,7 @@ class ControllerFactory
 
     /**
      * ControllerFactory constructor.
-      * @param Php                        $php
+     * @param Php                        $php
      * @param Wordpress                  $wordpress
      * @param Database                   $database
      * @param WordpressConfig            $wordpressConfig
@@ -239,7 +239,7 @@ public function __construct(
 
     /**
      * Creates and returns a new backend controller.
-      * @return BackendController
+     * @return BackendController
      */
     public function createBackendController(): BackendController
     {
@@ -255,7 +255,7 @@ public function createBackendController(): BackendController
 
     /**
      * Creates and returns a new backend about controller.
-      * @return AboutController
+     * @return AboutController
      */
     public function createBackendAboutController(): AboutController
     {
@@ -268,7 +268,7 @@ public function createBackendAboutController(): AboutController
 
     /**
      * Creates and returns a new backend object controller.
-      * @return ObjectController
+     * @return ObjectController
      */
     public function createBackendObjectController(): ObjectController
     {
@@ -290,7 +290,7 @@ public function createBackendObjectController(): ObjectController
 
     /**
      * Creates and returns a new backend cache controller.
-      * @return CacheController
+     * @return CacheController
      */
     public function createBackendCacheController(): CacheController
     {
@@ -301,7 +301,7 @@ public function createBackendCacheController(): CacheController
 
     /**
      * Creates and returns a new backend post object controller.
-      * @return PostObjectController
+     * @return PostObjectController
      */
     public function createBackendPostObjectController(): PostObjectController
     {
@@ -323,7 +323,7 @@ public function createBackendPostObjectController(): PostObjectController
 
     /**
      * Creates and returns a new backend term object controller.
-      * @return TermObjectController
+     * @return TermObjectController
      */
     public function createBackendTermObjectController(): TermObjectController
     {
@@ -345,7 +345,7 @@ public function createBackendTermObjectController(): TermObjectController
 
     /**
      * Creates and returns a new backend user object controller.
-      * @return UserObjectController
+     * @return UserObjectController
      */
     public function createBackendUserObjectController(): UserObjectController
     {
@@ -367,7 +367,7 @@ public function createBackendUserObjectController(): UserObjectController
 
     /**
      * Creates and returns a new backend dynamic group controller.
-      * @return DynamicGroupsController
+     * @return DynamicGroupsController
      */
     public function createBackendDynamicGroupsController(): DynamicGroupsController
     {
@@ -389,7 +389,7 @@ public function createBackendDynamicGroupsController(): DynamicGroupsController
 
     /**
      * Creates and returns a new backend setup controller.
-      * @return SettingsController
+     * @return SettingsController
      */
     public function createBackendSettingsController(): SettingsController
     {
@@ -407,7 +407,7 @@ public function createBackendSettingsController(): SettingsController
 
     /**
      * Creates and returns a new backend setup controller.
-      * @return SetupController
+     * @return SetupController
      */
     public function createBackendSetupController(): SetupController
     {
@@ -422,7 +422,7 @@ public function createBackendSetupController(): SetupController
 
     /**
      * Creates and returns a new backend user group controller.
-      * @return UserGroupController
+     * @return UserGroupController
      */
     public function createBackendUserGroupController(): UserGroupController
     {
@@ -438,7 +438,7 @@ public function createBackendUserGroupController(): UserGroupController
 
     /**
      * Creates and returns a new frontend controller.
-      * @return FrontendController
+     * @return FrontendController
      */
     public function createFrontendController(): FrontendController
     {
@@ -453,7 +453,7 @@ public function createFrontendController(): FrontendController
 
     /**
      * Creates and returns a new frontend post controller.
-      * @return PostController
+     * @return PostController
      */
     public function createFrontendPostController(): PostController
     {
@@ -473,7 +473,7 @@ public function createFrontendPostController(): PostController
 
     /**
      * Creates and returns a new frontend redirect controller.
-      * @return RedirectController
+     * @return RedirectController
      */
     public function createFrontendRedirectController(): RedirectController
     {
@@ -494,7 +494,7 @@ public function createFrontendRedirectController(): RedirectController
 
     /**
      * Creates and returns a new frontend short code controller.
-      * @return ShortCodeController
+     * @return ShortCodeController
      */
     public function createFrontendShortCodeController(): ShortCodeController
     {
@@ -508,7 +508,7 @@ public function createFrontendShortCodeController(): ShortCodeController
 
     /**
      * Creates and returns a new frontend term controller.
-      * @return TermController
+     * @return TermController
      */
     public function createFrontendTermController(): TermController
     {

diff --git a/src/Controller/Frontend/PostController.php b/src/Controller/Frontend/PostController.php
@@ -300,14 +300,14 @@ private function filterRawPosts(array $rawPosts): array
 
     /**
      * The function for the the_posts filter.
-     * @param array $showPosts The posts.
+     * @param null|array $showPosts The posts.
      * @return array
      * @throws UserGroupTypeException
      */
-    public function showPosts($showPosts = []): array
+    public function showPosts(?array $showPosts = []): ?array
     {
         if ($this->wordpress->isFeed() === false || $this->mainConfig->protectFeed() === true) {
-            $showPosts = $this->filterRawPosts($showPosts);
+            $showPosts = $this->filterRawPosts((array) $showPosts);
         }
 
         $this->restoreFilters();
@@ -323,7 +323,7 @@ public function showPosts($showPosts = []): array
      */
     public function showPages($rawPages = []): array
     {
-        return $this->filterRawPosts($rawPages);
+        return $this->filterRawPosts((array) $rawPages);
     }
 
     /**

diff --git a/src/ObjectMembership/ObjectMembershipHandlerFactory.php b/src/ObjectMembership/ObjectMembershipHandlerFactory.php
@@ -59,7 +59,7 @@ class ObjectMembershipHandlerFactory
 
     /**
      * MembershipHandlerFactory constructor.
-      * @param Php                          $php
+     * @param Php                          $php
      * @param Wordpress                    $wordpress
      * @param Database                     $database
      * @param ObjectMapHandler             $objectMapHandler
@@ -81,8 +81,8 @@ public function __construct(
 
     /**
      * Creates a PostMembershipHandler object.
-      * @param ObjectHandler $objectHandler
-      * @return PostMembershipHandler
+     * @param ObjectHandler $objectHandler
+     * @return PostMembershipHandler
      * @throws Exception
      */
     public function createPostMembershipHandler(ObjectHandler $objectHandler): PostMembershipHandler
@@ -97,7 +97,7 @@ public function createPostMembershipHandler(ObjectHandler $objectHandler): PostM
 
     /**
      * Creates a RoleMembershipHandler object.
-      * @return RoleMembershipHandler
+     * @return RoleMembershipHandler
      * @throws Exception
      */
     public function createRoleMembershipHandler(): RoleMembershipHandler
@@ -107,8 +107,8 @@ public function createRoleMembershipHandler(): RoleMembershipHandler
 
     /**
      * Creates a TermMembershipHandler object.
-      * @param ObjectHandler $objectHandler
-      * @return TermMembershipHandler
+     * @param ObjectHandler $objectHandler
+     * @return TermMembershipHandler
      * @throws Exception
      */
     public function createTermMembershipHandler(ObjectHandler $objectHandler): TermMembershipHandler
@@ -123,8 +123,8 @@ public function createTermMembershipHandler(ObjectHandler $objectHandler): TermM
 
     /**
      * Creates an UserMembershipHandler object.
-      * @param ObjectHandler $objectHandler
-      * @return UserMembershipHandler
+     * @param ObjectHandler $objectHandler
+     * @return UserMembershipHandler
      * @throws Exception
      */
     public function createUserMembershipHandler(ObjectHandler $objectHandler): UserMembershipHandler