diff --git a/modules/views_sql_twig_relationship/src/Plugin/views/relationship/ViewsSqlTwigRelationshipReverse.php b/modules/views_sql_twig_relationship/src/Plugin/views/relationship/ViewsSqlTwigRelationshipReverse.php
index 0847447..2795e7e 100644
--- a/modules/views_sql_twig_relationship/src/Plugin/views/relationship/ViewsSqlTwigRelationshipReverse.php
+++ b/modules/views_sql_twig_relationship/src/Plugin/views/relationship/ViewsSqlTwigRelationshipReverse.php
@@ -45,7 +45,7 @@ class ViewsSqlTwigRelationshipReverse extends EntityReverse {
// Figure out what base table this relationship brings to the party.
$table_data = Views::viewsData()->get($this->definition['base']);
- $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
+ empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
$first = [
'sql_condition' => $this->options['sql'],
diff --git a/modules/views_sql_twig_relationship/views_sql_twig_relationship.info.yml b/modules/views_sql_twig_relationship/views_sql_twig_relationship.info.yml
index 2aa2557..664552b 100644
--- a/modules/views_sql_twig_relationship/views_sql_twig_relationship.info.yml
+++ b/modules/views_sql_twig_relationship/views_sql_twig_relationship.info.yml
@@ -1,11 +1,8 @@
name: Views SQL Twig Relationship
type: module
description: 'Provides views support for relationships plugins SQL twig support. Please read the documentation.'
-
package: Views
core_version_requirement: ^8.8 || ^9 || ^10
dependencies:
- 'drupal:views_ui'
- 'drupal:views_sql_twig_fields'
-
-project: 'views_sql_twig_relationship'
diff --git a/modules/views_sql_twig_webform/src/Plugin/views/relationship/ViewsSqlTwigWebformReverse.php b/modules/views_sql_twig_webform/src/Plugin/views/relationship/ViewsSqlTwigWebformReverse.php
index 9a3a5d0..3aa1ddd 100644
--- a/modules/views_sql_twig_webform/src/Plugin/views/relationship/ViewsSqlTwigWebformReverse.php
+++ b/modules/views_sql_twig_webform/src/Plugin/views/relationship/ViewsSqlTwigWebformReverse.php
@@ -45,7 +45,7 @@ class ViewsSqlTwigWebformReverse extends WebformViewsEntityReverse {
// Figure out what base table this relationship brings to the party.
$table_data = Views::viewsData()->get($this->definition['base']);
- $base_field = empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
+ empty($this->definition['base field']) ? $table_data['table']['base']['field'] : $this->definition['base field'];
$first = [
'sql_condition' => $this->options['sql'],
diff --git a/modules/views_sql_twig_webform/views_sql_twig_webform.info.yml b/modules/views_sql_twig_webform/views_sql_twig_webform.info.yml
index d191c54..dfbb25b 100644
--- a/modules/views_sql_twig_webform/views_sql_twig_webform.info.yml
+++ b/modules/views_sql_twig_webform/views_sql_twig_webform.info.yml
@@ -1,12 +1,9 @@
name: Views SQL Twig Webform Views Relationship
type: module
description: 'Provides views support for webform reverse relationships plugins SQL twig support. Please read the documentation.'
-
package: Views
core_version_requirement: ^8.8 || ^9 || ^10
dependencies:
- 'drupal:views_ui'
- 'drupal:views_sql_twig_fields'
- 'drupa:webform_views'
-
-project: 'views_sql_twig_webform'
diff --git a/src/Plugin/views/join/TwigSqlJoinPlugin.php b/src/Plugin/views/join/TwigSqlJoinPlugin.php
index e868999..cbc27fe 100644
--- a/src/Plugin/views/join/TwigSqlJoinPlugin.php
+++ b/src/Plugin/views/join/TwigSqlJoinPlugin.php
@@ -25,7 +25,7 @@ class TwigSqlJoinPlugin extends JoinPluginBase {
* @param \Drupal\views\Plugin\views\query\QueryPluginBase $view_query
* The source views query.
*/
- public function buildJoin($select_query, $table, $view_query) {
+ public function buildJoin(SelectInterface $select_query, $table, QueryPluginBase $view_query) {
if (empty($this->configuration['table formula'])) {
$right_table = $this->table;
}
diff --git a/src/Plugin/views/relationship/ViewsSqlTwigFieldsRelationship.php b/src/Plugin/views/relationship/ViewsSqlTwigFieldsRelationship.php
index bb01a0d..fd12a13 100644
--- a/src/Plugin/views/relationship/ViewsSqlTwigFieldsRelationship.php
+++ b/src/Plugin/views/relationship/ViewsSqlTwigFieldsRelationship.php
@@ -45,8 +45,8 @@ class ViewsSqlTwigFieldsRelationship extends Standard {
$form['twig_table'] = [
'#type' => "select",
- '#title' => t('Twig SQL Base Table'),
- '#description' => t('This should be a valid SQL table name.'),
+ '#title' => $this->t('Twig SQL Base Table'),
+ '#description' => $this->t('This should be a valid SQL table name.'),
'#default_value' => $this->options['twig table'],
'#options' => $tables,
'#weight' => -100,
diff --git a/src/TwigSqlFields.php b/src/TwigSqlFields.php
index bb6cee1..7cef0e4 100644
--- a/src/TwigSqlFields.php
+++ b/src/TwigSqlFields.php
@@ -34,7 +34,7 @@ trait TwigSqlFields {
* @param array $options
* List of options.
*/
- protected function twigSqlDefineOptions(&$options) {
+ protected function twigSqlDefineOptions(array &$options) {
$options['sql'] = ['default' => '1'];
$options['formula'] = ['default' => '1'];
$options['variables'] = ['default' => ''];
@@ -178,11 +178,11 @@ trait TwigSqlFields {
Use Raw SQL if you do not want the SQL field to change. '
),
'#options' => [
- 'always' => 'Always regenerate',
- 'save' => 'Regenerate on save',
- 'once' => 'Regenerate on this save',
- 'runtime' => 'Regenerate at runtime only',
- 'never' => 'Raw SQL (Never regenerate)' ,
+ 'always' => $this->t('Always regenerate'),
+ 'save' => $this->t('Regenerate on save'),
+ 'once' => $this->t('Regenerate on this save'),
+ 'runtime' => $this->t('Regenerate at runtime only'),
+ 'never' => $this->t('Raw SQL (Never regenerate)') ,
],
'#default_value' => $this->options['mode'],
"#disabled" => $this->notAdmin(),
@@ -251,7 +251,7 @@ trait TwigSqlFields {
* @param array $parameters
* Additional parameter list [ variable => value, .. ].
*/
- protected function regenerateSqlQuery($parameters = []) {
+ protected function regenerateSqlQuery(array $parameters = []) {
switch ($this->options['mode']) {
case 'always':
case 'runtime':
@@ -265,7 +265,7 @@ trait TwigSqlFields {
* @param array $parameters
* Additional parameter list [ variable => value, .. ].
*/
- protected function regenerateSql($parameters = []) {
+ protected function regenerateSql(array $parameters = []) {
$search = [];
$replace = [];
diff --git a/views_sql_twig_fields.info.yml b/views_sql_twig_fields.info.yml
index 7b8e74d..fee744f 100644
--- a/views_sql_twig_fields.info.yml
+++ b/views_sql_twig_fields.info.yml
@@ -5,6 +5,3 @@ package: Views
core_version_requirement: ^8.8 || ^9 || ^10
dependencies:
- 'drupal:views'
-
-# Information added by Drupal.org packaging script on 2022-09-07
-project: 'views_sql_twig_fields'