Use static data providers

Author: stof

tests/Basic/BasicAuthTest.php

@@ -20,7 +20,7 @@ public function testSetBasicAuth($user, $pass, $pageText)
         $this->assertStringContainsString($pageText, $session->getPage()->getContent());
     }
 
-    public function setBasicAuthDataProvider()
+    public static function setBasicAuthDataProvider()
     {
         return array(
             array('mink-user', 'mink-password', 'is authenticated'),

tests/Basic/BestPracticesTest.php

@@ -40,7 +40,7 @@ public function testImplementBasicApi($method)
         $this->assertImplementMethod($method, $driver, 'The driver is unusable when this method is not implemented.');
     }
 
-    public function provideRequiredMethods()
+    public static function provideRequiredMethods()
     {
         return array(
             array('start'),

tests/Basic/ContentTest.php

@@ -46,7 +46,7 @@ public function testGetAttribute($attributeName, $attributeValue)
         $this->assertSame($attributeValue, $element->getAttribute($attributeName));
     }
 
-    public function getAttributeDataProvider()
+    public static function getAttributeDataProvider()
     {
         return array(
             array('with-value', 'some-value'),

tests/Basic/CookieTest.php

@@ -87,7 +87,7 @@ public function testCookieWithPaths($cookieRemovalMode)
         $this->assertStringContainsString('Previous cookie: NO', $session->getPage()->getText());
     }
 
-    public function cookieWithPathsDataProvider()
+    public static function cookieWithPathsDataProvider()
     {
         return array(
             array('session_reset'),
@@ -123,14 +123,6 @@ public function testCookieInSubPath($cookieRemovalMode)
         $this->assertStringContainsString('Previous cookie: NO', $session->getPage()->getText());
     }
 
-    public function cookieInSubPathProvider()
-    {
-        return array(
-            array('session_reset'),
-            array('cookie_delete'),
-        );
-    }
-
     public function testReset()
     {
         $this->getSession()->visit($this->pathTo('/cookie_page1.php'));

tests/Form/GeneralTest.php

@@ -76,7 +76,7 @@ public function testFormSubmitWays($submitVia)
         }
     }
 
-    public function formSubmitWaysDataProvider()
+    public static function formSubmitWaysDataProvider()
     {
         return array(
             array('Save'),

tests/Form/SelectTest.php

@@ -77,7 +77,7 @@ public function testElementSelectedStateCheck($selectName, $optionValue, $option
         $this->assertTrue($option->isSelected());
     }
 
-    public function elementSelectedStateCheckDataProvider()
+    public static function elementSelectedStateCheckDataProvider()
     {
         return array(
             array('select_number', '30', 'thirty'),

tests/Js/ChangeEventTest.php

@@ -58,7 +58,7 @@ public function testSetValueChangeEvent($elementId, $valueForEmpty, $valueForFil
         }
     }
 
-    public function setValueChangeEventDataProvider()
+    public static function setValueChangeEventDataProvider()
     {
         $file1 = __DIR__ . '/../../web-fixtures/file1.txt';
         $file2 = __DIR__ . '/../../web-fixtures/file2.txt';
@@ -90,7 +90,7 @@ public function testSelectOptionChangeEvent($elementId, $elementValue)
         $this->assertElementChangeCount($elementId);
     }
 
-    public function selectOptionChangeEventDataProvider()
+    public static function selectOptionChangeEventDataProvider()
     {
         return array(
             'select' => array('the-select', '30'),
@@ -140,7 +140,7 @@ public function testUncheckChangeEvent($useSetValue)
         $this->assertElementChangeCount('the-checked-checkbox');
     }
 
-    public function checkboxTestWayDataProvider()
+    public static function checkboxTestWayDataProvider()
     {
         return array(
             array(true),

tests/Js/EventsTest.php

@@ -114,7 +114,7 @@ public function testKeyboardEvents($modifier, $eventProperties)
         $this->assertEquals('key upped:78 / '.$eventProperties, $event->getText());
     }
 
-    public function provideKeyboardEventsModifiers()
+    public static function provideKeyboardEventsModifiers()
     {
         return array(
             'none' => array(null, '0 / 0 / 0 / 0'),

tests/Js/JavascriptEvaluationTest.php

@@ -55,7 +55,7 @@ public function testExecuteScript($script)
         $this->assertEquals('Hello world', $heading->getText());
     }
 
-    public function provideExecutedScript()
+    public static function provideExecutedScript()
     {
         return array(
             array('document.querySelector("h1").textContent = "Hello world"'),
@@ -77,7 +77,7 @@ public function testEvaluateJavascript($script)
         $this->assertSame(2, $this->getSession()->evaluateScript($script));
     }
 
-    public function provideEvaluatedScript()
+    public static function provideEvaluatedScript()
     {
         return array(
             array('1 + 1'),