Issue #2293767 by tstoeckler: Allow PSR-4 test classes to be used in Drupal 7.

Drupal 7.36, xxxx-xx-xx (development version)

-----------------------

- Changed the Simpletest module to allow PSR-4 test classes to be used in

  Drupal 7.

- Fixed a fatal error that occurred when using the Comment module's "Unpublish

  comment containing keyword(s)" action.

- Changed the "lang" attribute on language links to "xml:lang" so it validates

      // Also discover PSR-0 test classes, if the PHP version allows it.

      if (version_compare(PHP_VERSION, '5.3') > 0) {

        // Select all PSR-0 classes in the Tests namespace of all modules.

        // Select all PSR-0 and PSR-4 classes in the Tests namespace of all

        // modules.

        $system_list = db_query("SELECT name, filename FROM {system}")->fetchAllKeyed();

        foreach ($system_list as $name => $filename) {

          $module_dir = DRUPAL_ROOT . '/' . dirname($filename);

          // Search both the 'lib/Drupal/mymodule' directory (for PSR-0 classes)

          // and the 'src' directory (for PSR-4 classes).

          foreach(array('lib/Drupal/' . $name, 'src') as $subdir) {

            // Build directory in which the test files would reside.

          $tests_dir = DRUPAL_ROOT . '/' . dirname($filename) . '/lib/Drupal/' . $name . '/Tests';

            $tests_dir = $module_dir . '/' . $subdir . '/Tests';

            // Scan it for test files if it exists.

            if (is_dir($tests_dir)) {

              $files = file_scan_directory($tests_dir, '/.*\.php/');

              if (!empty($files)) {

              $basedir = DRUPAL_ROOT . '/' . dirname($filename) . '/lib/';

                foreach ($files as $file) {

                  // Convert the file name into the namespaced class name.

                  $replacements = array(

                    '/' => '\\',

                  $basedir => '',

                    $module_dir . '/' => '',

                    'lib/' => '',

                    'src/' => 'Drupal\\' . $name . '\\',

                    '.php' => '',

                  );

                  $classes[] = strtr($file->uri, $replacements);

            }

          }

        }

      }

      // Check that each class has a getInfo() method and store the information

      // in an array keyed with the group specified in the test information.

  // Only register PSR-0 class loading if we are on PHP 5.3 or higher.

  if (version_compare(PHP_VERSION, '5.3') > 0) {

    spl_autoload_register('_simpletest_autoload_psr0');

    spl_autoload_register('_simpletest_autoload_psr4_psr0');

  }

}

/**

 * Autoload callback to find PSR-0 test classes.

 * Autoload callback to find PSR-4 and PSR-0 test classes.

 *

 * Looks in the 'src/Tests' and in the 'lib/Drupal/mymodule/Tests' directory of

 * modules for the class.

 *

 * This will only work on classes where the namespace is of the pattern

 *   "Drupal\$extension\Tests\.."

 */

function _simpletest_autoload_psr0($class) {

function _simpletest_autoload_psr4_psr0($class) {

  // Static cache for extension paths.

  // This cache is lazily filled as soon as it is needed.

        $namespace = substr($class, 0, $nspos);

        $classname = substr($class, $nspos + 1);

        // Build the filepath where we expect the class to be defined.

        $path = dirname($extensions[$extension]) . '/lib/' .

        // Try the PSR-4 location first, and the PSR-0 location as a fallback.

        // Build the PSR-4 filepath where we expect the class to be defined.

        $psr4_path = dirname($extensions[$extension]) . '/src/' .

          str_replace('\\', '/', substr($namespace, strlen('Drupal\\' . $extension . '\\'))) . '/' .

          str_replace('_', '/', $classname) . '.php';

        // Include the file, if it does exist.

        if (file_exists($psr4_path)) {

          include $psr4_path;

        }

        else {

          // Build the PSR-0 filepath where we expect the class to be defined.

          $psr0_path = dirname($extensions[$extension]) . '/lib/' .

            str_replace('\\', '/', $namespace) . '/' .

            str_replace('_', '/', $classname) . '.php';

          // Include the file, if it does exist.

        if (file_exists($path)) {

          include $path;

          if (file_exists($psr0_path)) {

            include $psr0_path;

          }

        }

      }

    }

    $classes_all = simpletest_test_get_all();

    foreach (array(

      'Drupal\\simpletest\\Tests\\PSR0WebTest',

      'Drupal\\simpletest\\Tests\\PSR4WebTest',

      'Drupal\\psr_0_test\\Tests\\ExampleTest',

      'Drupal\\psr_4_test\\Tests\\ExampleTest',

    ) as $class) {

      $this->assert(!empty($classes_all['SimpleTest'][$class]), t('Class @class must be discovered by simpletest_test_get_all().', array('@class' => $class)));

    }

      // Don't expect PSR-0 tests to be discovered on older PHP versions.

      return;

    }

    // This one is provided by simpletest itself via PSR-0.

    // These are provided by simpletest itself via PSR-0 and PSR-4.

    $this->assertText('PSR0 web test');

    $this->assertText('PSR4 web test');

    $this->assertText('PSR0 example test: PSR-0 in disabled modules.');

    $this->assertText('PSR4 example test: PSR-4 in disabled modules.');

    $this->assertText('PSR0 example test: PSR-0 in nested subfolders.');

    $this->assertText('PSR4 example test: PSR-4 in nested subfolders.');

    // Test each test individually.

    foreach (array(

      'Drupal\\psr_0_test\\Tests\\ExampleTest',

      'Drupal\\psr_0_test\\Tests\\Nested\\NestedExampleTest',

      'Drupal\\psr_4_test\\Tests\\ExampleTest',

      'Drupal\\psr_4_test\\Tests\\Nested\\NestedExampleTest',

    ) as $class) {

      $this->drupalGet('admin/config/development/testing');

      $edit = array($class => TRUE);

<?php

namespace Drupal\simpletest\Tests;

class PSR4WebTest extends \DrupalWebTestCase {

  public static function getInfo() {

    return array(

      'name' => 'PSR4 web test',

      'description' => 'We want to assert that this PSR-4 test case is being discovered.',

      'group' => 'SimpleTest',

    );

  }

  function testArithmetics() {

    $this->assert(1 + 1 == 2, '1 + 1 == 2');

  }

}

name = PSR-4 Test cases

description = Test classes to be discovered by simpletest.

core = 7.x

hidden = TRUE

package = Testing