kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-17 20:08:52 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
James Cole
2018-04-28 06:23:13 +02:00
parent 6f0e1c79ac
commit 13b78bdc20
218 changed files with 621 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Support/Search/Search.php
View File

@@ -63,8 +63,8 @@ class Search implements SearchInterface
public function getWordsAsString(): string
{
$string = implode(' ', $this->words);
if (0 === strlen($string)) {
return is_string($this->originalQuery) ? $this->originalQuery : '';
if (0 === \strlen($string)) {
return \is_string($this->originalQuery) ? $this->originalQuery : '';
}
return $string;
@@ -94,7 +94,7 @@ class Search implements SearchInterface
$filteredQuery = str_replace($match, '', $filteredQuery);
}
$filteredQuery = trim(str_replace(['"', "'"], '', $filteredQuery));
if (strlen($filteredQuery) > 0) {
if (\strlen($filteredQuery) > 0) {
$this->words = array_map('trim', explode(' ', $filteredQuery));
}
}
@@ -147,7 +147,7 @@ class Search implements SearchInterface
// Update counters
++$page;
$processed += count($set);
$processed += \count($set);
Log::debug(sprintf('Page is now %d, processed is %d', $page, $processed));
@@ -245,10 +245,10 @@ class Search implements SearchInterface
private function extractModifier(string $string)
{
$parts = explode(':', $string);
if (2 === count($parts) && strlen(trim((string)$parts[0])) > 0 && strlen(trim((string)$parts[1]))) {
if (2 === \count($parts) && \strlen(trim((string)$parts[0])) > 0 && \strlen(trim((string)$parts[1]))) {
$type = trim((string)$parts[0]);
$value = trim((string)$parts[1]);
if (in_array($type, $this->validModifiers)) {
if (\in_array($type, $this->validModifiers)) {
// filter for valid type
$this->modifiers->push(['type' => $type, 'value' => $value]);
}
@@ -266,7 +266,7 @@ class Search implements SearchInterface
Log::debug(sprintf('Now at transaction #%d', $transaction->id));
// first "modifier" is always the text of the search:
// check descr of journal:
if (count($this->words) > 0
if (\count($this->words) > 0
&& !$this->strposArray(strtolower((string)$transaction->description), $this->words)
&& !$this->strposArray(strtolower((string)$transaction->transaction_description), $this->words)
) {
@@ -294,7 +294,7 @@ class Search implements SearchInterface
*/
private function strposArray(string $haystack, array $needle)
{
if (0 === strlen($haystack)) {
if (0 === \strlen($haystack)) {
return false;
}
foreach ($needle as $what) {