projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5732720)
Remove Horde_LoginTasks_Backend::isAuthenticated()
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 6 Oct 2010 20:42:07 +0000 (14:42 -0600)
committerMichael M Slusarz <slusarz@curecanti.org>
Thu, 7 Oct 2010 06:45:40 +0000 (00:45 -0600)
framework/LoginTasks/lib/Horde/LoginTasks.php patch | blob | history
framework/LoginTasks/lib/Horde/LoginTasks/Backend.php patch | blob | history
framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php patch | blob | history
framework/LoginTasks/test/Horde/LoginTasks/Stubs.php patch | blob | history

diff --git a/framework/LoginTasks/lib/Horde/LoginTasks.php b/framework/LoginTasks/lib/Horde/LoginTasks.php
index 3bdba0f..024703c 100644 (file)
--- a/framework/LoginTasks/lib/Horde/LoginTasks.php
+++ b/framework/LoginTasks/lib/Horde/LoginTasks.php
@@ -66,10 +66,6 @@ class Horde_LoginTasks
     {
         $this->_backend = $backend;
 
-        if (!$this->_backend->isAuthenticated()) {
-            return;
-        }
-
         /* Retrieves a cached tasklist or make sure one is created. */
         $this->_tasklist = $this->_backend->getTasklistFromCache();
 
diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php b/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php
index bb2493c..0a42d50 100644 (file)
--- a/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php
+++ b/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php
@@ -18,13 +18,6 @@
 abstract class Horde_LoginTasks_Backend
 {
     /**
-     * Is the current session authenticated?
-     *
-     * @return boolean  True if the user is authenticated, false otherwise.
-     */
-    abstract public function isAuthenticated();
-
-    /**
      * Retrieve a cached tasklist if it exists.
      *
      * @return Horde_LoginTasks_Tasklist|boolean  The cached task list or
diff --git a/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php b/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php
index f0a88e9..2679c34 100644 (file)
--- a/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php
+++ b/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php
@@ -31,23 +31,12 @@ require_once dirname(__FILE__) . '/Autoload.php';
 
 class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 {
-    public function testNoTasksAreRanIfNoUserIsAuthenticated()
+    public function testTheTasksAreRun()
     {
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(array('Horde_LoginTasks_Stub_Task'));
         $tasks->runTasks();
         $this->assertEquals(
-            array(),
-            Horde_LoginTasks_Stub_Task::$executed
-        );
-    }
-
-    public function testTheTasksAreRanIfTheUserIsAuthenticated()
-    {
-        Horde_LoginTasks_Stub_Task::$executed = array();
-        $tasks = $this->_getLoginTasks(array('Horde_LoginTasks_Stub_Task'), true);
-        $tasks->runTasks();
-        $this->assertEquals(
             'Horde_LoginTasks_Stub_Task',
             Horde_LoginTasks_Stub_Task::$executed[0]
         );
@@ -56,7 +45,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
     public function testNoTasksAreRanIfTheTasklistIsEmpty()
     {
         Horde_LoginTasks_Stub_Task::$executed = array();
-        $tasks = $this->_getLoginTasks(array(), true);
+        $tasks = $this->_getLoginTasks();
         $tasks->runTasks();
         $this->assertEquals(
             array(),
@@ -67,7 +56,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
     public function testNoTasksAreRanIfTheTasklistIsCompleted()
     {
         Horde_LoginTasks_Stub_Task::$executed = array();
-        $tasks = $this->_getLoginTasks(array('Horde_LoginTasks_Stub_Task'), true);
+        $tasks = $this->_getLoginTasks(array('Horde_LoginTasks_Stub_Task'));
         $tasks->runTasks();
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks->runTasks();
@@ -84,8 +73,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
             array(
                 'Horde_LoginTasks_Stub_Task',
                 'Horde_LoginTasks_Stub_High',
-            ),
-            true
+            )
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -102,7 +90,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         Horde_LoginTasks_Stub_Task::$executed = array();
         $date = getdate();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Year'), true, $date
+            array('Horde_LoginTasks_Stub_Year'),
+            $date
         );
         $this->assertEquals(
             array(),
@@ -113,7 +102,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Year'), true, $date
+            array('Horde_LoginTasks_Stub_Year'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -127,7 +117,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         Horde_LoginTasks_Stub_Task::$executed = array();
         $date = getdate();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Month'), true, $date
+            array('Horde_LoginTasks_Stub_Month'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -139,7 +130,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Month'), true, $date
+            array('Horde_LoginTasks_Stub_Month'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -153,7 +145,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         Horde_LoginTasks_Stub_Task::$executed = array();
         $date = getdate();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Week'), true, $date
+            array('Horde_LoginTasks_Stub_Week'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -165,7 +158,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Week'), true, $date
+            array('Horde_LoginTasks_Stub_Week'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -179,7 +173,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         Horde_LoginTasks_Stub_Task::$executed = array();
         $date = getdate();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Day'), true, $date
+            array('Horde_LoginTasks_Stub_Day'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -191,7 +186,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Day'), true, $date
+            array('Horde_LoginTasks_Stub_Day'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -205,7 +201,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         Horde_LoginTasks_Stub_Task::$executed = array();
         $date = getdate();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Task'), true, $date
+            array('Horde_LoginTasks_Stub_Task'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -218,7 +215,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
     {
         Horde_LoginTasks_Stub_First::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_First'), true, false
+            array('Horde_LoginTasks_Stub_First')
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -229,7 +226,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         Horde_LoginTasks_Stub_Task::$executed = array();
         $date = getdate();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_First'), true, $date
+            array('Horde_LoginTasks_Stub_First'),
+            $date
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -242,7 +240,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
     {
         Horde_LoginTasks_Stub_Once::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Once'), true, false
+            array('Horde_LoginTasks_Stub_Once'
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -252,7 +250,8 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(
-            array('Horde_LoginTasks_Stub_Once'), true, true
+            array('Horde_LoginTasks_Stub_Once'),
+            true
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -268,9 +267,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
             array(
                 'Horde_LoginTasks_Stub_Task',
                 'Horde_LoginTasks_Stub_High',
-            ),
-            true,
-            false
+            )
         );
         $tasks->runTasks();
         $this->assertEquals(
@@ -289,9 +286,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
             array(
                 'Horde_LoginTasks_Stub_Task',
                 'Horde_LoginTasks_Stub_High',
-            ),
-            true,
-            false
+            )
         );
         $tasks->runTasks();
         $this->assertTrue(Horde_LoginTasks_Stub_Backend::$lastRun['test'] > time() - 10);
@@ -305,8 +300,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
                 'Horde_LoginTasks_Stub_Task',
                 'Horde_LoginTasks_Stub_High',
                 'Horde_LoginTasks_Stub_Notice',
-            ),
-            true
+            )
         );
         $tasks->runTasks(false, null);
         $this->assertEquals(
@@ -326,8 +320,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
                 'Horde_LoginTasks_Stub_Task',
                 'Horde_LoginTasks_Stub_High',
                 'Horde_LoginTasks_Stub_Notice',
-            ),
-            true
+            )
         );
         $this->assertContains(
             'URL',
@@ -343,8 +336,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
                 'Horde_LoginTasks_Stub_Task',
                 'Horde_LoginTasks_Stub_High',
                 'Horde_LoginTasks_Stub_Notice',
-            ),
-            true
+            )
         );
         $tasks->runTasks(false, null);
         $tasklist = $tasks->displayTasks();
@@ -363,8 +355,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
                 'Horde_LoginTasks_Stub_High',
                 'Horde_LoginTasks_Stub_Notice',
                 'Horde_LoginTasks_Stub_NoticeTwo',
-            ),
-            true
+            )
         );
         $tasks->runTasks(false, null);
         $tasklist = $tasks->displayTasks();
@@ -391,8 +382,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
                 'Horde_LoginTasks_Stub_High',
                 'Horde_LoginTasks_Stub_Notice',
                 'Horde_LoginTasks_Stub_NoticeTwo',
-            ),
-            true
+            )
         );
         $tasks->runTasks(false, null);
         Horde_LoginTasks_Stub_Task::$executed = array();
@@ -413,8 +403,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
             array(
                 'Horde_LoginTasks_Stub_Confirm',
                 'Horde_LoginTasks_Stub_Notice',
-            ),
-            true
+            )
         );
         $tasks->runTasks(false, 'redirect');
         $tasks->displayTasks();
@@ -445,8 +434,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
                 'Horde_LoginTasks_Stub_TaskTwo',
                 'Horde_LoginTasks_Stub_ConfirmThree',
                 'Horde_LoginTasks_Stub_NoticeTwo',
-            ),
-            true
+            )
         );
         $this->assertContains(
             'URL',
@@ -611,8 +599,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         );
     }
 
-    private function _getLoginTasks(array $tasks = array(),
-                                    $authenticated = false, $last_run = false)
+    private function _getLoginTasks(array $tasks = array(), $last_run = false)
     {
         $last_time = $last_run;
         if ($last_time && !is_bool($last_time)) {
@@ -634,7 +621,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         }
 
         return new Horde_LoginTasks(
-            new Horde_LoginTasks_Stub_Backend($tasklist, $authenticated, $last_time)
+            new Horde_LoginTasks_Stub_Backend($tasklist, $last_time)
         );
     }
 
diff --git a/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php b/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php
index 081bdbf..ac9e144 100644 (file)
--- a/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php
+++ b/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php
@@ -4,25 +4,17 @@ class Horde_LoginTasks_Stub_Backend extends Horde_LoginTasks_Backend
 {
     static public $lastRun;
 
-    private $_authenticated;
     private $_tasklist;
     private $_tasklistCache = false;
 
-    public function __construct(array $tasks, $authenticated = false,
-                                $last_run = false)
+    public function __construct(array $tasks, $last_run = false)
     {
         $this->_tasklist = $tasks;
-        $this->_authenticated = $authenticated;
         if ($last_run !== true) {
             self::$lastRun = $last_run;
         }
     }
 
-    public function isAuthenticated()
-    {
-        return $this->_authenticated;
-    }
-
     public function getTasklistFromCache()
     {
         return $this->_tasklistCache;
Unnamed repository; edit this file to name it for gitweb.