From 4810a377ac2a59bdfa90d4f4c77e37ba519cabbd Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Jan 2022 14:13:40 +0100 Subject: [PATCH 1/3] Avoid passing non-string args to `ctype_*()` functions --- src/Control/SearchBar/Terms.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Control/SearchBar/Terms.php b/src/Control/SearchBar/Terms.php index 4918859e..96562359 100644 --- a/src/Control/SearchBar/Terms.php +++ b/src/Control/SearchBar/Terms.php @@ -191,7 +191,7 @@ protected function assembleCondition(Filter\Condition $filter, BaseHtmlElement $ $this->assembleTerm($operatorData, $group); - if (! empty($value) || ctype_digit($value)) { + if (! empty($value) || ! is_string($value) || ctype_digit($value)) { $valueData = [ 'class' => 'value', 'type' => 'value', From 5ea271a5b034306a02ebde0fb2e7a548792b0839 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Jan 2022 14:16:48 +0100 Subject: [PATCH 2/3] Ensure Return Type Compatibility with Internal Classes --- src/Widget/Tabs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widget/Tabs.php b/src/Widget/Tabs.php index d75170f5..32ba8e99 100644 --- a/src/Widget/Tabs.php +++ b/src/Widget/Tabs.php @@ -169,7 +169,7 @@ public function get($name) * * @return int */ - public function count() + public function count(): int { return $this->tabs->count(); } From c44f252007bd3ecb07b9c29fc8cb2c3da8f0e1f3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Fri, 14 Jan 2022 14:19:04 +0100 Subject: [PATCH 3/3] Require PHP 7.2+ --- .github/workflows/php.yml | 9 ++------- composer.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index fc1f015f..03b54b75 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] + php: ['7.2', '7.3', '7.4', '8.0', '8.1'] os: ['ubuntu-latest'] steps: @@ -51,13 +51,8 @@ jobs: strategy: fail-fast: false matrix: - php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1'] + php: ['7.2', '7.3', '7.4', '8.0', '8.1'] os: ['ubuntu-latest'] - include: - - php: '7.0' - phpunit-version: 6.5 - - php: '7.1' - phpunit-version: 7.5 steps: - name: Checkout code base diff --git a/composer.json b/composer.json index d42de350..7c18ab06 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } }, "require": { - "php": ">=7.0", + "php": ">=7.2", "ext-json": "*", "ipl/html": ">=0.4.0", "ipl/stdlib": ">=0.11.0",