diff --git a/core/includes/database.inc b/core/includes/database.inc index 216c88e..9e1711a 100644 --- a/core/includes/database.inc +++ b/core/includes/database.inc @@ -664,7 +664,7 @@ function db_find_tables($table_expression) { } function _db_create_keys_sql($spec) { - return Database::getConnection()->schema()->createKeysSql($spec); + return Database::getConnection()->schema()->createKeysSQL($spec); } /** diff --git a/core/includes/file.inc b/core/includes/file.inc index 133d64f..ff0251b 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -2101,12 +2101,12 @@ function file_upload_max_size() { */ function file_get_mimetype($uri, $mapping = NULL) { if ($wrapper = file_stream_wrapper_get_instance_by_uri($uri)) { - return $wrapper->getMimeType($uri, $mapping); + return $wrapper->getMIMEType($uri, $mapping); } else { - // getMimeType() is not implementation specific, so we can directly + // getMIMEType() is not implementation specific, so we can directly // call it without an instance. - return LocalStream::getMimeType($uri, $mapping); + return LocalStream::getMIMEType($uri, $mapping); } } diff --git a/core/includes/mail.inc b/core/includes/mail.inc index f58a76e..9b05795 100644 --- a/core/includes/mail.inc +++ b/core/includes/mail.inc @@ -201,14 +201,14 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N * - format: Allows to preprocess, format, and postprocess a mail * message before it is passed to the sending system. By default, all messages * may contain HTML and are converted to plain-text by the - * Drupal\Core\Mail\PhpMail implementation. For example, an alternative + * Drupal\Core\Mail\PHPMail implementation. For example, an alternative * implementation could override the default implementation and additionally * sanitize the HTML for usage in a MIME-encoded e-mail, but still invoking - * the Drupal\Core\Mail\PhpMail implementation to generate an alternate + * the Drupal\Core\Mail\PHPMail implementation to generate an alternate * plain-text version for sending. * - mail: Sends a message through a custom mail sending engine. * By default, all messages are sent via PHP's mail() function by the - * Drupal\Core\Mail\PhpMail implementation. + * Drupal\Core\Mail\PHPMail implementation. * * The selection of a particular implementation is controlled via the variable * 'mail_system', which is a keyed array. The default implementation @@ -225,7 +225,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N * * @code * array( - * 'default-system' => 'Drupal\Core\Mail\PhpMail', + * 'default-system' => 'Drupal\Core\Mail\PHPMail', * 'user' => 'DevelMailLog', * ); * @endcode @@ -235,7 +235,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N * * @code * array( - * 'default-system' => 'Drupal\Core\Mail\PhpMail', + * 'default-system' => 'Drupal\Core\Mail\PHPMail', * 'user' => 'DevelMailLog', * 'contact_page_autoreply' => 'DrupalDevNullMailSend', * ); @@ -260,7 +260,7 @@ function drupal_mail_system($module, $key) { $id = $module . '_' . $key; - $configuration = variable_get('mail_system', array('default-system' => 'Drupal\Core\Mail\PhpMail')); + $configuration = variable_get('mail_system', array('default-system' => 'Drupal\Core\Mail\PHPMail')); // Look for overrides for the default class, starting from the most specific // id, and falling back to the module name. diff --git a/core/lib/Drupal/Component/Uuid/Com.php b/core/lib/Drupal/Component/UUID/COM.php similarity index 73% rename from core/lib/Drupal/Component/Uuid/Com.php rename to core/lib/Drupal/Component/UUID/COM.php index 41cfba4..8d133ab 100644 --- a/core/lib/Drupal/Component/Uuid/Com.php +++ b/core/lib/Drupal/Component/UUID/COM.php @@ -2,17 +2,17 @@ /** * @file - * Definition of Drupal\Component\Uuid\Com. + * Definition of Drupal\Component\UUID\COM. */ -namespace Drupal\Component\Uuid; +namespace Drupal\Component\UUID; /** * UUID implementation using the Windows internal GUID extension. * * @see http://php.net/com_create_guid */ -class Com implements UuidInterface { +class COM implements UUIDInterface { public function generate() { // Remove {} wrapper and make lower case to keep result consistent. return drupal_strtolower(trim(com_create_guid(), '{}')); diff --git a/core/lib/Drupal/Component/UUID/PECL.php b/core/lib/Drupal/Component/UUID/PECL.php new file mode 100644 index 0000000..c86694b --- /dev/null +++ b/core/lib/Drupal/Component/UUID/PECL.php @@ -0,0 +1,21 @@ +plugin->generate(); @@ -70,17 +70,17 @@ class Uuid { return $plugin; } - $plugin = 'Drupal\Component\Uuid\Php'; + $plugin = 'Drupal\Component\UUID\PHP'; // Debian/Ubuntu uses the (broken) OSSP extension as their UUID // implementation. The OSSP implementation is not compatible with the // PECL functions. if (function_exists('uuid_create') && !function_exists('uuid_make')) { - $plugin = 'Drupal\Component\Uuid\Pecl'; + $plugin = 'Drupal\Component\UUID\PECL'; } // Try to use the COM implementation for Windows users. elseif (function_exists('com_create_guid')) { - $plugin = 'Drupal\Component\Uuid\Com'; + $plugin = 'Drupal\Component\UUID\Com'; } return $plugin; } diff --git a/core/lib/Drupal/Component/Uuid/UuidInterface.php b/core/lib/Drupal/Component/UUID/UUIDInterface.php similarity index 70% rename from core/lib/Drupal/Component/Uuid/UuidInterface.php rename to core/lib/Drupal/Component/UUID/UUIDInterface.php index d1225ba..3243ae2 100644 --- a/core/lib/Drupal/Component/Uuid/UuidInterface.php +++ b/core/lib/Drupal/Component/UUID/UUIDInterface.php @@ -2,15 +2,15 @@ /** * @file - * Definition of Drupal\Component\Uuid\UuidInterface. + * Definition of Drupal\Component\UUID\UUIDInterface. */ -namespace Drupal\Component\Uuid; +namespace Drupal\Component\UUID; /** * Interface that defines a UUID backend. */ -interface UuidInterface { +interface UUIDInterface { /** * Generates a Universally Unique IDentifier (UUID). diff --git a/core/lib/Drupal/Component/Uuid/Pecl.php b/core/lib/Drupal/Component/Uuid/Pecl.php deleted file mode 100644 index 3d4cb27..0000000 --- a/core/lib/Drupal/Component/Uuid/Pecl.php +++ /dev/null @@ -1,21 +0,0 @@ -connection->getConnectionOptions(); // Provide defaults if needed. @@ -97,11 +97,11 @@ class Schema extends DatabaseSchema { // Add the SQL statement for each field. foreach ($table['fields'] as $field_name => $field) { - $sql .= $this->createFieldSql($field_name, $this->processField($field)) . ", \n"; + $sql .= $this->createFieldSQL($field_name, $this->processField($field)) . ", \n"; } // Process keys & indexes. - $keys = $this->createKeysSql($table); + $keys = $this->createKeysSQL($table); if (count($keys)) { $sql .= implode(", \n", $keys) . ", \n"; } @@ -137,7 +137,7 @@ class Schema extends DatabaseSchema { * @param $spec * The field specification, as per the schema data structure format. */ - protected function createFieldSql($name, $spec) { + protected function createFieldSQL($name, $spec) { $sql = "`" . $name . "` " . $spec['mysql_type']; if (in_array($spec['mysql_type'], array('VARCHAR', 'CHAR', 'TINYTEXT', 'MEDIUMTEXT', 'LONGTEXT', 'TEXT'))) { @@ -262,27 +262,27 @@ class Schema extends DatabaseSchema { return $map; } - protected function createKeysSql($spec) { + protected function createKeysSQL($spec) { $keys = array(); if (!empty($spec['primary key'])) { - $keys[] = 'PRIMARY KEY (' . $this->createKeysSqlHelper($spec['primary key']) . ')'; + $keys[] = 'PRIMARY KEY (' . $this->createKeysSQLHelper($spec['primary key']) . ')'; } if (!empty($spec['unique keys'])) { foreach ($spec['unique keys'] as $key => $fields) { - $keys[] = 'UNIQUE KEY `' . $key . '` (' . $this->createKeysSqlHelper($fields) . ')'; + $keys[] = 'UNIQUE KEY `' . $key . '` (' . $this->createKeysSQLHelper($fields) . ')'; } } if (!empty($spec['indexes'])) { foreach ($spec['indexes'] as $index => $fields) { - $keys[] = 'INDEX `' . $index . '` (' . $this->createKeysSqlHelper($fields) . ')'; + $keys[] = 'INDEX `' . $index . '` (' . $this->createKeysSQLHelper($fields) . ')'; } } return $keys; } - protected function createKeySql($fields) { + protected function createKeySQL($fields) { $return = array(); foreach ($fields as $field) { if (is_array($field)) { @@ -295,7 +295,7 @@ class Schema extends DatabaseSchema { return implode(', ', $return); } - protected function createKeysSqlHelper($fields) { + protected function createKeysSQLHelper($fields) { $return = array(); foreach ($fields as $field) { if (is_array($field)) { @@ -343,8 +343,8 @@ class Schema extends DatabaseSchema { $spec['not null'] = FALSE; } $query = 'ALTER TABLE {' . $table . '} ADD '; - $query .= $this->createFieldSql($field, $this->processField($spec)); - if ($keys_sql = $this->createKeysSql($keys_new)) { + $query .= $this->createFieldSQL($field, $this->processField($spec)); + if ($keys_sql = $this->createKeysSQL($keys_new)) { $query .= ', ADD ' . implode(', ADD ', $keys_sql); } $this->connection->query($query); @@ -406,7 +406,7 @@ class Schema extends DatabaseSchema { throw new SchemaObjectExistsException(t("Cannot add primary key to table %table: primary key already exists.", array('%table' => $table))); } - $this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . $this->createKeySql($fields) . ')'); + $this->connection->query('ALTER TABLE {' . $table . '} ADD PRIMARY KEY (' . $this->createKeySQL($fields) . ')'); } public function dropPrimaryKey($table) { @@ -426,7 +426,7 @@ class Schema extends DatabaseSchema { throw new SchemaObjectExistsException(t("Cannot add unique key %name to table %table: unique key already exists.", array('%table' => $table, '%name' => $name))); } - $this->connection->query('ALTER TABLE {' . $table . '} ADD UNIQUE KEY `' . $name . '` (' . $this->createKeySql($fields) . ')'); + $this->connection->query('ALTER TABLE {' . $table . '} ADD UNIQUE KEY `' . $name . '` (' . $this->createKeySQL($fields) . ')'); } public function dropUniqueKey($table, $name) { @@ -446,7 +446,7 @@ class Schema extends DatabaseSchema { throw new SchemaObjectExistsException(t("Cannot add index %name to table %table: index already exists.", array('%table' => $table, '%name' => $name))); } - $this->connection->query('ALTER TABLE {' . $table . '} ADD INDEX `' . $name . '` (' . $this->createKeySql($fields) . ')'); + $this->connection->query('ALTER TABLE {' . $table . '} ADD INDEX `' . $name . '` (' . $this->createKeySQL($fields) . ')'); } public function dropIndex($table, $name) { @@ -466,8 +466,8 @@ class Schema extends DatabaseSchema { throw new SchemaObjectExistsException(t("Cannot rename field %table.%name to %name_new: target field already exists.", array('%table' => $table, '%name' => $field, '%name_new' => $field_new))); } - $sql = 'ALTER TABLE {' . $table . '} CHANGE `' . $field . '` ' . $this->createFieldSql($field_new, $this->processField($spec)); - if ($keys_sql = $this->createKeysSql($keys_new)) { + $sql = 'ALTER TABLE {' . $table . '} CHANGE `' . $field . '` ' . $this->createFieldSQL($field_new, $this->processField($spec)); + if ($keys_sql = $this->createKeysSQL($keys_new)) { $sql .= ', ADD ' . implode(', ADD ', $keys_sql); } $this->connection->query($sql); diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php index 6ce4a0a..0d0a465 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php @@ -126,10 +126,10 @@ class Schema extends DatabaseSchema { * @return * An array of SQL statements to create the table. */ - protected function createTableSql($name, $table) { + protected function createTableSQL($name, $table) { $sql_fields = array(); foreach ($table['fields'] as $field_name => $field) { - $sql_fields[] = $this->createFieldSql($field_name, $this->processField($field)); + $sql_fields[] = $this->createFieldSQL($field_name, $this->processField($field)); } $sql_keys = array(); @@ -153,7 +153,7 @@ class Schema extends DatabaseSchema { if (isset($table['indexes']) && is_array($table['indexes'])) { foreach ($table['indexes'] as $key_name => $key) { - $statements[] = $this->_createIndexSql($name, $key_name, $key); + $statements[] = $this->_createIndexSQL($name, $key_name, $key); } } @@ -184,7 +184,7 @@ class Schema extends DatabaseSchema { * @param $spec * The field specification, as per the schema data structure format. */ - protected function createFieldSql($name, $spec) { + protected function createFieldSQL($name, $spec) { $sql = $name . ' ' . $spec['pgsql_type']; if (isset($spec['type']) && $spec['type'] == 'serial') { @@ -309,7 +309,7 @@ class Schema extends DatabaseSchema { return $map; } - protected function _createKeySql($fields) { + protected function _createKeySQL($fields) { $return = array(); foreach ($fields as $field) { if (is_array($field)) { @@ -373,7 +373,7 @@ class Schema extends DatabaseSchema { $spec['not null'] = FALSE; } $query = 'ALTER TABLE {' . $table . '} ADD COLUMN '; - $query .= $this->createFieldSql($field, $this->processField($spec)); + $query .= $this->createFieldSQL($field, $this->processField($spec)); $this->connection->query($query); if (isset($spec['initial'])) { $this->connection->update($table) @@ -491,7 +491,7 @@ class Schema extends DatabaseSchema { throw new SchemaObjectExistsException(t("Cannot add index %name to table %table: index already exists.", array('%table' => $table, '%name' => $name))); } - $this->connection->query($this->_createIndexSql($table, $name, $fields)); + $this->connection->query($this->_createIndexSQL($table, $name, $fields)); } public function dropIndex($table, $name) { @@ -589,9 +589,9 @@ class Schema extends DatabaseSchema { } } - protected function _createIndexSql($table, $name, $fields) { + protected function _createIndexSQL($table, $name, $fields) { $query = 'CREATE INDEX "' . $this->prefixNonTable($table, $name, 'idx') . '" ON {' . $table . '} ('; - $query .= $this->_createKeySql($fields) . ')'; + $query .= $this->_createKeySQL($fields) . ')'; return $query; } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php index 823cd13..8c6fe32 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php @@ -48,26 +48,26 @@ class Schema extends DatabaseSchema { * @return * An array of SQL statements to create the table. */ - public function createTableSql($name, $table) { + public function createTableSQL($name, $table) { $sql = array(); - $sql[] = "CREATE TABLE {" . $name . "} (\n" . $this->createColumsSql($name, $table) . "\n);\n"; - return array_merge($sql, $this->createIndexSql($name, $table)); + $sql[] = "CREATE TABLE {" . $name . "} (\n" . $this->createColumsSQL($name, $table) . "\n);\n"; + return array_merge($sql, $this->createIndexSQL($name, $table)); } /** * Build the SQL expression for indexes. */ - protected function createIndexSql($tablename, $schema) { + protected function createIndexSQL($tablename, $schema) { $sql = array(); $info = $this->getPrefixInfo($tablename); if (!empty($schema['unique keys'])) { foreach ($schema['unique keys'] as $key => $fields) { - $sql[] = 'CREATE UNIQUE INDEX ' . $info['schema'] . '.' . $info['table'] . '_' . $key . ' ON ' . $info['table'] . ' (' . $this->createKeySql($fields) . "); \n"; + $sql[] = 'CREATE UNIQUE INDEX ' . $info['schema'] . '.' . $info['table'] . '_' . $key . ' ON ' . $info['table'] . ' (' . $this->createKeySQL($fields) . "); \n"; } } if (!empty($schema['indexes'])) { foreach ($schema['indexes'] as $key => $fields) { - $sql[] = 'CREATE INDEX ' . $info['schema'] . '.' . $info['table'] . '_' . $key . ' ON ' . $info['table'] . ' (' . $this->createKeySql($fields) . "); \n"; + $sql[] = 'CREATE INDEX ' . $info['schema'] . '.' . $info['table'] . '_' . $key . ' ON ' . $info['table'] . ' (' . $this->createKeySQL($fields) . "); \n"; } } return $sql; @@ -76,7 +76,7 @@ class Schema extends DatabaseSchema { /** * Build the SQL expression for creating columns. */ - protected function createColumsSql($tablename, $schema) { + protected function createColumsSQL($tablename, $schema) { $sql_array = array(); // Add the SQL statement for each field. @@ -86,12 +86,12 @@ class Schema extends DatabaseSchema { unset($schema['primary key'][$key]); } } - $sql_array[] = $this->createFieldSql($name, $this->processField($field)); + $sql_array[] = $this->createFieldSQL($name, $this->processField($field)); } // Process keys. if (!empty($schema['primary key'])) { - $sql_array[] = " PRIMARY KEY (" . $this->createKeySql($schema['primary key']) . ")"; + $sql_array[] = " PRIMARY KEY (" . $this->createKeySQL($schema['primary key']) . ")"; } return implode(", \n", $sql_array); @@ -100,7 +100,7 @@ class Schema extends DatabaseSchema { /** * Build the SQL expression for keys. */ - protected function createKeySql($fields) { + protected function createKeySQL($fields) { $return = array(); foreach ($fields as $field) { if (is_array($field)) { @@ -152,7 +152,7 @@ class Schema extends DatabaseSchema { * @param $spec * The field specification, as per the schema data structure format. */ - protected function createFieldSql($name, $spec) { + protected function createFieldSQL($name, $spec) { if (!empty($spec['auto_increment'])) { $sql = $name . " INTEGER PRIMARY KEY AUTOINCREMENT"; if (!empty($spec['unsigned'])) { @@ -269,7 +269,7 @@ class Schema extends DatabaseSchema { } // Recreate the indexes. - $statements = $this->createIndexSql($new_name, $schema); + $statements = $this->createIndexSQL($new_name, $schema); foreach ($statements as $statement) { $this->connection->query($statement); } @@ -298,7 +298,7 @@ class Schema extends DatabaseSchema { if (empty($keys_new) && (empty($specification['not null']) || isset($specification['default']))) { // When we don't have to create new keys and we are not creating a // NOT NULL column without a default value, we can use the quicker version. - $query = 'ALTER TABLE {' . $table . '} ADD ' . $this->createFieldSql($field, $this->processField($specification)); + $query = 'ALTER TABLE {' . $table . '} ADD ' . $this->createFieldSQL($field, $this->processField($specification)); $this->connection->query($query); // Apply the initial value if set. @@ -574,7 +574,7 @@ class Schema extends DatabaseSchema { } $schema['indexes'][$name] = $fields; - $statements = $this->createIndexSql($table, $schema); + $statements = $this->createIndexSQL($table, $schema); foreach ($statements as $statement) { $this->connection->query($statement); } @@ -606,7 +606,7 @@ class Schema extends DatabaseSchema { } $schema['unique keys'][$name] = $fields; - $statements = $this->createIndexSql($table, $schema); + $statements = $this->createIndexSQL($table, $schema); foreach ($statements as $statement) { $this->connection->query($statement); } @@ -688,4 +688,4 @@ class Schema extends DatabaseSchema { )); return $result->fetchAllKeyed(0, 0); } -} \ No newline at end of file +} diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php index 62e1327..6a597d0 100644 --- a/core/lib/Drupal/Core/Database/Schema.php +++ b/core/lib/Drupal/Core/Database/Schema.php @@ -661,7 +661,7 @@ abstract class Schema implements PlaceholderInterface { if ($this->tableExists($name)) { throw new SchemaObjectExistsException(t('Table %name already exists.', array('%name' => $name))); } - $statements = $this->createTableSql($name, $table); + $statements = $this->createTableSQL($name, $table); foreach ($statements as $statement) { $this->connection->query($statement); } diff --git a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php index 637d48d..af67aab 100644 --- a/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/ViewSubscriber.php @@ -19,7 +19,7 @@ use Drupal\Core\ContentNegotiation; * Main subscriber for VIEW HTTP responses. * * @todo This needs to get refactored to be extensible so that we can handle - * more than just Html and Drupal-specific JSON requests. See + * more than just HTML and Drupal-specific JSON requests. See * http://drupal.org/node/1594870 */ class ViewSubscriber implements EventSubscriberInterface { @@ -109,7 +109,7 @@ class ViewSubscriber implements EventSubscriberInterface { * @param Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent $event * The Event to process. */ - public function onHtml(GetResponseForControllerResultEvent $event) { + public function onHTML(GetResponseForControllerResultEvent $event) { $page_callback_result = $event->getControllerResult(); return new Response(drupal_render_page($page_callback_result)); } diff --git a/core/lib/Drupal/Core/ExceptionController.php b/core/lib/Drupal/Core/ExceptionController.php index b163395..fb5916f 100644 --- a/core/lib/Drupal/Core/ExceptionController.php +++ b/core/lib/Drupal/Core/ExceptionController.php @@ -78,7 +78,7 @@ class ExceptionController { * @param Symfony\Component\HttpFoundation\Request $request * The request object that triggered this exception. */ - public function on405Html(FlattenException $exception, Request $request) { + public function on405HTML(FlattenException $exception, Request $request) { $event->setResponse(new Response('Method Not Allowed', 405)); } @@ -90,7 +90,7 @@ class ExceptionController { * @param Symfony\Component\HttpFoundation\Request $request * The request object that triggered this exception. */ - public function on403Html(FlattenException $exception, Request $request) { + public function on403HTML(FlattenException $exception, Request $request) { $system_path = $request->attributes->get('system_path'); watchdog('access denied', $system_path, NULL, WATCHDOG_WARNING); @@ -146,7 +146,7 @@ class ExceptionController { * @param Sonfony\Component\HttpFoundation\Request $request * The request object that triggered this exception. */ - public function on404Html(FlattenException $exception, Request $request) { + public function on404HTML(FlattenException $exception, Request $request) { watchdog('page not found', check_plain($request->attributes->get('system_path')), NULL, WATCHDOG_WARNING); // Check for and return a fast 404 page if configured. @@ -211,7 +211,7 @@ class ExceptionController { * @param Symfony\Component\HttpFoundation\Request $request * The request object that triggered this exception. */ - public function on500Html(FlattenException $exception, Request $request) { + public function on500HTML(FlattenException $exception, Request $request) { $error = $this->decodeException($exception); // Because the kernel doesn't run until full bootstrap, we know that diff --git a/core/lib/Drupal/Core/Mail/PhpMail.php b/core/lib/Drupal/Core/Mail/PHPMail.php similarity index 97% rename from core/lib/Drupal/Core/Mail/PhpMail.php rename to core/lib/Drupal/Core/Mail/PHPMail.php index 668cc51..58bcfb7 100644 --- a/core/lib/Drupal/Core/Mail/PhpMail.php +++ b/core/lib/Drupal/Core/Mail/PHPMail.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\Mail\PhpMail. + * Definition of Drupal\Core\Mail\PHPMail. */ namespace Drupal\Core\Mail; @@ -10,7 +10,7 @@ namespace Drupal\Core\Mail; /** * The default Drupal mail backend using PHP's mail function. */ -class PhpMail implements MailInterface { +class PHPMail implements MailInterface { /** * Concatenates and wrap the e-mail body for plain-text mails. diff --git a/core/lib/Drupal/Core/Mail/VariableLog.php b/core/lib/Drupal/Core/Mail/VariableLog.php index 3dfe5b6..c1afabe 100644 --- a/core/lib/Drupal/Core/Mail/VariableLog.php +++ b/core/lib/Drupal/Core/Mail/VariableLog.php @@ -13,10 +13,10 @@ namespace Drupal\Core\Mail; * * This class is for running tests or for development. */ -class VariableLog extends PhpMail implements MailInterface { +class VariableLog extends PHPMail implements MailInterface { /** - * Overrides Drupal\Core\Mail\PhpMail::mail(). + * Overrides Drupal\Core\Mail\PHPMail::mail(). * * Accepts an e-mail message and store it in a variable. */ diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php index b6e1dd1..1186945 100644 --- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php +++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php @@ -94,9 +94,9 @@ abstract class LocalStream implements StreamWrapperInterface { } /** - * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getMimeType(). + * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getMIMEType(). */ - static function getMimeType($uri, $mapping = NULL) { + static function getMIMEType($uri, $mapping = NULL) { if (!isset($mapping)) { // The default file map, defined in file.mimetypes.inc is quite big. // We only load it when necessary. diff --git a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/PHPStreamWrapperInterface.php similarity index 90% rename from core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php rename to core/lib/Drupal/Core/StreamWrapper/PHPStreamWrapperInterface.php index fad393f..2c50cec 100644 --- a/core/lib/Drupal/Core/StreamWrapper/PhpStreamWrapperInterface.php +++ b/core/lib/Drupal/Core/StreamWrapper/PHPStreamWrapperInterface.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\Core\StreamWrapper\PhpStreamWrapperInterface. + * Definition of Drupal\Core\StreamWrapper\PHPStreamWrapperInterface. */ namespace Drupal\Core\StreamWrapper; @@ -12,7 +12,7 @@ namespace Drupal\Core\StreamWrapper; * * @see http://www.php.net/manual/class.streamwrapper.php */ -interface PhpStreamWrapperInterface { +interface PHPStreamWrapperInterface { public function stream_open($uri, $mode, $options, &$opened_url); public function stream_close(); public function stream_lock($operation); diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php index 15ba2cf..710a59e 100644 --- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php +++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php @@ -27,7 +27,7 @@ namespace Drupal\Core\StreamWrapper; * Extends the StreamWrapperInterface with methods expected by Drupal stream * wrapper classes. */ -interface StreamWrapperInterface extends PhpStreamWrapperInterface { +interface StreamWrapperInterface extends PHPStreamWrapperInterface { /** * Sets the absolute stream resource URI. @@ -75,7 +75,7 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface { * @return string * Returns a string containing the MIME type of the resource. */ - public static function getMimeType($uri, $mapping = NULL); + public static function getMIMEType($uri, $mapping = NULL); /** * Changes permissions of the resource. diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php index 9483170..be66b3a 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php @@ -202,7 +202,7 @@ class AggregatorTestBase extends WebTestBase { * @return * Path to valid OPML file. */ - function getValidOpml($feeds) { + function getValidOPML($feeds) { // Properly escape URLs so that XML parsers don't choke on them. foreach ($feeds as &$feed) { $feed['url'] = htmlspecialchars($feed['url']); @@ -241,7 +241,7 @@ EOF; * @return * Path to invalid OPML file. */ - function getInvalidOpml() { + function getInvalidOPML() { $opml = << @@ -258,7 +258,7 @@ EOF; * @return * Path to empty OPML file. */ - function getEmptyOpml() { + function getEmptyOPML() { $opml = << @@ -284,7 +284,7 @@ EOF; return $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'aggregator') . '/tests/aggregator_test_atom.xml'; } - function getHtmlEntitiesSample() { + function getHTMLEntitiesSample() { return $GLOBALS['base_url'] . '/' . drupal_get_path('module', 'aggregator') . '/tests/aggregator_test_title_entities.xml'; } diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php index 97f4392..c674a0e 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/FeedParserTest.php @@ -57,8 +57,8 @@ class FeedParserTest extends AggregatorTestBase { /** * Tests a feed that uses HTML entities in item titles. */ - function testHtmlEntitiesSample() { - $feed = $this->createFeed($this->getHtmlEntitiesSample()); + function testHTMLEntitiesSample() { + $feed = $this->createFeed($this->getHTMLEntitiesSample()); aggregator_refresh($feed); $this->drupalGet('aggregator/sources/' . $feed->fid); $this->assertResponse(200, t('Feed %name exists.', array('%name' => $feed->title))); diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOPMLTest.php similarity index 93% rename from core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php rename to core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOPMLTest.php index fa79f1c..9dbad94 100644 --- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOpmlTest.php +++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/ImportOPMLTest.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Drupal\aggregator\Tests\ImportOpmlTest. + * Definition of Drupal\aggregator\Tests\ImportOPMLTest. */ namespace Drupal\aggregator\Tests; -class ImportOpmlTest extends AggregatorTestBase { +class ImportOPMLTest extends AggregatorTestBase { public static function getInfo() { return array( 'name' => 'Import feeds from OPML functionality', @@ -48,7 +48,7 @@ class ImportOpmlTest extends AggregatorTestBase { $this->drupalPost('admin/config/services/aggregator/add/opml', $edit, t('Import')); $this->assertRaw(t('You must either upload a file or enter a URL.'), t('Error if no fields are filled.')); - $path = $this->getEmptyOpml(); + $path = $this->getEmptyOPML(); $edit = array( 'files[upload]' => $path, 'remote' => file_create_url($path), @@ -70,11 +70,11 @@ class ImportOpmlTest extends AggregatorTestBase { function submitImportForm() { $before = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField(); - $form['files[upload]'] = $this->getInvalidOpml(); + $form['files[upload]'] = $this->getInvalidOPML(); $this->drupalPost('admin/config/services/aggregator/add/opml', $form, t('Import')); $this->assertText(t('No new feed has been added.'), t('Attempting to upload invalid XML.')); - $edit = array('remote' => file_create_url($this->getEmptyOpml())); + $edit = array('remote' => file_create_url($this->getEmptyOPML())); $this->drupalPost('admin/config/services/aggregator/add/opml', $edit, t('Import')); $this->assertText(t('No new feed has been added.'), t('Attempting to load empty OPML from remote URL.')); @@ -98,7 +98,7 @@ class ImportOpmlTest extends AggregatorTestBase { $feeds[1] = $this->getFeedEditArray(); $feeds[2] = $this->getFeedEditArray(); $edit = array( - 'files[upload]' => $this->getValidOpml($feeds), + 'files[upload]' => $this->getValidOPML($feeds), 'refresh' => '900', 'category[1]' => $category, ); @@ -124,7 +124,7 @@ class ImportOpmlTest extends AggregatorTestBase { $this->assertTrue($category, t('Categories are correct.')); } - function testOpmlImport() { + function testOPMLImport() { $this->openImportForm(); $this->validateImportFormFields(); $this->submitImportForm(); diff --git a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php b/core/modules/block/lib/Drupal/block/Tests/BlockHTMLIdTest.php similarity index 89% rename from core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php rename to core/modules/block/lib/Drupal/block/Tests/BlockHTMLIdTest.php index c0891ac..8e3c5d5 100644 --- a/core/modules/block/lib/Drupal/block/Tests/BlockHtmlIdTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/BlockHTMLIdTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\block\Tests\BlockHtmlIdTest. + * Definition of Drupal\block\Tests\BlockHTMLIdTest. */ namespace Drupal\block\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Test block HTML id validity. */ -class BlockHtmlIdTest extends WebTestBase { +class BlockHTMLIdTest extends WebTestBase { public static function getInfo() { return array( @@ -41,7 +41,7 @@ class BlockHtmlIdTest extends WebTestBase { /** * Test valid HTML id. */ - function testHtmlId() { + function testHTMLId() { $this->drupalGet(''); $this->assertRaw('block-block-test-test-html-id', t('HTML id for test block is valid.')); } diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentRSSTest.php similarity index 88% rename from core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php rename to core/modules/comment/lib/Drupal/comment/Tests/CommentRSSTest.php index 3c9559f..c021fe3 100644 --- a/core/modules/comment/lib/Drupal/comment/Tests/CommentRssTest.php +++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentRSSTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\comment\Tests\CommentRssTest. + * Definition of Drupal\comment\Tests\CommentRSSTest. */ namespace Drupal\comment\Tests; @@ -10,7 +10,7 @@ namespace Drupal\comment\Tests; /** * Tests for Comment module integration with RSS feeds. */ -class CommentRssTest extends CommentTestBase { +class CommentRSSTest extends CommentTestBase { public static function getInfo() { return array( 'name' => 'Comment RSS', @@ -22,7 +22,7 @@ class CommentRssTest extends CommentTestBase { /** * Tests comments as part of an RSS feed. */ - function testCommentRss() { + function testCommentRSS() { // Find comment in RSS feed. $this->drupalLogin($this->web_user); $comment = $this->postComment($this->node, $this->randomName(), $this->randomName()); diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiInfoTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPIInfoTest.php similarity index 94% rename from core/modules/entity/lib/Drupal/entity/Tests/EntityApiInfoTest.php rename to core/modules/entity/lib/Drupal/entity/Tests/EntityAPIInfoTest.php index 0c02276..bc9a291 100644 --- a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiInfoTest.php +++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPIInfoTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\entity\Tests\EntityApiInfoTest. + * Definition of Drupal\entity\Tests\EntityAPIInfoTest. */ namespace Drupal\entity\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests Entity API base functionality. */ -class EntityApiInfoTest extends WebTestBase { +class EntityAPIInfoTest extends WebTestBase { public static function getInfo() { return array( diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPITest.php similarity index 97% rename from core/modules/entity/lib/Drupal/entity/Tests/EntityApiTest.php rename to core/modules/entity/lib/Drupal/entity/Tests/EntityAPITest.php index 5eb245f..860d8ce 100644 --- a/core/modules/entity/lib/Drupal/entity/Tests/EntityApiTest.php +++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityAPITest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\entity\Tests\EntityApiTest. + * Definition of Drupal\entity\Tests\EntityAPITest. */ namespace Drupal\entity\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests the basic Entity API. */ -class EntityApiTest extends WebTestBase { +class EntityAPITest extends WebTestBase { public static function getInfo() { return array( diff --git a/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php b/core/modules/entity/lib/Drupal/entity/Tests/EntityCRUDHookTest.php similarity index 99% rename from core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php rename to core/modules/entity/lib/Drupal/entity/Tests/EntityCRUDHookTest.php index dffa6fd..de75cb8 100644 --- a/core/modules/entity/lib/Drupal/entity/Tests/EntityCrudHookTest.php +++ b/core/modules/entity/lib/Drupal/entity/Tests/EntityCRUDHookTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\entity\Tests\EntityCrudHookTest. + * Definition of Drupal\entity\Tests\EntityCRUDHookTest. */ namespace Drupal\entity\Tests; @@ -21,7 +21,7 @@ use Drupal\simpletest\WebTestBase; * As well as all type-specific hooks, like hook_node_insert(), * hook_comment_update(), etc. */ -class EntityCrudHookTest extends WebTestBase { +class EntityCRUDHookTest extends WebTestBase { protected $ids = array(); diff --git a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php index 347f55c..6cb43eb 100644 --- a/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/BulkDeleteTest.php @@ -142,7 +142,7 @@ class BulkDeleteTest extends FieldTestBase { * operate on the deleted data and instance. * * This tests how EntityFieldQuery interacts with - * field_delete_instance() and could be moved to FieldCrudTestCase, + * field_delete_instance() and could be moved to FieldCRUDTestCase, * but depends on this class's setUp(). */ function testDeleteFieldInstance() { diff --git a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php b/core/modules/field/lib/Drupal/field/Tests/CRUDTest.php similarity index 99% rename from core/modules/field/lib/Drupal/field/Tests/CrudTest.php rename to core/modules/field/lib/Drupal/field/Tests/CRUDTest.php index be93f80..4e060a5 100644 --- a/core/modules/field/lib/Drupal/field/Tests/CrudTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/CRUDTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\field\Tests\CrudTest. + * Definition of Drupal\field\Tests\CRUDTest. */ namespace Drupal\field\Tests; @@ -10,7 +10,7 @@ namespace Drupal\field\Tests; use Drupal\field\FieldException; use Exception; -class CrudTest extends FieldTestBase { +class CRUDTest extends FieldTestBase { public static function getInfo() { return array( 'name' => 'Field CRUD tests', diff --git a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php b/core/modules/field/lib/Drupal/field/Tests/DisplayAPITest.php similarity index 98% rename from core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php rename to core/modules/field/lib/Drupal/field/Tests/DisplayAPITest.php index f848367..a5afc24 100644 --- a/core/modules/field/lib/Drupal/field/Tests/DisplayApiTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/DisplayAPITest.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Drupal\field\Tests\DisplayApiTest. + * Definition of Drupal\field\Tests\DisplayAPITest. */ namespace Drupal\field\Tests; -class DisplayApiTest extends FieldTestBase { +class DisplayAPITest extends FieldTestBase { public static function getInfo() { return array( 'name' => 'Field Display API tests', diff --git a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCRUDTest.php similarity index 99% rename from core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php rename to core/modules/field/lib/Drupal/field/Tests/FieldInstanceCRUDTest.php index 7d1e667..c091eeb 100644 --- a/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCrudTest.php +++ b/core/modules/field/lib/Drupal/field/Tests/FieldInstanceCRUDTest.php @@ -2,14 +2,14 @@ /** * @file - * Definition of Drupal\field\Tests\FieldInstanceCrudTest. + * Definition of Drupal\field\Tests\FieldInstanceCRUDTest. */ namespace Drupal\field\Tests; use Drupal\field\FieldException; -class FieldInstanceCrudTest extends FieldTestBase { +class FieldInstanceCRUDTest extends FieldTestBase { protected $field; public static function getInfo() { diff --git a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php b/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSQLStorageTest.php similarity index 99% rename from core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php rename to core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSQLStorageTest.php index 8dbb577..fa1c540 100644 --- a/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSqlStorageTest.php +++ b/core/modules/field/modules/field_sql_storage/lib/Drupal/field_sql_storage/Tests/FieldSQLStorageTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\field_sql_storage\FieldSqlStorageTest. + * Definition of Drupal\field_sql_storage\FieldSQLStorageTest. */ namespace Drupal\field_sql_storage\Tests; @@ -18,7 +18,7 @@ use PDO; * Field_sql_storage.module implements the default back-end storage plugin * for the Field Strage API. */ -class FieldSqlStorageTest extends WebTestBase { +class FieldSQLStorageTest extends WebTestBase { public static function getInfo() { return array( 'name' => 'Field SQL Storage tests', @@ -414,7 +414,7 @@ class FieldSqlStorageTest extends WebTestBase { /** * Test foreign key support. */ - function testFieldSqlStorageForeignKeys() { + function testFieldSQLStorageForeignKeys() { // Create a decimal field. $field_name = 'testfield'; $field = array('field_name' => $field_name, 'type' => 'text'); diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUITestBase.php similarity index 98% rename from core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php rename to core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUITestBase.php index cc0f45d..c6937a1 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUiTestBase.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/FieldUITestBase.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\field_ui\Tests\FieldUiTestBase. + * Definition of Drupal\field_ui\Tests\FieldUITestBase. */ namespace Drupal\field_ui\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Provides common functionality for the Field UI test classes. */ -class FieldUiTestBase extends WebTestBase { +class FieldUITestBase extends WebTestBase { function setUp() { // Since this is a base class for many test cases, support the same diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php index 06ea02a..50bbf61 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php @@ -12,7 +12,7 @@ use Drupal\node\Node; /** * Tests the functionality of the 'Manage display' screens. */ -class ManageDisplayTest extends FieldUiTestBase { +class ManageDisplayTest extends FieldUITestBase { public static function getInfo() { return array( 'name' => 'Manage display', diff --git a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php index af40230..0a8fff3 100644 --- a/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php +++ b/core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php @@ -10,7 +10,7 @@ namespace Drupal\field_ui\Tests; /** * Tests the functionality of the 'Manage fields' screen. */ -class ManageFieldsTest extends FieldUiTestBase { +class ManageFieldsTest extends FieldUITestBase { public static function getInfo() { return array( 'name' => 'Manage fields', diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterCRUDTest.php similarity index 98% rename from core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php rename to core/modules/filter/lib/Drupal/filter/Tests/FilterCRUDTest.php index 32c706b..0f31ed7 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterCrudTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterCRUDTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\filter\Tests\FilterCrudTest. + * Definition of Drupal\filter\Tests\FilterCRUDTest. */ namespace Drupal\filter\Tests; @@ -13,7 +13,7 @@ use stdClass; /** * Tests for text format and filter CRUD operations. */ -class FilterCrudTest extends WebTestBase { +class FilterCRUDTest extends WebTestBase { public static function getInfo() { return array( 'name' => 'Filter CRUD operations', @@ -29,7 +29,7 @@ class FilterCrudTest extends WebTestBase { /** * Test CRUD operations for text formats and filters. */ - function testTextFormatCrud() { + function testTextFormatCRUD() { // Add a text format with minimum data only. $format = new stdClass(); $format->format = 'empty_format'; diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php index 9daac0f..f50b328 100644 --- a/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php +++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterUnitTest.php @@ -296,7 +296,7 @@ class FilterUnitTest extends UnitTestBase { * @todo Class, id, name and xmlns should be added to disallowed attributes, * or better a whitelist approach should be used for that too. */ - function testHtmlFilter() { + function testHTMLFilter() { // Setup dummy filter object. $filter = new stdClass(); $filter->settings = array( @@ -389,7 +389,7 @@ class FilterUnitTest extends UnitTestBase { * * check_plain() is not tested here. */ - function testHtmlEscapeFilter() { + function testHTMLEscapeFilter() { // Setup dummy filter object. $filter = new stdClass(); $filter->callback = '_filter_html_escape'; @@ -768,7 +768,7 @@ www.example.com with a newline in comments --> * * @todo This test could really use some validity checking function. */ - function testHtmlCorrectorFilter() { + function testHTMLCorrectorFilter() { // Tag closing. $f = _filter_htmlcorrector('

text'); $this->assertEqual($f, '

text

', t('HTML corrector -- tag closing at the end of input.')); diff --git a/core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php b/core/modules/path/lib/Drupal/path/Tests/PathLanguageUITest.php similarity index 95% rename from core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php rename to core/modules/path/lib/Drupal/path/Tests/PathLanguageUITest.php index f1f56d6..c44b35a 100644 --- a/core/modules/path/lib/Drupal/path/Tests/PathLanguageUiTest.php +++ b/core/modules/path/lib/Drupal/path/Tests/PathLanguageUITest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\path\Tests\PathLanguageUiTest. + * Definition of Drupal\path\Tests\PathLanguageUITest. */ namespace Drupal\path\Tests; @@ -10,7 +10,7 @@ namespace Drupal\path\Tests; /** * Tests the user interface for creating path aliases, with languages. */ -class PathLanguageUiTest extends PathTestBase { +class PathLanguageUITest extends PathTestBase { public static function getInfo() { return array( 'name' => 'Path aliases with languages', diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php b/core/modules/php/lib/Drupal/php/Tests/PHPAccessTest.php similarity index 92% rename from core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php rename to core/modules/php/lib/Drupal/php/Tests/PHPAccessTest.php index ec7f740..1e5483d 100644 --- a/core/modules/php/lib/Drupal/php/Tests/PhpAccessTest.php +++ b/core/modules/php/lib/Drupal/php/Tests/PHPAccessTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\php\Tests\PhpAccessTest. + * Definition of Drupal\php\Tests\PHPAccessTest. */ namespace Drupal\php\Tests; @@ -10,7 +10,7 @@ namespace Drupal\php\Tests; /** * Tests to make sure access to the PHP filter is properly restricted. */ -class PhpAccessTest extends PhpTestBase { +class PHPAccessTest extends PHPTestBase { public static function getInfo() { return array( 'name' => 'PHP filter access check', diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php b/core/modules/php/lib/Drupal/php/Tests/PHPFilterTest.php similarity index 93% rename from core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php rename to core/modules/php/lib/Drupal/php/Tests/PHPFilterTest.php index 71ee5be..8d98fc7 100644 --- a/core/modules/php/lib/Drupal/php/Tests/PhpFilterTest.php +++ b/core/modules/php/lib/Drupal/php/Tests/PHPFilterTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\php\Tests\PhpFilterTest. + * Definition of Drupal\php\Tests\PHPFilterTest. */ namespace Drupal\php\Tests; @@ -10,7 +10,7 @@ namespace Drupal\php\Tests; /** * Tests to make sure the PHP filter actually evaluates PHP code when used. */ -class PhpFilterTest extends PhpTestBase { +class PHPFilterTest extends PHPTestBase { public static function getInfo() { return array( 'name' => 'PHP filter functionality', @@ -22,7 +22,7 @@ class PhpFilterTest extends PhpTestBase { /** * Makes sure that the PHP filter evaluates PHP code when used. */ - function testPhpFilter() { + function testPHPFilter() { // Log in as a user with permission to use the PHP code text format. $php_code_permission = filter_permission_name(filter_format_load('php_code')); $web_user = $this->drupalCreateUser(array('access content', 'create page content', 'edit own page content', $php_code_permission)); diff --git a/core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php b/core/modules/php/lib/Drupal/php/Tests/PHPTestBase.php similarity index 95% rename from core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php rename to core/modules/php/lib/Drupal/php/Tests/PHPTestBase.php index 2af8c8b..9bc93b3 100644 --- a/core/modules/php/lib/Drupal/php/Tests/PhpTestBase.php +++ b/core/modules/php/lib/Drupal/php/Tests/PHPTestBase.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\php\Tests\PhpTestBase. + * Definition of Drupal\php\Tests\PHPTestBase. */ namespace Drupal\php\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Defines a base PHP test case class. */ -class PhpTestBase extends WebTestBase { +class PHPTestBase extends WebTestBase { protected $php_code_format; function setUp() { diff --git a/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php b/core/modules/poll/lib/Drupal/poll/Tests/PollJSAddChoiceTest.php similarity index 93% rename from core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php rename to core/modules/poll/lib/Drupal/poll/Tests/PollJSAddChoiceTest.php index 7410958..c3389cc 100644 --- a/core/modules/poll/lib/Drupal/poll/Tests/PollJsAddChoiceTest.php +++ b/core/modules/poll/lib/Drupal/poll/Tests/PollJSAddChoiceTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\poll\Tests\PollJsAddChoiceTest. + * Definition of Drupal\poll\Tests\PollJSAddChoiceTest. */ namespace Drupal\poll\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Test adding new choices. */ -class PollJsAddChoiceTest extends WebTestBase { +class PollJSAddChoiceTest extends WebTestBase { public static function getInfo() { return array( diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CRUDTest.php similarity index 97% rename from core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php rename to core/modules/rdf/lib/Drupal/rdf/Tests/CRUDTest.php index e6752a0..dc27ddd 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/CrudTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CRUDTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\rdf\Tests\CrudTest. + * Definition of Drupal\rdf\Tests\CRUDTest. */ namespace Drupal\rdf\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests the RDF mapping CRUD functions. */ -class CrudTest extends WebTestBase { +class CRUDTest extends WebTestBase { public static function getInfo() { return array( 'name' => 'RDF mapping CRUD functions', diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php index cd22150..13a0654 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php @@ -51,7 +51,7 @@ class CommentAttributesTest extends CommentTestBase { /** * Tests the presence of the RDFa markup for the number of comments. */ - public function testNumberOfCommentsRdfaMarkup() { + public function testNumberOfCommentsRDFaMarkup() { // Posts 2 comments as a registered user. $this->drupalLogin($this->web_user); $this->postComment($this->node1, $this->randomName(), $this->randomName()); @@ -75,7 +75,7 @@ class CommentAttributesTest extends CommentTestBase { * Tests the presence of the RDFa markup for the title, date and author and * homepage on registered users and anonymous comments. */ - public function testCommentRdfaMarkup() { + public function testCommentRDFaMarkup() { // Posts comment #1 as a registered user. $this->drupalLogin($this->web_user); @@ -85,12 +85,12 @@ class CommentAttributesTest extends CommentTestBase { // Tests comment #1 with access to the user profile. $this->drupalGet('node/' . $this->node1->nid); - $this->_testBasicCommentRdfaMarkup($comment1); + $this->_testBasicCommentRDFaMarkup($comment1); // Tests comment #1 with no access to the user profile (as anonymous user). $this->drupalLogout(); $this->drupalGet('node/' . $this->node1->nid); - $this->_testBasicCommentRdfaMarkup($comment1); + $this->_testBasicCommentRDFaMarkup($comment1); // Posts comment #2 as anonymous user. $comment2_subject = $this->randomName(); @@ -103,7 +103,7 @@ class CommentAttributesTest extends CommentTestBase { $this->drupalGet('node/' . $this->node2->nid); // Tests comment #2 as anonymous user. - $this->_testBasicCommentRdfaMarkup($comment2, $anonymous_user); + $this->_testBasicCommentRDFaMarkup($comment2, $anonymous_user); // Tests the RDFa markup for the homepage (specific to anonymous comments). $comment_homepage = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//span[@rel="sioc:has_creator"]/a[contains(@class, "username") and @typeof="sioc:UserAccount" and @property="foaf:name" and @href="http://example.org/" and contains(@rel, "foaf:page")]'); $this->assertTrue(!empty($comment_homepage), t('RDFa markup for the homepage of anonymous user found.')); @@ -114,7 +114,7 @@ class CommentAttributesTest extends CommentTestBase { // Tests comment #2 as logged in user. $this->drupalLogin($this->web_user); $this->drupalGet('node/' . $this->node2->nid); - $this->_testBasicCommentRdfaMarkup($comment2, $anonymous_user); + $this->_testBasicCommentRDFaMarkup($comment2, $anonymous_user); // Tests the RDFa markup for the homepage (specific to anonymous comments). $comment_homepage = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//span[@rel="sioc:has_creator"]/a[contains(@class, "username") and @typeof="sioc:UserAccount" and @property="foaf:name" and @href="http://example.org/" and contains(@rel, "foaf:page")]'); $this->assertTrue(!empty($comment_homepage), t("RDFa markup for the homepage of anonymous user found.")); @@ -126,7 +126,7 @@ class CommentAttributesTest extends CommentTestBase { /** * Test RDF comment replies. */ - public function testCommentReplyOfRdfaMarkup() { + public function testCommentReplyOfRDFaMarkup() { // Posts comment #1 as a registered user. $this->drupalLogin($this->web_user); $comments[] = $this->postComment($this->node1, $this->randomName(), $this->randomName()); @@ -150,7 +150,7 @@ class CommentAttributesTest extends CommentTestBase { } /** - * Helper function for testCommentRdfaMarkup(). + * Helper function for testCommentRDFaMarkup(). * * Tests the current page for basic comment RDFa markup. * @@ -159,7 +159,7 @@ class CommentAttributesTest extends CommentTestBase { * @param $account * An array containing information about an anonymous user. */ - function _testBasicCommentRdfaMarkup($comment, $account = array()) { + function _testBasicCommentRDFaMarkup($comment, $account = array()) { $comment_container = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]'); $this->assertTrue(!empty($comment_container), t("Comment RDF type for comment found.")); $comment_title = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//h3[@property="dc:title"]'); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php index 973d13d..9d0e244 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/GetNamespacesTest.php @@ -28,7 +28,7 @@ class GetNamespacesTest extends WebTestBase { /** * Test RDF namespaces. */ - function testGetRdfNamespaces() { + function testGetRDFNamespaces() { // Fetches the front page and extracts RDFa 1.1 prefixes. $this->drupalGet(''); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/GetRDFNamespacesTest.php similarity index 88% rename from core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php rename to core/modules/rdf/lib/Drupal/rdf/Tests/GetRDFNamespacesTest.php index a6a20e4..cee3eaf 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/GetRdfNamespacesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/GetRDFNamespacesTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\rdf\Tests\GetRdfNamespacesTest. + * Definition of Drupal\rdf\Tests\GetRDFNamespacesTest. */ namespace Drupal\rdf\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests for RDF namespaces declaration with hook_rdf_namespaces(). */ -class GetRdfNamespacesTest extends WebTestBase { +class GetRDFNamespacesTest extends WebTestBase { public static function getInfo() { return array( 'name' => 'RDF namespaces', @@ -28,7 +28,7 @@ class GetRdfNamespacesTest extends WebTestBase { /** * Test getting RDF namesapces. */ - function testGetRdfNamespaces() { + function testGetRDFNamespaces() { // Get all RDF namespaces. $ns = rdf_get_namespaces(); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php index 98a36d5..33b1548 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/MappingDefinitionTest.php @@ -131,7 +131,7 @@ class MappingDefinitionTest extends TaxonomyTestBase { /** * Creates a random term and ensures the right RDFa markup is used. */ - function testTaxonomyTermRdfaAttributes() { + function testTaxonomyTermRDFaAttributes() { $vocabulary = $this->createVocabulary(); $term = $this->createTerm($vocabulary); diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfaMarkupTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/RDFaMarkupTest.php similarity index 98% rename from core/modules/rdf/lib/Drupal/rdf/Tests/RdfaMarkupTest.php rename to core/modules/rdf/lib/Drupal/rdf/Tests/RDFaMarkupTest.php index 96d2553..fa637bf 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/RdfaMarkupTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/RDFaMarkupTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\rdf\Tests\RdfaMarkupTest. + * Definition of Drupal\rdf\Tests\RDFaMarkupTest. */ namespace Drupal\rdf\Tests; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests RDFa markup generation. */ -class RdfaMarkupTest extends WebTestBase { +class RDFaMarkupTest extends WebTestBase { protected $profile = 'standard'; public static function getInfo() { @@ -30,7 +30,7 @@ class RdfaMarkupTest extends WebTestBase { /** * Test rdf_rdfa_attributes(). */ - function testDrupalRdfaAttributes() { + function testDrupalRDFaAttributes() { // Same value as the one in the HTML tag (no callback function). $expected_attributes = array( 'property' => array('dc:title'), diff --git a/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php b/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php index fdac254..fac3eb9 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php +++ b/core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php @@ -47,8 +47,8 @@ class TrackerAttributesTest extends WebTestBase { // Pass both the anonymously posted node and the administrator posted node // through to test for the RDF attributes. - $this->_testBasicTrackerRdfaMarkup($node_anon); - $this->_testBasicTrackerRdfaMarkup($node_admin); + $this->_testBasicTrackerRDFaMarkup($node_anon); + $this->_testBasicTrackerRDFaMarkup($node_admin); } @@ -60,7 +60,7 @@ class TrackerAttributesTest extends WebTestBase { * @param Node $node * The node just created. */ - function _testBasicTrackerRdfaMarkup(Node $node) { + function _testBasicTrackerRDFaMarkup(Node $node) { $url = url('node/' . $node->nid); $user = ($node->uid == 0) ? 'Anonymous user' : 'Registered user'; diff --git a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IPAddressTest.php similarity index 97% rename from core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php rename to core/modules/system/lib/Drupal/system/Tests/Bootstrap/IPAddressTest.php index b4d77c4..b6437f7 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IpAddressTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Bootstrap/IPAddressTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Bootstrap\IpAddressTest. + * Definition of Drupal\system\Tests\Bootstrap\IPAddressTest. */ namespace Drupal\system\Tests\Bootstrap; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests getting IP addresses and hostname validation. */ -class IpAddressTest extends WebTestBase { +class IPAddressTest extends WebTestBase { public static function getInfo() { return array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/HTMLIdentifierUnitTest.php similarity index 96% rename from core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php rename to core/modules/system/lib/Drupal/system/Tests/Common/HTMLIdentifierUnitTest.php index ee34df8..56c6126 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/HtmlIdentifierUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/HTMLIdentifierUnitTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Common\HtmlIdentifierUnitTest. + * Definition of Drupal\system\Tests\Common\HTMLIdentifierUnitTest. */ namespace Drupal\system\Tests\Common; @@ -12,7 +12,7 @@ use Drupal\simpletest\UnitTestBase; /** * Test for cleaning HTML identifiers. */ -class HtmlIdentifierUnitTest extends UnitTestBase { +class HTMLIdentifierUnitTest extends UnitTestBase { public static function getInfo() { return array( 'name' => 'HTML identifiers', diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JSONUnitTest.php similarity index 96% rename from core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php rename to core/modules/system/lib/Drupal/system/Tests/Common/JSONUnitTest.php index 9deb56b..b71cb3f 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/JsonUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/JSONUnitTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Common\JsonUnitTest. + * Definition of Drupal\system\Tests\Common\JSONUnitTest. */ namespace Drupal\system\Tests\Common; @@ -12,7 +12,7 @@ use Drupal\simpletest\UnitTestBase; /** * Tests the drupal_json_encode() and drupal_json_decode() functions. */ -class JsonUnitTest extends UnitTestBase { +class JSONUnitTest extends UnitTestBase { public static function getInfo() { return array( 'name' => 'JSON', diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php index ea1a749..6b9dd70 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/JavaScriptTest.php @@ -493,7 +493,7 @@ class JavaScriptTest extends WebTestBase { * Tests that the query string remains intact when adding JavaScript files * that have query string parameters. */ - function testAddJsFileWithQueryString() { + function testAddJSFileWithQueryString() { $this->drupalGet('common-test/query-string'); $query_string = variable_get('css_js_query_string', '0'); $this->assertRaw(drupal_get_path('module', 'node') . '/node.js?' . $query_string, t('Query string was appended correctly to js.')); diff --git a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Common/XSSUnitTest.php similarity index 97% rename from core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php rename to core/modules/system/lib/Drupal/system/Tests/Common/XSSUnitTest.php index df30fa2..190870f 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Common/XssUnitTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Common/XSSUnitTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Common\XssUnitTest. + * Definition of Drupal\system\Tests\Common\XSSUnitTest. */ namespace Drupal\system\Tests\Common; @@ -12,7 +12,7 @@ use Drupal\simpletest\UnitTestBase; /** * Tests for check_plain(), filter_xss(), format_string(), and check_url(). */ -class XssUnitTest extends UnitTestBase { +class XSSUnitTest extends UnitTestBase { public static function getInfo() { return array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLOBTest.php similarity index 92% rename from core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php rename to core/modules/system/lib/Drupal/system/Tests/Database/InsertLOBTest.php index 96b98ee..a3a27ff 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Database/InsertLobTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Database/InsertLOBTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Database\InsertLobTest. + * Definition of Drupal\system\Tests\Database\InsertLOBTest. */ namespace Drupal\system\Tests\Database; @@ -10,7 +10,7 @@ namespace Drupal\system\Tests\Database; /** * Insert tests using LOB fields, which are weird on some databases. */ -class InsertLobTest extends DatabaseTestBase { +class InsertLOBTest extends DatabaseTestBase { public static function getInfo() { return array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLOBTest.php similarity index 93% rename from core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php rename to core/modules/system/lib/Drupal/system/Tests/Database/UpdateLOBTest.php index 4d0b0c6..22b142d 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLobTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Database/UpdateLOBTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Database\UpdateLobTest. + * Definition of Drupal\system\Tests\Database\UpdateLOBTest. */ namespace Drupal\system\Tests\Database; @@ -10,7 +10,7 @@ namespace Drupal\system\Tests\Database; /** * Test update queries involving LOB values. */ -class UpdateLobTest extends DatabaseTestBase { +class UpdateLOBTest extends DatabaseTestBase { public static function getInfo() { return array( diff --git a/core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php b/core/modules/system/lib/Drupal/system/Tests/File/MIMETypeTest.php similarity index 95% rename from core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php rename to core/modules/system/lib/Drupal/system/Tests/File/MIMETypeTest.php index cb90b85..97d41a6 100644 --- a/core/modules/system/lib/Drupal/system/Tests/File/MimeTypeTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/File/MIMETypeTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\File\MimeTypeTest. + * Definition of Drupal\system\Tests\File\MIMETypeTest. */ namespace Drupal\system\Tests\File; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests for file_get_mimetype(). */ -class MimeTypeTest extends WebTestBase { +class MIMETypeTest extends WebTestBase { function setUp() { parent::setUp('file_test'); } @@ -28,7 +28,7 @@ class MimeTypeTest extends WebTestBase { /** * Test mapping of mimetypes from filenames. */ - public function testFileMimeTypeDetection() { + public function testFileMIMETypeDetection() { $prefix = 'public://'; $test_case = array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGDTest.php similarity index 98% rename from core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php rename to core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGDTest.php index 611126d..13e3179 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGdTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Image/ToolkitGDTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Image\ToolkitGdTest. + * Definition of Drupal\system\Tests\Image\ToolkitGDTest. */ namespace Drupal\system\Tests\Image; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Test the core GD image manipulation functions. */ -class ToolkitGdTest extends WebTestBase { +class ToolkitGDTest extends WebTestBase { // Colors that are used in testing. protected $black = array(0, 0, 0, 0); protected $red = array(255, 0, 0, 0); diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/HTMLToTextTest.php similarity index 92% rename from core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php rename to core/modules/system/lib/Drupal/system/Tests/Mail/HTMLToTextTest.php index 5970114..1fb69d1 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Mail/HtmlToTextTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Mail/HTMLToTextTest.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Tests\Mail\HtmlToTextTest. + * Definition of Drupal\system\Tests\Mail\HTMLToTextTest. */ namespace Drupal\system\Tests\Mail; @@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase; /** * Tests for drupal_html_to_text(). */ -class HtmlToTextTest extends WebTestBase { +class HTMLToTextTest extends WebTestBase { public static function getInfo() { return array( 'name' => 'HTML to text conversion', @@ -31,7 +31,7 @@ class HtmlToTextTest extends WebTestBase { * An HTML representation of the text string that, when displayed in a * browser, represents the PHP source code equivalent of $text. */ - protected function stringToHtml($text) { + protected function stringToHTML($text) { return '"' . str_replace( array("\n", ' '), @@ -53,15 +53,15 @@ class HtmlToTextTest extends WebTestBase { * (optional) An array of allowed tags, or NULL to default to the full * set of tags supported by drupal_html_to_text(). */ - protected function assertHtmlToText($html, $text, $message, $allowed_tags = NULL) { + protected function assertHTMLToText($html, $text, $message, $allowed_tags = NULL) { preg_match_all('/<([a-z0-6]+)/', drupal_strtolower($html), $matches); $tested_tags = implode(', ', array_unique($matches[1])); $message .= ' (' . $tested_tags . ')'; $result = drupal_html_to_text($html, $allowed_tags); $pass = $this->assertEqual($result, $text, check_plain($message)); - $verbose = 'html = 
' . $this->stringToHtml($html)
-      . '

' . 'result = 
' . $this->stringToHtml($result)
-      . '

' . 'expected = 
' . $this->stringToHtml($text)
+    $verbose = 'html = 
' . $this->stringToHTML($html)
+      . '

' . 'result = 
' . $this->stringToHTML($result)
+      . '

' . 'expected = 
' . $this->stringToHTML($text)
       . '
';
     $this->verbose($verbose);
     if (!$pass) {
@@ -160,36 +160,36 @@ class HtmlToTextTest extends WebTestBase {
     );
 
     foreach ($tests as $html => $text) {
-      $this->assertHtmlToText($html, $text, 'Supported tags');
+      $this->assertHTMLToText($html, $text, 'Supported tags');
     }
   }
 
   /**
    * Test $allowed_tags argument of drupal_html_to_text().
    */
-  public function testDrupalHtmlToTextArgs() {
+  public function testDrupalHTMLToTextArgs() {
     // The second parameter of drupal_html_to_text() overrules the allowed tags.
-    $this->assertHtmlToText(
+    $this->assertHTMLToText(
       'Drupal Drupal Drupal',
       "Drupal *Drupal* Drupal\n",
       'Allowed  tag found',
       array('b')
     );
-    $this->assertHtmlToText(
+    $this->assertHTMLToText(
       'Drupal 
Drupal
 Drupal',
       "Drupal Drupal Drupal\n",
       'Disallowed 
 tag not found',
       array('b')
     );
 
-    $this->assertHtmlToText(
+    $this->assertHTMLToText(
       'Drupal 
Drupal
 Drupal',
       "Drupal Drupal Drupal\n",
       'Disallowed 
, , and  tags not found',
       array('a', 'br', 'h1')
     );
 
-    $this->assertHtmlToText(
+    $this->assertHTMLToText(
       'Drupal',
       "Drupal\n",
       'Unsupported  and  tags not found',
@@ -200,11 +200,11 @@ class HtmlToTextTest extends WebTestBase {
   /**
    * Test that whitespace is collapsed.
    */
-  public function testDrupalHtmltoTextCollapsesWhitespace() {
+  public function testDrupalHTMLtoTextCollapsesWhitespace() {
     $input = "
Drupal  Drupal\n\nDrupal
Drupal  Drupal\n\nDrupal
Drupal  Drupal\n\nDrupal
";
     // @todo The whitespace should be collapsed.
     $collapsed = "Drupal  Drupal\n\nDrupalDrupal  Drupal\n\nDrupalDrupal  Drupal\n\nDrupal\n\n";
-    $this->assertHtmlToText(
+    $this->assertHTMLToText(
       $input,
       $collapsed,
       'Whitespace is collapsed',
@@ -216,7 +216,7 @@ class HtmlToTextTest extends WebTestBase {
    * Test that text separated by block-level tags in HTML get separated by
    * (at least) a newline in the plaintext version.
    */
-  public function testDrupalHtmlToTextBlockTagToNewline() {
+  public function testDrupalHTMLToTextBlockTagToNewline() {
     $input = '[text]'
       . '
[blockquote]
'
       . '
[br]'
@@ -244,7 +244,7 @@ class HtmlToTextTest extends WebTestBase {
       'Block-level HTML tags should force newlines'
     );
     if (!$pass) {
-      $this->verbose($this->stringToHtml($output));
+      $this->verbose($this->stringToHTML($output));
     }
     $output_upper = drupal_strtoupper($output);
     $upper_input = drupal_strtoupper($input);
@@ -270,21 +270,21 @@ class HtmlToTextTest extends WebTestBase {
     $html = 'Drupal
Drupal
Drupal';
     // @todo There should be more space above the header than below it.
     $text = "Drupal\n======== DRUPAL ==============================================================\n\nDrupal\n";
-    $this->assertHtmlToText($html, $text,
+    $this->assertHTMLToText($html, $text,
       'Text before and after 
 tag');
     $html = '
Drupal
Drupal
Drupal';
     // @todo There should be more space above the header than below it.
     $text = "Drupal\n\n======== DRUPAL ==============================================================\n\nDrupal\n";
-    $this->assertHtmlToText($html, $text,
+    $this->assertHTMLToText($html, $text,
       'Paragraph before and text after 
 tag');
     $html = 'Drupal
Drupal
Drupal
';
     // @todo There should be more space above the header than below it.
     $text = "Drupal\n======== DRUPAL ==============================================================\n\nDrupal\n\n";
-    $this->assertHtmlToText($html, $text,
+    $this->assertHTMLToText($html, $text,
       'Text before and paragraph after 
 tag');
     $html = '
Drupal
Drupal
Drupal
';
     $text = "Drupal\n\n======== DRUPAL ==============================================================\n\nDrupal\n\n";
-    $this->assertHtmlToText($html, $text,
+    $this->assertHTMLToText($html, $text,
       'Paragraph before and after 
 tag');
   }
 
@@ -309,14 +309,14 @@ class HtmlToTextTest extends WebTestBase {
       // @todo The following two references should be combined.
       . "\n[3] $base_url/node/1"
       . "\n[4] node/1\n";
-    $this->assertHtmlToText($source, $tt, 'Footnotes');
+    $this->assertHTMLToText($source, $tt, 'Footnotes');
   }
 
   /**
    * Test that combinations of paragraph breaks, line breaks, linefeeds,
    * and spaces are properly handled.
    */
-  public function testDrupalHtmlToTextParagraphs() {
+  public function testDrupalHTMLToTextParagraphs() {
     $tests = array();
     $tests[] = array(
         'html' => "
line 1
\nline 2
line 3\n
line 4
paragraph
",
@@ -329,7 +329,7 @@ class HtmlToTextTest extends WebTestBase {
       'text' => "line 1\nline 2\n\nline 4\nline 5\n\n0\n\n",
     );
     foreach ($tests as $test) {
-      $this->assertHtmlToText($test['html'], $test['text'], 'Paragraph breaks');
+      $this->assertHTMLToText($test['html'], $test['text'], 'Paragraph breaks');
     }
   }
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
index d4eceba..807f946 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Mail/MailTest.php
@@ -71,7 +71,7 @@ class MailTest extends WebTestBase implements MailInterface {
   /**
    * Concatenate and wrap the e-mail body for plain-text mails.
    *
-   * @see Drupal\Core\Mail\PhpMail
+   * @see Drupal\Core\Mail\PHPMail
    */
   public function format(array $message) {
     // Join the body array into one string.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleAPITest.php
similarity index 99%
rename from core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Module/ModuleAPITest.php
index 796ddcb..f40b513 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Module/ModuleApiTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Module/ModuleAPITest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Module\ModuleApiTest.
+ * Definition of Drupal\system\Tests\Module\ModuleAPITest.
  */
 
 namespace Drupal\system\Tests\Module;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Unit tests for the module API.
  */
-class ModuleApiTest extends WebTestBase {
+class ModuleAPITest extends WebTestBase {
   // Requires Standard profile modules/dependencies.
   protected $profile = 'standard';
 
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php b/core/modules/system/lib/Drupal/system/Tests/System/IPAddressBlockingTest.php
similarity index 96%
rename from core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
rename to core/modules/system/lib/Drupal/system/Tests/System/IPAddressBlockingTest.php
index 6d752a2..c5dfb4b 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/IpAddressBlockingTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/IPAddressBlockingTest.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\IpAddressBlockingTest.
+ * Definition of Drupal\system\Tests\System\IPAddressBlockingTest.
  */
 
 namespace Drupal\system\Tests\System;
 
 use Drupal\simpletest\WebTestBase;
 
-class IpAddressBlockingTest extends WebTestBase {
+class IPAddressBlockingTest extends WebTestBase {
   protected $blocking_user;
 
   /**
diff --git a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php b/core/modules/system/lib/Drupal/system/Tests/System/IndexPHPTest.php
similarity index 85%
rename from core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
rename to core/modules/system/lib/Drupal/system/Tests/System/IndexPHPTest.php
index 0ab7ddf..ae53b14 100644
--- a/core/modules/system/lib/Drupal/system/Tests/System/IndexPhpTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/System/IndexPHPTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\System\IndexPhpTest.
+ * Definition of Drupal\system\Tests\System\IndexPHPTest.
  */
 
 namespace Drupal\system\Tests\System;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Test the handling of requests containing 'index.php'.
  */
-class IndexPhpTest extends WebTestBase {
+class IndexPHPTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Index.php handling',
@@ -28,7 +28,7 @@ class IndexPhpTest extends WebTestBase {
   /**
    * Test index.php handling.
    */
-  function testIndexPhpHandling() {
+  function testIndexPHPHandling() {
     $index_php = $GLOBALS['base_url'] . '/index.php';
 
     $this->drupalGet($index_php, array('external' => TRUE));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/HTMLTagUnitTest.php
similarity index 87%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Theme/HTMLTagUnitTest.php
index d359038..fa5a699 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTagUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/HTMLTagUnitTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\HtmlTagUnitTest.
+ * Definition of Drupal\system\Tests\Theme\HTMLTagUnitTest.
  */
 
 namespace Drupal\system\Tests\Theme;
@@ -12,7 +12,7 @@ use Drupal\simpletest\UnitTestBase;
 /**
  * Unit tests for theme_html_tag().
  */
-class HtmlTagUnitTest extends UnitTestBase {
+class HTMLTagUnitTest extends UnitTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Theme HTML Tag',
@@ -24,7 +24,7 @@ class HtmlTagUnitTest extends UnitTestBase {
   /**
    * Test function theme_html_tag()
    */
-  function testThemeHtmlTag() {
+  function testThemeHTMLTag() {
     // Test auto-closure meta tag generation
     $tag['element'] = array('#tag' => 'meta', '#attributes' => array('name' => 'description', 'content' => 'Drupal test'));
     $this->assertEqual(''."\n", theme_html_tag($tag), t('Test auto-closure meta tag generation.'));
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/HTMLTplPHPAttributesTest.php
similarity index 86%
rename from core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php
rename to core/modules/system/lib/Drupal/system/Tests/Theme/HTMLTplPHPAttributesTest.php
index 82dd7c9..8ca2c87 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/HtmlTplPhpAttributesTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/HTMLTplPHPAttributesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Theme\HtmlTplPhpAttributesTest.
+ * Definition of Drupal\system\Tests\Theme\HTMLTplPHPAttributesTest.
  */
 
 namespace Drupal\system\Tests\Theme;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Functional test for attributes of html.tpl.php.
  */
-class HtmlTplPhpAttributesTest extends WebTestBase {
+class HTMLTplPHPAttributesTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'html.tpl.php html and body attributes',
@@ -28,7 +28,7 @@ class HtmlTplPhpAttributesTest extends WebTestBase {
   /**
    * Tests that modules and themes can alter variables in html.tpl.php.
    */
-  function testThemeHtmlTplPhpAttributes() {
+  function testThemeHTMLTplPHPAttributes() {
     $this->drupalGet('');
     $attributes = $this->xpath('/html[@theme_test_html_attribute="theme test html attribute value"]');
     $this->assertTrue(count($attributes) == 1, 'Attribute set in the html element via hook_preprocess_HOOK() for html.tpl.php found.');
diff --git a/core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php b/core/modules/system/lib/Drupal/system/Tests/UUID/UUIDUnitTest.php
similarity index 82%
rename from core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php
rename to core/modules/system/lib/Drupal/system/Tests/UUID/UUIDUnitTest.php
index 94a110b..f0cc0e0 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Uuid/UuidUnitTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/UUID/UUIDUnitTest.php
@@ -2,23 +2,23 @@
 
 /**
  * @file
- * Definition of Drupal\system\Tests\Uuid\UuidUnitTest.
+ * Definition of Drupal\system\Tests\UUID\UUIDUnitTest.
 */
 
-namespace Drupal\system\Tests\Uuid;
+namespace Drupal\system\Tests\UUID;
 
-use Drupal\Component\Uuid\Uuid;
+use Drupal\Component\UUID\UUID;
 use Drupal\simpletest\UnitTestBase;
 
 /**
- * Tests the Drupal\Component\Uuid\Uuid class.
+ * Tests the Drupal\Component\UUID\UUID class.
  */
-class UuidUnitTest extends UnitTestBase {
+class UUIDUnitTest extends UnitTestBase {
 
   /**
    * The UUID object to be used for generating UUIDs.
    *
-   * @var Drupal\Component\Uuid\UuidInterface
+   * @var Drupal\Component\UUID\UUIDInterface
    */
   protected $uuid;
 
@@ -32,14 +32,14 @@ class UuidUnitTest extends UnitTestBase {
 
   public function setUp() {
     // Initiate the generator. This will lazy-load uuid.inc.
-    $this->uuid = new Uuid();
+    $this->uuid = new UUID();
     parent::setUp();
   }
 
   /**
    * Test generating a UUID.
    */
-  public function testGenerateUuid() {
+  public function testGenerateUUID() {
     $uuid = $this->uuid->generate();
     $this->assertTrue($this->uuid->isValid($uuid), 'UUID generation works.');
   }
@@ -47,7 +47,7 @@ class UuidUnitTest extends UnitTestBase {
   /**
    * Test that generated UUIDs are unique.
    */
-  public function testUuidIsUnique() {
+  public function testUUIDIsUnique() {
     $uuid1 = $this->uuid->generate();
     $uuid2 = $this->uuid->generate();
     $this->assertNotEqual($uuid1, $uuid2, 'Same UUID was not generated twice.');
@@ -56,7 +56,7 @@ class UuidUnitTest extends UnitTestBase {
   /**
    * Test UUID validation.
    */
-  function testUuidValidation() {
+  function testUUIDValidation() {
     // These valid UUIDs.
     $uuid_fqdn = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
     $uuid_min = '00000000-0000-0000-0000-000000000000';
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EFQTest.php
similarity index 93%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EFQTest.php
index 32e3f04..af1227c 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EfqTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/EFQTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\EfqTest.
+ * Definition of Drupal\taxonomy\Tests\EFQTest.
  */
 
 namespace Drupal\taxonomy\Tests;
@@ -12,7 +12,7 @@ use Drupal\entity\EntityFieldQuery;
 /**
  * Tests the functionality of EntityFieldQuery for taxonomy entities.
  */
-class EfqTest extends TaxonomyTestBase {
+class EFQTest extends TaxonomyTestBase {
   public static function getInfo() {
     return array(
       'name' => 'Taxonomy EntityFieldQuery',
@@ -31,7 +31,7 @@ class EfqTest extends TaxonomyTestBase {
   /**
    * Tests that a basic taxonomy EntityFieldQuery works.
    */
-  function testTaxonomyEfq() {
+  function testTaxonomyEFQ() {
     $terms = array();
     for ($i = 0; $i < 5; $i++) {
       $term = $this->createTerm($this->vocabulary);
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RSSTest.php
similarity index 96%
rename from core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php
rename to core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RSSTest.php
index b44f456..67d50c0 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RssTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/RSSTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\taxonomy\Tests\RssTest.
+ * Definition of Drupal\taxonomy\Tests\RSSTest.
  */
 
 namespace Drupal\taxonomy\Tests;
@@ -10,7 +10,7 @@ namespace Drupal\taxonomy\Tests;
 /**
  * Tests the rendering of term reference fields in RSS feeds.
  */
-class RssTest extends TaxonomyTestBase {
+class RSSTest extends TaxonomyTestBase {
 
   public static function getInfo() {
     return array(
@@ -62,7 +62,7 @@ class RssTest extends TaxonomyTestBase {
    *
    * Create a node and assert that taxonomy terms appear in rss.xml.
    */
-  function testTaxonomyRss() {
+  function testTaxonomyRSS() {
     // Create two taxonomy terms.
     $term1 = $this->createTerm($this->vocabulary);
 
diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
index 4e6a0d5..8ed25b5 100644
--- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
+++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
@@ -64,7 +64,7 @@ class UserCancelTest extends WebTestBase {
    * This should never be possible, or the site owner would become unable to
    * administer the site.
    */
-  function testUserCancelUid1() {
+  function testUserCancelUserId1() {
     // Update uid 1's name and password to we know it.
     $password = user_password();
     require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'core/includes/password.inc');
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCBasicTest.php
similarity index 96%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php
rename to core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCBasicTest.php
index 7e94985..1a150e4 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcBasicTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCBasicTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\xmlrpc\Tests\XmlRpcBasicTest.
+ * Definition of Drupal\xmlrpc\Tests\XMLRPCBasicTest.
  */
 
 namespace Drupal\xmlrpc\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * Perform basic XML-RPC tests that do not require addition callbacks.
  */
-class XmlRpcBasicTest extends WebTestBase {
+class XMLRPCBasicTest extends WebTestBase {
 
   public static function getInfo() {
     return array(
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCMessagesTest.php
similarity index 94%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
rename to core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCMessagesTest.php
index f4823c4..c20d570 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcMessagesTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCMessagesTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\xmlrpc\Tests\XmlRpcMessagesTest.
+ * Definition of Drupal\xmlrpc\Tests\XMLRPCMessagesTest.
  */
 
 namespace Drupal\xmlrpc\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * XML-RPC message and alteration tests.
  */
-class XmlRpcMessagesTest extends WebTestBase {
+class XMLRPCMessagesTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name'  => 'XML-RPC message and alteration',
diff --git a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCValidatorTest.php
similarity index 97%
rename from core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php
rename to core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCValidatorTest.php
index f482328..53d3526 100644
--- a/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XmlRpcValidatorTest.php
+++ b/core/modules/xmlrpc/lib/Drupal/xmlrpc/Tests/XMLRPCValidatorTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\xmlrpc\Tests\XmlRpcValidatorTest.
+ * Definition of Drupal\xmlrpc\Tests\XMLRPCValidatorTest.
  */
 
 namespace Drupal\xmlrpc\Tests;
@@ -12,7 +12,7 @@ use Drupal\simpletest\WebTestBase;
 /**
  * XML-RPC validator1 specification.
  */
-class XmlRpcValidatorTest extends WebTestBase {
+class XMLRPCValidatorTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'name' => 'XML-RPC validator',