Lazy load options

ZF-Commons · Nov 29, 2013 · 4484a59 · 4484a59
1 parent ca5ceea
commit 4484a59
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/config/module.config.php b/config/module.config.php
@@ -77,9 +77,6 @@
     ],
 
     'zfc_rbac' => [
-        'unauthorized_strategy' => [],
-        'redirect_strategy'     => [],
-
         // Plugin managers
         'guard_manager'               => [],
         'role_provider_manager'       => [],

diff --git a/src/ZfcRbac/Options/ModuleOptions.php b/src/ZfcRbac/Options/ModuleOptions.php
@@ -304,6 +304,10 @@ public function setUnauthorizedStrategy(array $unauthorizedStrategy)
      */
     public function getUnauthorizedStrategy()
     {
+        if (null === $this->unauthorizedStrategy) {
+            $this->unauthorizedStrategy = new UnauthorizedStrategyOptions();
+        }
+
         return $this->unauthorizedStrategy;
     }
 
@@ -324,6 +328,10 @@ public function setRedirectStrategy(array $redirectStrategy)
      */
     public function getRedirectStrategy()
     {
+        if (null === $this->redirectStrategy) {
+            $this->redirectStrategy = new RedirectStrategyOptions();
+        }
+
         return $this->redirectStrategy;
     }