commit b771dfc5d362fd59e8ad8eae7003c63b73d5204b Author: Klaus Purer Date: Thu Nov 15 17:50:35 2012 +0100 Removed wrong @return doc, fixed static select query in dblog test. diff --git a/core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php b/core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php index 136eda1..f76d535 100644 --- a/core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php +++ b/core/modules/rest/lib/Drupal/rest/EventSubscriber/RouteSubscriber.php @@ -50,9 +50,6 @@ public function __construct(ResourcePluginManager $manager, ConfigFactory $confi * * @param \Drupal\Core\Routing\RouteBuildEvent $event * The route building event. - * - * @return \Symfony\Component\Routing\RouteCollection - * The route collection that contains the new dynamic routes. */ public function dynamicRoutes(RouteBuildEvent $event) { diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php index 6bd8e65..a18d064 100644 --- a/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php +++ b/core/modules/rest/lib/Drupal/rest/Tests/DBLogTest.php @@ -51,13 +51,9 @@ public function setUp() { public function testWatchdog() { // Write a log message to the DB. watchdog('rest_test', 'Test message'); - // Get ID of the written message. - $result = db_select('watchdog', 'w') - ->condition('type', 'rest_test') - ->fields('w', array('wid')) - ->execute() - ->fetchCol(); - $id = $result[0]; + // Get the ID of the written message. + $id = db_query_range("SELECT wid FROM {watchdog} WHERE type = :type ORDER BY wid DESC", 0, 1, array(':type' => 'rest_test')) + ->fetchField(); // Create a user account that has the required permissions to read // the watchdog resource via the web API. diff --git a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php index f0b9bd7..a67e83f 100644 --- a/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php +++ b/core/modules/system/tests/modules/router_test/lib/Drupal/router_test/RouteTestSubscriber.php @@ -30,9 +30,6 @@ static function getSubscribedEvents() { * * @param \Drupal\Core\Routing\RouteBuildEvent $event * The route building event. - * - * @return \Symfony\Component\Routing\RouteCollection - * The route collection that contains the new dynamic route. */ public function dynamicRoutes(RouteBuildEvent $event) { $collection = $event->getRouteCollection();