From 4c5135cc0fafbc5e7b947620cfed24c4ce81d7bb Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:00:57 +0100 Subject: [PATCH 1/7] Update php version --- composer.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 5e55c4d..e372820 100644 --- a/composer.json +++ b/composer.json @@ -17,22 +17,22 @@ } ], "require": { - "php": ">=7.4", - "symfony/options-resolver": "^4.4|^5.3" + "php": "~8.1.0|~8.2.0", + "symfony/options-resolver": "^4.4|^5.3|^6.2" }, "require-dev": { "doctrine/cache": "^2.1.1", "doctrine/common": "^3.1.2", "doctrine/orm": "^2.9.3", "phpunit/phpunit": "^8.0|^9.0", - "symfony/dependency-injection": "^4.4|^5.3", - "symfony/config": "^4.4|^5.3", - "symfony/var-dumper": "^4.4|^5.3", - "symfony/yaml": "^4.4|^5.3", + "symfony/dependency-injection": "^4.4|^5.3|^6.2", + "symfony/config": "^4.4|^5.3|^6.2", + "symfony/var-dumper": "^4.4|^5.3|^6.2", + "symfony/yaml": "^4.4|^5.3|^6.2", "twig/twig": "^3.3.2", "phpspec/prophecy-phpunit": "^2.0", - "symfony/cache": "^5.3", - "symfony/http-kernel": "^5.3" + "symfony/cache": "^5.3|^6.2", + "symfony/http-kernel": "^5.3|^6.2" }, "autoload": { "psr-4": { From a16247e7246cba4dcfc8eb064af92f0ab824c5b6 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:07:27 +0100 Subject: [PATCH 2/7] Update travis CI --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf23181..5bc030e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,15 @@ language: php php: - - 7.4 - - 8.0 + - 8.1 + - 8.2 - nightly matrix: include: - - php: 7.4 + - php: 8.1 env: dependencies=lowest - - php: 8.0 + - php: 8.2 env: dependencies=lowest before_install: From 2998f5d6190bfc2d3f17df6510caa6c9eb6c7a85 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:20:25 +0100 Subject: [PATCH 3/7] Try to fix travis --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5bc030e..78341b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,18 @@ language: php -php: - - 8.1 - - 8.2 - - nightly - -matrix: +jobs: include: + - php: 8.0 + dist: focal + - php: 8.1 + dist: focal - php: 8.1 + dist: focal env: dependencies=lowest - php: 8.2 + dist: focal + - php: 8.2 + dist: focal env: dependencies=lowest before_install: From 0920c5021e94acfcf1e7009ce0fafe62d8c23577 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:22:28 +0100 Subject: [PATCH 4/7] Fix Basic::count signature --- src/Event/Collection/Basic.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Event/Collection/Basic.php b/src/Event/Collection/Basic.php index 7b2cd99..d5e7f70 100644 --- a/src/Event/Collection/Basic.php +++ b/src/Event/Collection/Basic.php @@ -104,10 +104,7 @@ public function find($index) return $result; } - /** - * @return int - */ - public function count() + public function count(): int { return count($this->events); } From 9509d16e95b18183e1a2052cb8359380dab46361 Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:25:09 +0100 Subject: [PATCH 5/7] Add missing libonig5 --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 78341b0..5eba9eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,9 @@ jobs: env: dependencies=lowest before_install: + - sudo apt-get update + - sudo apt-get install libonig5 + - php -v - composer self-update install: From d406da0b63b67d8df9118e8c2e82450d4cb3d37a Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:27:52 +0100 Subject: [PATCH 6/7] Drop out-of-life php 8.0 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5eba9eb..fadb840 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: php jobs: include: - - php: 8.0 - dist: focal - php: 8.1 dist: focal - php: 8.1 From 989b5c5a9de1ae0c74f1ab473961733c4404636d Mon Sep 17 00:00:00 2001 From: Jan Trejbal Date: Sun, 15 Jan 2023 18:33:15 +0100 Subject: [PATCH 7/7] Update ocular --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fadb840..6d1531b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_install: - sudo apt-get install libonig5 - php -v - composer self-update + - composer global require scrutinizer/ocular install: - travis_retry composer install --no-interaction --prefer-source @@ -27,5 +28,4 @@ script: - ./vendor/bin/phpunit --coverage-clover=coverage.clover after_script: - - wget https://scrutinizer-ci.com/ocular.phar - - php ocular.phar code-coverage:upload --format=php-clover coverage.clover + - ~/.composer/vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover