- Patch #318016 by Dave Reid: step one to standardizing type-hinting.

4 files changed, 8 insertions, 8 deletions

diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 0172ad7b1..926d97f08 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -672,7 +672,7 @@ class DrupalWebTestCase {
    * @return
    *   Role ID of newly created role, or FALSE if role creation failed.
    */
-  protected function _drupalCreateRole(Array $permissions = NULL) {
+  protected function _drupalCreateRole(array $permissions = NULL) {
     // Generate string version of permissions list.
     if ($permissions === NULL) {
       $permissions = array('access comments', 'access content', 'post comments', 'post comments without approval');
@@ -711,7 +711,7 @@ class DrupalWebTestCase {
    * @return
    *   TRUE or FALSE depending on whether the permissions are valid.
    */
-  protected function checkPermissions(Array $permissions, $reset = FALSE) {
+  protected function checkPermissions(array $permissions, $reset = FALSE) {
     static $available;
 
     if (!isset($available) || $reset) {
@@ -1024,7 +1024,7 @@ class DrupalWebTestCase {
    * @return
    *   The retrieved HTML string, also available as $this->drupalGetContent()
    */
-  protected function drupalGet($path, Array $options = array(), Array $headers = array()) {
+  protected function drupalGet($path, array $options = array(), array $headers = array()) {
     $options['absolute'] = TRUE;
 
     // We re-using a CURL connection here.  If that connection still has certain
@@ -1075,7 +1075,7 @@ class DrupalWebTestCase {
    *   An array containing additional HTTP request headers, each formatted as
    *   "name: value".
    */
-  protected function drupalPost($path, $edit, $submit, Array $options = array(), Array $headers = array()) {
+  protected function drupalPost($path, $edit, $submit, array $options = array(), array $headers = array()) {
     $submit_matches = FALSE;
     if (isset($path)) {
       $html = $this->drupalGet($path, $options);
@@ -1170,7 +1170,7 @@ class DrupalWebTestCase {
    * @return
    *   The retrieved headers, also available as $this->drupalGetContent()
    */
-  protected function drupalHead($path, Array $options = array(), Array $headers = array()) {
+  protected function drupalHead($path, array $options = array(), array $headers = array()) {
     $options['absolute'] = TRUE;
     $out = $this->curlExec(array(CURLOPT_NOBODY => TRUE, CURLOPT_URL => url($path, $options), CURLOPT_HTTPHEADER => $headers));
     $this->refreshVariables(); // Ensure that any changes to variables in the other thread are picked up.
diff --git a/modules/simpletest/tests/cache.test b/modules/simpletest/tests/cache.test
index 61acfa8e6..368947143 100644
--- a/modules/simpletest/tests/cache.test
+++ b/modules/simpletest/tests/cache.test
@@ -142,7 +142,7 @@ class CacheSavingCase extends CacheTestCase {
    * Test the saving and restoring of an object.
    */
   function testObject() {
-    $test_object = new StdClass();
+    $test_object = new stdClass();
     $test_object->test1 = $this->randomName('100');
     $test_object->test2 = 100;
     $test_object->test3 = array('drupal1', 'drupal2' => 'drupal3', 'drupal4' => array('drupal5', 'drupal6'));
diff --git a/modules/simpletest/tests/registry.test b/modules/simpletest/tests/registry.test
index 82d33b51b..e8abd231b 100644
--- a/modules/simpletest/tests/registry.test
+++ b/modules/simpletest/tests/registry.test
@@ -64,7 +64,7 @@ class RegistryParseFilesTestCase extends DrupalWebTestCase {
     // Create files with some php to parse - one 'new', one 'existing' so
     // we test all the important code paths in _registry_parse_files.
     foreach ($this->fileTypes as $fileType) {
-      $this->$fileType = new StdClass();
+      $this->$fileType = new stdClass();
       $this->$fileType->fileName = file_directory_path() . '/registry_test_' . md5(rand());
       $this->$fileType->functionName = 'registry_test_function' . md5(rand());
       $this->$fileType->className = 'registry_test_class' . md5(rand());
diff --git a/modules/system/system.test b/modules/system/system.test
index 7e039428b..8a888a052 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -132,7 +132,7 @@ class EnableDisableCoreTestCase extends DrupalWebTestCase {
    * @param array $modules Modules to check.
    * @param boolean $enabled Module state.
    */
-  function assertModules(Array $modules, $enabled) {
+  function assertModules(array $modules, $enabled) {
     module_list(TRUE);
     foreach ($modules as $module) {
       if ($enabled) {