diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php index 13f6f0f..d309c12 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php @@ -225,7 +225,7 @@ public function sqlFunctionRand($seed = NULL) { } /** - * SQLite compatbility implementation for the REGEXP SQL operator. + * SQLite compatibility implementation for the REGEXP SQL operator. * * The REGEXP operator is a special syntax for the regexp() user function. */ diff --git a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php index c5704ae..cc67fa1 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Database/SelectTest.php @@ -390,12 +390,12 @@ public function testRegexCondition() { ), ); foreach ($test_groups as $test_group) { - $query = db_select('test', 't'); + $query = $this->container->get('database')->select('test', 't'); $query->addField('t', 'name'); $query->condition('t.name', $test_group['regex'], 'REGEXP'); $result = $query->execute()->fetchCol(); - $this->assertEqual(count($result), count($test_group['expected']), 'returns the expected number of rows.'); + $this->assertEqual(count($result), count($test_group['expected']), 'Returns the expected number of rows.'); $this->assertEqual(sort($result), sort($test_group['expected']), 'Returns the expected rows.'); } } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php index eb463ce..42fe4a2 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/Numeric.php @@ -277,7 +277,7 @@ function op_empty($field) { * @param string $field * The expression pointing to the queries field, for example "foo.bar". */ - function op_regex($field) { + protected function op_regex($field) { $this->query->add_where($this->options['group'], $field, $this->value, 'REGEXP'); } diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php index 24184df..6436d4c 100644 --- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php +++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/String.php @@ -334,7 +334,7 @@ function op_longer($field) { * @param string $field * The expression pointing to the queries field, for example "foo.bar". */ - public function op_regex($field) { + protected function op_regex($field) { $this->query->add_where($this->options['group'], $field, $this->value, 'REGEXP'); }