21420560247

Committed 28 Jan 2026 12:59AM UTC coverage: 52.306% (-1.4%) from 53.72%

Build # 21420560247

Build Type

push

github

Committed by

AJenbo

Commit Message

Bump phpunit/phpunit from 9.6.11 to 9.6.33 in /application

Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.11 to 9.6.33.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/9.6.33/ChangeLog-9.6.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.6.11...9.6.33)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-version: 9.6.33
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

Run Details

3039 of 5810 relevant lines covered (52.31%)

12.21 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

22.82

/application/inc/Http/Controllers/Search.php

<?php

namespace App\Http\Controllers;

use App\Http\Request;
use App\Models\Brand;
use App\Models\Category;
use App\Models\Page;
use App\Models\VolatilePage;
use App\Services\DbService;
use App\Services\OrmService;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Response;

class Search extends Base
{
    /**
     * Show the advanced search form.
     */
    public function index(): Response
    {
        $data = $this->basicPageData();
        $crumbs = $data['crumbs'] ?? null;
        if (!is_array($crumbs)) {
            $crumbs = [];
        }
        $crumbs[] = new VolatilePage(_('Search'), '/search/');
        $data['crumbs'] = $crumbs;
        $data['brands'] = $this->getActiveBrands();

        $response = $this->render('search', $data);

        return $this->cachedResponse($response);
    }

    /**
     * Get brands used on active pages.
     *
     * @return Brand[]
     */
    private function getActiveBrands(): array
    {
        $orm = app(OrmService::class);

        $categoryIds = [];
        $categories = $orm->getByQuery(Category::class, 'SELECT * FROM kat');
        foreach ($categories as $category) {
            if ($category->isInactive()) {
                continue;
            }
            $categoryIds[] = $category->getId();
        }

        return $orm->getByQuery(
            Brand::class,
            '
            SELECT * FROM `maerke`
            WHERE id IN(
                SELECT DISTINCT sider.maerke FROM bind
                JOIN sider ON sider.id = bind.side
                WHERE bind.kat IN(' . implode(',', $categoryIds) . ')
            ) ORDER BY `navn`
            '
        );
    }

    /**
     * Show search results.
     */
    public function results(Request $request): Response
    {
        if ($response = $this->checkSearchable($request)) {
            return $response;
        }

        $searchString = $request->get('q');
        if (!is_string($searchString)) {
            $searchString = '';
        }
        $brandId = $request->query->getInt('maerke');
        $varenr = $request->get('varenr');
        if (!is_string($varenr)) {
            $varenr = '';
        }
        $minpris = $request->query->getInt('minpris', 0);
        $maxpris = $request->query->getInt('maxpris', 0);
        $antiWords = $request->get('sogikke');
        if (!is_string($antiWords)) {
            $antiWords = '';
        }

        $pages = $this->findPages($searchString, $brandId, $varenr, $minpris, $maxpris, $antiWords);
        if (1 === count($pages)) {
            $page = array_shift($pages);

            return redirect($page->getCanonicalLink());
        }

        $brands = $this->findBrands(
            $searchString,
            $antiWords
        );

        $categories = $this->findCategories(
            $searchString,
            $antiWords
        );

        $contentList = array_merge($pages, $brands, $categories);

        $requirement = new VolatilePage('Results', $request->getRequestUri(), $contentList);

        $data = $this->basicPageData();
        $crumbs = $data['crumbs'] ?? null;
        if (!is_array($crumbs)) {
            $crumbs = [];
        }
        $crumbs[] = new VolatilePage(_('Search'), '/search/');
        $crumbs[] = $requirement;
        $data['crumbs'] = $crumbs;

        $data['renderable'] = $requirement;
        $data['search'] = $searchString;

        $response = $this->render('tiles', $data);

        return $this->cachedResponse($response);
    }

    /**
     * Check if we should performe the search or handle it else where.
     */
    private function checkSearchable(Request $request): ?RedirectResponse
    {
        $brandId = $request->get('maerke');
        if (!$request->get('q')
            && !$request->get('varenr')
            && !$request->get('minpris')
            && !$request->get('maxpris')
            && !$request->get('sogikke')
        ) {
            if (ctype_digit($brandId) || is_int($brandId)) {
                $brand = app(OrmService::class)->getOne(Brand::class, (int)$brandId);
                if ($brand && $brand->hasPages()) {
                    return redirect($brand->getCanonicalLink(), Response::HTTP_MOVED_PERMANENTLY);
                }
            }

            return redirect('/search/', Response::HTTP_MOVED_PERMANENTLY);
        }

        return null;
    }

    /**
     * Search for pages and generate a list or redirect if only one was found.
     *
     * @todo search in keywords
     *
     * @return Page[]
     */
    private function findPages(
        string $searchString,
        int $brandId,
        string $varenr = '',
        int $minpris = 0,
        int $maxpris = 0,
        string $antiWords = ''
    ): array {
        $db = app(DbService::class);

        $simpleQuery = '%' . preg_replace('/\s+/u', '%', $searchString) . '%';
        $simpleQuery = $db->quote($simpleQuery);

        //Full search
        $where = '';
        if ($brandId) {
            $where = ' AND `maerke` = ' . $brandId;
        }
        if ($varenr) {
            $where .= ' AND varenr LIKE ' . $db->quote($varenr . '%');
        }
        if ($minpris) {
            $where .= ' AND pris > ' . $minpris;
        }
        if ($maxpris) {
            $where .= ' AND pris < ' . $maxpris;
        }
        if ($antiWords) {
            $simpleAntiQuery = '%' . preg_replace('/\s+/u', '%', $antiWords) . '%';
            $simpleAntiQuery = $db->quote($simpleAntiQuery);
            $where .= ' AND !MATCH (navn, text, beskrivelse) AGAINST(' . $db->quote($antiWords) . ") > 0
            AND `navn` NOT LIKE $simpleAntiQuery
            AND `text` NOT LIKE $simpleAntiQuery
            AND `beskrivelse` NOT LIKE $simpleAntiQuery
            ";
        }

        $db->addLoadedTable('list_rows', 'lists', 'bind');
        $columns = [];
        foreach ($db->fetchArray('SHOW COLUMNS FROM sider') as $column) {
            $columns[] = $column['Field'];
        }

        $against = $db->quote($searchString);

        $pages = app(OrmService::class)->getByQuery(
            Page::class,
            '
            SELECT `' . implode('`, `', $columns) . '`
            FROM (SELECT sider.*, MATCH(navn, text, beskrivelse) AGAINST (' . $against . ') AS score
            FROM sider
            JOIN bind ON sider.id = bind.side AND bind.kat != -1
            WHERE (
                MATCH (navn, text, beskrivelse) AGAINST(' . $against . ") > 0
                OR `navn` LIKE $simpleQuery
                OR `text` LIKE $simpleQuery
                OR `beskrivelse` LIKE $simpleQuery
            )
            $where
            ORDER BY `score` DESC) x
            UNION
            SELECT sider.* FROM `list_rows`
            JOIN lists ON list_rows.list_id = lists.id
            JOIN sider ON lists.page_id = sider.id
            JOIN bind ON sider.id = bind.side AND bind.kat != -1
            WHERE list_rows.`cells` LIKE $simpleQuery"
            . $where
        );

        // Remove inactive pages
        foreach ($pages as $key => $page) {
            if ($page->isInactive()) {
                unset($pages[$key]);
            }
        }

        return $pages;
    }

    /**
     * Search for brands.
     *
     * @return Brand[]
     */
    private function findBrands(string $searchString, string $antiWords): array
    {
        if (!$searchString) {
            return [];
        }

        $simpleSearchString = '%' . preg_replace('/\s+/u', '%', $searchString) . '%';
        $simpleAntiWords = $antiWords ? '%' . preg_replace('/\s+/u', '%', $antiWords) . '%' : '';

        $db = app(DbService::class);

        return app(OrmService::class)->getByQuery(
            Brand::class,
            '
            SELECT * FROM `maerke`
            WHERE (
                MATCH (navn) AGAINST(' . $db->quote($searchString) . ') > 0
                OR navn LIKE ' . $db->quote($simpleSearchString) . '
            )
            AND !MATCH (navn) AGAINST(' . $db->quote($antiWords) . ') > 0
            AND navn NOT LIKE ' . $db->quote($simpleAntiWords) . '
            '
        );
    }

    /**
     * Search for categories.
     *
     * @return Category[]
     */
    private function findCategories(string $searchString, string $antiWords): array
    {
        if (!$searchString) {
            return [];
        }

        $simpleSearchString = '%' . preg_replace('/\s+/u', '%', $searchString) . '%';
        $simpleAntiWords = $antiWords ? '%' . preg_replace('/\s+/u', '%', $antiWords) . '%' : '';

        $db = app(DbService::class);

        $categories = app(OrmService::class)->getByQuery(
            Category::class,
            '
            SELECT *, MATCH (navn) AGAINST (' . $db->quote($searchString) . ') AS score
            FROM kat
            WHERE (
                MATCH (navn) AGAINST(' . $db->quote($searchString) . ') > 0
                OR navn LIKE ' . $db->quote($simpleSearchString) . '
            )
            AND !MATCH (navn) AGAINST(' . $db->quote($antiWords) . ') > 0
            AND navn NOT LIKE ' . $db->quote($simpleAntiWords) . "
            AND `vis` != '0'
            ORDER BY score, navn
            "
        );

        $activeCategories = [];
        foreach ($categories as $category) {
            if ($category->isVisible()) {
                $activeCategories[] = $category;
            }
        }

        return $activeCategories;
    }
}

1	<?php
2
3	namespace App\Http\Controllers;
4
5	use App\Http\Request;
6	use App\Models\Brand;
7	use App\Models\Category;
8	use App\Models\Page;
9	use App\Models\VolatilePage;
10	use App\Services\DbService;
11	use App\Services\OrmService;
12	use Symfony\Component\HttpFoundation\RedirectResponse;
13	use Symfony\Component\HttpFoundation\Response;
14
15	class Search extends Base
16	{
17	/**
18	* Show the advanced search form.
19	*/
20	public function index(): Response
21	{
22	$data = $this->basicPageData();	1✔
23	$crumbs = $data['crumbs'] ?? null;	1✔
24	if (!is_array($crumbs)) {	1✔
25	$crumbs = [];	×
26	}
27	$crumbs[] = new VolatilePage(_('Search'), '/search/');	1✔
28	$data['crumbs'] = $crumbs;	1✔
29	$data['brands'] = $this->getActiveBrands();	1✔
30
31	$response = $this->render('search', $data);	1✔
32
33	return $this->cachedResponse($response);	1✔
34	}
35
36	/**
37	* Get brands used on active pages.
38	*
39	* @return Brand[]
40	*/
41	private function getActiveBrands(): array
42	{
43	$orm = app(OrmService::class);	1✔
44
45	$categoryIds = [];	1✔
46	$categories = $orm->getByQuery(Category::class, 'SELECT * FROM kat');	1✔
47	foreach ($categories as $category) {	1✔
48	if ($category->isInactive()) {	1✔
49	continue;	1✔
50	}
51	$categoryIds[] = $category->getId();	1✔
52	}
53
54	return $orm->getByQuery(	1✔
55	Brand::class,	1✔
56	'	1✔
57	SELECT * FROM `maerke`
58	WHERE id IN(
59	SELECT DISTINCT sider.maerke FROM bind
60	JOIN sider ON sider.id = bind.side
61	WHERE bind.kat IN(' . implode(',', $categoryIds) . ')	1✔
62	) ORDER BY `navn`
63	'	1✔
64	);	1✔
65	}
66
67	/**
68	* Show search results.
69	*/
70	public function results(Request $request): Response
71	{
72	if ($response = $this->checkSearchable($request)) {	2✔
73	return $response;	2✔
74	}
75
76	$searchString = $request->get('q');	×
77	if (!is_string($searchString)) {	×
78	$searchString = '';	×
79	}
80	$brandId = $request->query->getInt('maerke');	×
81	$varenr = $request->get('varenr');	×
82	if (!is_string($varenr)) {	×
83	$varenr = '';	×
84	}
85	$minpris = $request->query->getInt('minpris', 0);	×
86	$maxpris = $request->query->getInt('maxpris', 0);	×
87	$antiWords = $request->get('sogikke');	×
88	if (!is_string($antiWords)) {	×
89	$antiWords = '';	×
90	}
91
92	$pages = $this->findPages($searchString, $brandId, $varenr, $minpris, $maxpris, $antiWords);	×
93	if (1 === count($pages)) {	×
94	$page = array_shift($pages);	×
95
96	return redirect($page->getCanonicalLink());	×
97	}
98
99	$brands = $this->findBrands(	×
100	$searchString,	×
101	$antiWords	×
102	);	×
103
104	$categories = $this->findCategories(	×
105	$searchString,	×
106	$antiWords	×
107	);	×
108
109	$contentList = array_merge($pages, $brands, $categories);	×
110
111	$requirement = new VolatilePage('Results', $request->getRequestUri(), $contentList);	×
112
113	$data = $this->basicPageData();	×
114	$crumbs = $data['crumbs'] ?? null;	×
115	if (!is_array($crumbs)) {	×
116	$crumbs = [];	×
117	}
118	$crumbs[] = new VolatilePage(_('Search'), '/search/');	×
119	$crumbs[] = $requirement;	×
120	$data['crumbs'] = $crumbs;	×
121
122	$data['renderable'] = $requirement;	×
123	$data['search'] = $searchString;	×
124
125	$response = $this->render('tiles', $data);	×
126
127	return $this->cachedResponse($response);	×
128	}
129
130	/**
131	* Check if we should performe the search or handle it else where.
132	*/
133	private function checkSearchable(Request $request): ?RedirectResponse
134	{
135	$brandId = $request->get('maerke');	2✔
136	if (!$request->get('q')	2✔
137	&& !$request->get('varenr')	2✔
138	&& !$request->get('minpris')	2✔
139	&& !$request->get('maxpris')	2✔
140	&& !$request->get('sogikke')	2✔
141	) {
142	if (ctype_digit($brandId) \|\| is_int($brandId)) {	2✔
143	$brand = app(OrmService::class)->getOne(Brand::class, (int)$brandId);	2✔
144	if ($brand && $brand->hasPages()) {	2✔
145	return redirect($brand->getCanonicalLink(), Response::HTTP_MOVED_PERMANENTLY);	1✔
146	}
147	}
148
149	return redirect('/search/', Response::HTTP_MOVED_PERMANENTLY);	1✔
150	}
151
152	return null;	×
153	}
154
155	/**
156	* Search for pages and generate a list or redirect if only one was found.
157	*
158	* @todo search in keywords
159	*
160	* @return Page[]
161	*/
162	private function findPages(
163	string $searchString,
164	int $brandId,
165	string $varenr = '',
166	int $minpris = 0,
167	int $maxpris = 0,
168	string $antiWords = ''
169	): array {
170	$db = app(DbService::class);	×
171
172	$simpleQuery = '%' . preg_replace('/\s+/u', '%', $searchString) . '%';	×
173	$simpleQuery = $db->quote($simpleQuery);	×
174
175	//Full search
176	$where = '';	×
177	if ($brandId) {	×
178	$where = ' AND `maerke` = ' . $brandId;	×
179	}
180	if ($varenr) {	×
181	$where .= ' AND varenr LIKE ' . $db->quote($varenr . '%');	×
182	}
183	if ($minpris) {	×
184	$where .= ' AND pris > ' . $minpris;	×
185	}
186	if ($maxpris) {	×
187	$where .= ' AND pris < ' . $maxpris;	×
188	}
189	if ($antiWords) {	×
190	$simpleAntiQuery = '%' . preg_replace('/\s+/u', '%', $antiWords) . '%';	×
191	$simpleAntiQuery = $db->quote($simpleAntiQuery);	×
192	$where .= ' AND !MATCH (navn, text, beskrivelse) AGAINST(' . $db->quote($antiWords) . ") > 0	×
193	AND `navn` NOT LIKE $simpleAntiQuery	×
194	AND `text` NOT LIKE $simpleAntiQuery	×
195	AND `beskrivelse` NOT LIKE $simpleAntiQuery	×
196	";	×
197	}
198
199	$db->addLoadedTable('list_rows', 'lists', 'bind');	×
200	$columns = [];	×
201	foreach ($db->fetchArray('SHOW COLUMNS FROM sider') as $column) {	×
202	$columns[] = $column['Field'];	×
203	}
204
205	$against = $db->quote($searchString);	×
206
207	$pages = app(OrmService::class)->getByQuery(	×
208	Page::class,	×
209	'	×
210	SELECT `' . implode('`, `', $columns) . '`	×
211	FROM (SELECT sider.*, MATCH(navn, text, beskrivelse) AGAINST (' . $against . ') AS score	×
212	FROM sider
213	JOIN bind ON sider.id = bind.side AND bind.kat != -1
214	WHERE (
215	MATCH (navn, text, beskrivelse) AGAINST(' . $against . ") > 0	×
216	OR `navn` LIKE $simpleQuery	×
217	OR `text` LIKE $simpleQuery	×
218	OR `beskrivelse` LIKE $simpleQuery	×
219	)
220	$where	×
221	ORDER BY `score` DESC) x
222	UNION
223	SELECT sider.* FROM `list_rows`
224	JOIN lists ON list_rows.list_id = lists.id
225	JOIN sider ON lists.page_id = sider.id
226	JOIN bind ON sider.id = bind.side AND bind.kat != -1
227	WHERE list_rows.`cells` LIKE $simpleQuery"	×
228	. $where	×
229	);	×
230
231	// Remove inactive pages
232	foreach ($pages as $key => $page) {	×
233	if ($page->isInactive()) {	×
234	unset($pages[$key]);	×
235	}
236	}
237
238	return $pages;	×
239	}
240
241	/**
242	* Search for brands.
243	*
244	* @return Brand[]
245	*/
246	private function findBrands(string $searchString, string $antiWords): array
247	{
248	if (!$searchString) {	×
249	return [];	×
250	}
251
252	$simpleSearchString = '%' . preg_replace('/\s+/u', '%', $searchString) . '%';	×
253	$simpleAntiWords = $antiWords ? '%' . preg_replace('/\s+/u', '%', $antiWords) . '%' : '';	×
254
255	$db = app(DbService::class);	×
256
257	return app(OrmService::class)->getByQuery(	×
258	Brand::class,	×
259	'	×
260	SELECT * FROM `maerke`
261	WHERE (
262	MATCH (navn) AGAINST(' . $db->quote($searchString) . ') > 0	×
263	OR navn LIKE ' . $db->quote($simpleSearchString) . '	×
264	)
265	AND !MATCH (navn) AGAINST(' . $db->quote($antiWords) . ') > 0	×
266	AND navn NOT LIKE ' . $db->quote($simpleAntiWords) . '	×
267	'	×
268	);	×
269	}
270
271	/**
272	* Search for categories.
273	*
274	* @return Category[]
275	*/
276	private function findCategories(string $searchString, string $antiWords): array
277	{
278	if (!$searchString) {	×
279	return [];	×
280	}
281
282	$simpleSearchString = '%' . preg_replace('/\s+/u', '%', $searchString) . '%';	×
283	$simpleAntiWords = $antiWords ? '%' . preg_replace('/\s+/u', '%', $antiWords) . '%' : '';	×
284
285	$db = app(DbService::class);	×
286
287	$categories = app(OrmService::class)->getByQuery(	×
288	Category::class,	×
289	'	×
290	SELECT *, MATCH (navn) AGAINST (' . $db->quote($searchString) . ') AS score	×
291	FROM kat
292	WHERE (
293	MATCH (navn) AGAINST(' . $db->quote($searchString) . ') > 0	×
294	OR navn LIKE ' . $db->quote($simpleSearchString) . '	×
295	)
296	AND !MATCH (navn) AGAINST(' . $db->quote($antiWords) . ') > 0	×
297	AND navn NOT LIKE ' . $db->quote($simpleAntiWords) . "	×
298	AND `vis` != '0'
299	ORDER BY score, navn
300	"	×
301	);	×
302
303	$activeCategories = [];	×
304	foreach ($categories as $category) {	×
305	if ($category->isVisible()) {	×
306	$activeCategories[] = $category;	×
307	}
308	}
309
310	return $activeCategories;	×
311	}
312	}

AJenbo / agcms / 21420560247

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous