Commit 8678cc4c authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge branch 'php82' 

# Conflicts:
#	composer.json
parents 482f2acb 5a6da799

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
        "laminas/laminas-permissions-acl": "^2.9",

        "laminas/laminas-servicemanager": "^3.10",

        "laminas/laminas-view": "^2.16",

        "unicaen/zfc-user": "^5.0",

        "unicaen/zfc-user": "^6.0",

        "laminas/laminas-dependency-plugin": "^2.4"

    },

    "require-dev": {

src/BjyAuthorize/Collector/RoleCollector.php

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use Laminas\DeveloperTools\Collector\CollectorInterface; 
 *

 * @author Marco Pivetta <ocramius@gmail.com>

 */

class RoleCollector implements CollectorInterface, Serializable

class RoleCollector implements CollectorInterface

{

    const NAME     = 'bjy_authorize_role_collector';
@@ -96,7 +96,7 @@ class RoleCollector implements CollectorInterface, Serializable 
    /**

     * {@inheritDoc}

     */

    public function serialize()

    public function __serialize()

    {

        return serialize($this->collectedRoles);

    }
@@ -104,7 +104,7 @@ class RoleCollector implements CollectorInterface, Serializable 
    /**

     * {@inheritDoc}

     */

    public function unserialize($serialized)

    public function __unserialize($serialized)

    {

        $this->collectedRoles = unserialize($serialized);

    }