ZF-11186: E_NOTICE if there is no validator data in session

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24055 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Session/Validator/Abstract.php

@@ -62,8 +62,10 @@ abstract class Zend_Session_Validator_Abstract implements Zend_Session_Validator
     protected function getValidData()
     {
         $validatorName = get_class($this);
-
-        return $_SESSION['__ZF']['VALID'][$validatorName];
+        if (isset($_SESSION['__ZF']['VALID'][$validatorName])) {
+            return $_SESSION['__ZF']['VALID'][$validatorName];
+        }
+        return null;
     }
 
 }

tests/Zend/Session/SessionTest.php

@@ -1048,4 +1048,18 @@ class Zend_SessionTest extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * @group ZF-11186
+     */
+    public function testNoNoticesIfNoValidatorDataInSession()
+    {
+        try {
+            Zend_Session::start();
+            require_once dirname(__FILE__) . '/Validator/NoticeValidator.php';
+            Zend_Session::registerValidator(new Zend_Session_Validator_NoticeValidator);
+        } catch (PHPUnit_Framework_Error_Notice $exception) {
+            $this->fail($exception->getMessage());
+        }
+    }
+
 }

tests/Zend/Session/Validator/NoticeValidator.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Session
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id:$
+ */
+
+/**
+ * @see Zend_Session_Validator_Abstract
+ */
+require_once 'Zend/Session/Validator/Abstract.php';
+
+/**
+ * Session validator for ZF-11186.
+ *
+ * @category   Zend
+ * @package    Zend_Session
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Session
+ */
+class Zend_Session_Validator_NoticeValidator extends Zend_Session_Validator_Abstract
+{
+    /**
+     * @access public
+     * @return void
+     */
+    public function setup()
+    {
+        $this->getValidData();
+    }
+
+    /**
+     * @access public
+     * @return void
+     */
+    public function validate()
+    {
+        /* do nothing */
+    }
+}