V 0.5.3 adapting addConditionPattern()

- new parameter $fields for addConditionPattern()

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e54d5ed74328fbe8ea41b62a48f3ff6fa6c937ef..fbff40df5af11830404ea802564b768967bf2bd3 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# V 0.5.3 adapting addConditionPattern()
+
+- new parameter $fields for addConditionPattern()
+
 # V 0.5.2 i18n
 
 # V 0.5.1 renaming of *create_persons_table.php

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
index baefe2934d3ba149beb0e6d8a0a682aa7a4bb540..d656303257f0c3e22482e443174fa3c0ca922f4e 100644 (file)
--- a/app/Http/Controllers/ChapterController.php
+++ b/app/Http/Controllers/ChapterController.php
@@ -105,7 +105,7 @@ class ChapterController extends Controller
                 ];
             } else {
                 $conditions = [];
-                ViewHelper::addConditionPattern($conditions, $parameters, 'title,info,contents', 'text');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'title,info,contents', 'text');
                 $sql = DbHelper::addConditions($sql, $conditions);
             }
             $sql = DbHelper::addOrderBy($sql, $fields['_sortParams']);

diff --git a/app/Http/Controllers/NounController.php b/app/Http/Controllers/NounController.php
index 8d30fa6ad92c34c2652b1217a86e479d60d505db..06f22c1e1e39903cb9e565386cabf15c68a68d14 100644 (file)
--- a/app/Http/Controllers/NounController.php
+++ b/app/Http/Controllers/NounController.php
@@ -116,9 +116,9 @@ class NounController extends Controller
                 ];
             } else {
                 $conditions = [];
-                ViewHelper::addConditionPattern($conditions, $parameters, 't0.name', 'name');
-                ViewHelper::addConditionComparism($conditions, $parameters, 'genus_scope', 'genus');
-                ViewHelper::addConditionPattern($conditions, $parameters, 'plural');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 't0.name', 'name');
+                ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'genus_scope', 'genus');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'plural');
                 $sql = DbHelper::addConditions($sql, $conditions);
             }
             $sql = DbHelper::addOrderBy($sql, $fields['_sortParams']);

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index ca78fe8526b87d9475c5afdc4893703ffb1c38e7..8df61b8562e29f217947b9c93ca43b089b2b744e 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -300,8 +300,8 @@ LEFT JOIN users t4 ON t4.id=t0.owner_id
             ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'markup_scope', 'markup');
             ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'language_scope', 'language');
             ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'owner_id', 'owner');
-            ViewHelper::addConditionPattern($conditions, $parameters, 't0.name,title,t0.info', 'title');
-            ViewHelper::addConditionPattern($conditions, $parameters, 't0.info,contents', 'contents');
+            ViewHelper::addConditionPattern($fields, $conditions, $parameters, 't0.name,title,t0.info', 'title');
+            ViewHelper::addConditionPattern($fields, $conditions, $parameters, 't0.info,contents', 'contents');
             $sql = DbHelper::addConditions($sql, $conditions);
             $sql = DbHelper::addOrderBy($sql, $fields['_sortParams']);
             $pagination = new Pagination($sql, $parameters, $fields);

diff --git a/app/Http/Controllers/PhraseController.php b/app/Http/Controllers/PhraseController.php
index 8ddc0b0510bb660fa4b5ea91e0ef0d094c5488e9..650122d68ab6b9d15b42652bf26aed1c8d8a9754 100644 (file)
--- a/app/Http/Controllers/PhraseController.php
+++ b/app/Http/Controllers/PhraseController.php
@@ -127,14 +127,14 @@ LEFT JOIN users t2 ON t2.id=t0.owner_id
                     '_sortParams' => 't0.phrase:asc;t0.id:desc'
                 ];
             } else {
-                ViewHelper::addConditionComparism($conditions, $parameters, 't0.owner_id', 'owner');
+                ViewHelper::addConditionComparison($fields, $conditions, $parameters, 't0.owner_id', 'owner');
                 $lang = $fields['language'];
                 if ($fields['verified'] != null) {
                     // 1: not verified 2: verified
                     $not = $fields['verified'] == 1 ? '' : ' NOT';
                     array_push($conditions, "EXISTS(SELECT id FROM phrases ph WHERE ph.id=t0.german_id AND ph.language_scope=$lang AND ph.verifiedby_id IS$not NULL)");
                 }
-                ViewHelper::addConditionPattern($conditions, $parameters, 't0.phrase', 'text');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 't0.phrase', 'text');
             }
             ViewHelper::addConditionConstComparison($conditions, $parameters, 't0.language_scope', 1202);
             $sql = DbHelper::addConditions($sql, $conditions);

diff --git a/app/Http/Controllers/ReviewController.php b/app/Http/Controllers/ReviewController.php
index 7f044b2b4878f426ac266bb0272bb8a407aa5673..313e2cdafbcc8e7456936a04827d0296ed847261 100644 (file)
--- a/app/Http/Controllers/ReviewController.php
+++ b/app/Http/Controllers/ReviewController.php
@@ -101,11 +101,11 @@ class ReviewController extends Controller
                 ];
             } else {
                 $conditions = [];
-                ViewHelper::addConditionPattern($conditions, $parameters, 'nickname');
-                ViewHelper::addConditionPattern($conditions, $parameters, 'title');
-                ViewHelper::addConditionPattern($conditions, $parameters, 'comment');
-                ViewHelper::addConditionPattern($conditions, $parameters, 'email');
-                ViewHelper::addConditionComparism($conditions, $parameters, 'stars', null, '=');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'nickname');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'title');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'comment');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'email');
+                ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'stars', null, '=');
                 $sql = DbHelper::addConditions($sql, $conditions);
             }
             $sql = DbHelper::addOrderBy($sql, $fields['_sortParams']);

diff --git a/app/Http/Controllers/VerbController.php b/app/Http/Controllers/VerbController.php
index 77b3eefc38db2103f1e5652fadaf7dd1b0ca93a1..c86dfba295a0021e21e6575cfa567b371bde4423 100644 (file)
--- a/app/Http/Controllers/VerbController.php
+++ b/app/Http/Controllers/VerbController.php
@@ -120,9 +120,9 @@ class VerbController extends Controller
                 ];
             } else {
                 $conditions = [];
-                ViewHelper::addConditionPattern($conditions, $parameters, 't1.word,presence1s,presence2s,presence3s,presence1p,presence2p,presence3p'
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 't1.word,presence1s,presence2s,presence3s,presence1p,presence2p,presence3p'
                     . 'imperfect1s,imperfect2s,imperfect3s,imperfect1p,imperfect2p,imperfect3p,participle', 'verb');
-                ViewHelper::addConditionPattern($conditions, $parameters, 'options');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'options');
                 $sql = DbHelper::addConditions($sql, $conditions);
             }
             $sql = DbHelper::addOrderBy($sql, $fields['_sortParams']);

diff --git a/app/Http/Controllers/WordController.php b/app/Http/Controllers/WordController.php
index 9b34171341da5d0b805e2b9a5c702b3a06987861..4cec779f18a8ec16aef4d79871daf9d21e8bc793 100644 (file)
--- a/app/Http/Controllers/WordController.php
+++ b/app/Http/Controllers/WordController.php
@@ -329,10 +329,10 @@ LEFT JOIN sproperties t1 ON t1.id=t0.wordtype_scope
                     '_sortParams' => 't0.word:asc;id:asc'
                 ];
             } else {
-                ViewHelper::addConditionPattern($conditions, $parameters, 't0.word', 'word');
-                ViewHelper::addConditionComparism($conditions, $parameters, 'wordtype_scope', 'wordtype');
-                ViewHelper::addConditionComparism($conditions, $parameters, 'owner_id', 'owner');
-                ViewHelper::addConditionPattern($conditions, $parameters, 'usage');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 't0.word', 'word');
+                ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'wordtype_scope', 'wordtype');
+                ViewHelper::addConditionComparison($fields, $conditions, $parameters, 'owner_id', 'owner');
+                ViewHelper::addConditionPattern($fields, $conditions, $parameters, 'usage');
             }
             ViewHelper::addConditionConstComparison($conditions, $parameters, 't0.language_scope', GERMAN);
             $sql = DbHelper::addConditions($sql, $conditions);

diff --git a/composer.lock b/composer.lock
index 1127350b2ab52d90f794da0e0fd4ce472260cbf3..8f08d2d2e41137da08a0559d72620db178af81d0 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1060,7 +1060,7 @@
             "dist": {
                 "type": "path",
                 "url": "../laraknife",
-                "reference": "e0953d5366152bea5a77e6d424a77622884a1987"
+                "reference": "1a656674b451be0e21c5b86546c9b6aa342ae98e"
             },
             "require-dev": {
                 "phpunit/phpunit": "11.0.x-dev"
@@ -1091,16 +1091,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.37.0",
+            "version": "v11.38.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5"
+                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6cb103d2024b087eae207654b3f4b26646119ba5",
-                "reference": "6cb103d2024b087eae207654b3f4b26646119ba5",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a",
+                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a",
                 "shasum": ""
             },
             "require": {
@@ -1301,20 +1301,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-01-02T20:10:21+00:00"
+            "time": "2025-01-15T00:06:46+00:00"
         },
         {
             "name": "laravel/prompts",
-            "version": "v0.3.2",
+            "version": "v0.3.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/prompts.git",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f"
+                "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/prompts/zipball/0e0535747c6b8d6d10adca8b68293cf4517abb0f",
-                "reference": "0e0535747c6b8d6d10adca8b68293cf4517abb0f",
+                "url": "https://api.github.com/repos/laravel/prompts/zipball/749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
+                "reference": "749395fcd5f8f7530fe1f00dfa84eb22c83d94ea",
                 "shasum": ""
             },
             "require": {
@@ -1358,9 +1358,9 @@
             "description": "Add beautiful and user-friendly forms to your command-line applications.",
             "support": {
                 "issues": "https://github.com/laravel/prompts/issues",
-                "source": "https://github.com/laravel/prompts/tree/v0.3.2"
+                "source": "https://github.com/laravel/prompts/tree/v0.3.3"
             },
-            "time": "2024-11-12T14:59:47+00:00"
+            "time": "2024-12-30T15:53:31+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -6167,16 +6167,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.19.0",
+            "version": "v1.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0"
+                "reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/8169513746e1bac70c85d6ea1524d9225d4886f0",
-                "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
+                "reference": "53072e8ea22213a7ed168a8a15b96fbb8b82d44b",
                 "shasum": ""
             },
             "require": {
@@ -6229,20 +6229,20 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-12-30T16:20:10+00:00"
+            "time": "2025-01-14T16:20:53+00:00"
         },
         {
             "name": "laravel/sail",
-            "version": "v1.39.1",
+            "version": "v1.40.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "1a3c7291bc88de983b66688919a4d298d68ddec7"
+                "reference": "237e70656d8eface4839de51d101284bd5d0cf71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/1a3c7291bc88de983b66688919a4d298d68ddec7",
-                "reference": "1a3c7291bc88de983b66688919a4d298d68ddec7",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/237e70656d8eface4839de51d101284bd5d0cf71",
+                "reference": "237e70656d8eface4839de51d101284bd5d0cf71",
                 "shasum": ""
             },
             "require": {
@@ -6292,7 +6292,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-11-27T15:42:28+00:00"
+            "time": "2025-01-13T16:57:11+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -6975,16 +6975,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.40",
+            "version": "10.5.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c"
+                "reference": "e76586fa3d49714f230221734b44892e384109d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e6ddda95af52f69c1e0c7b4f977cccb58048798c",
-                "reference": "e6ddda95af52f69c1e0c7b4f977cccb58048798c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e76586fa3d49714f230221734b44892e384109d7",
+                "reference": "e76586fa3d49714f230221734b44892e384109d7",
                 "shasum": ""
             },
             "require": {
@@ -7056,7 +7056,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.40"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.41"
             },
             "funding": [
                 {
@@ -7072,7 +7072,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-21T05:49:06+00:00"
+            "time": "2025-01-13T09:33:05+00:00"
         },
         {
             "name": "sebastian/cli-parser",