From 72ddecb2804d200df0b2d07b885d99c3fe0e0f76 Mon Sep 17 00:00:00 2001 From: Tomas Norre Mikkelsen Date: Tue, 8 Oct 2024 15:11:57 +0200 Subject: [PATCH 1/3] ci: Update coveralls token in workflow --- .github/workflows/Coveralls.yml | 2 +- Classes/CrawlStrategy/SubProcessExecutionStrategy.php | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/Coveralls.yml b/.github/workflows/Coveralls.yml index 26bd19b1d..bb0cea1a9 100644 --- a/.github/workflows/Coveralls.yml +++ b/.github/workflows/Coveralls.yml @@ -49,7 +49,7 @@ jobs: - name: Upload coverage results to Coveralls env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} run: | composer global require php-coveralls/php-coveralls --no-progress --no-suggest --no-interaction /home/runner/.composer/vendor/bin/php-coveralls -c .coveralls.yml -vvv --json_path=var/log/coveralls-upload.json diff --git a/Classes/CrawlStrategy/SubProcessExecutionStrategy.php b/Classes/CrawlStrategy/SubProcessExecutionStrategy.php index 218c8550c..672186720 100644 --- a/Classes/CrawlStrategy/SubProcessExecutionStrategy.php +++ b/Classes/CrawlStrategy/SubProcessExecutionStrategy.php @@ -57,16 +57,6 @@ public function fetchUrlContents(UriInterface $url, string $crawlerId) $url = (string) $url; $parsedUrl = parse_url($url); - if ($parsedUrl === false) { - $this->logger?->debug( - sprintf('Could not parse_url() for string "%s"', $url), - [ - 'crawlerId' => $crawlerId, - ] - ); - return false; - } - if (!isset($parsedUrl['scheme']) || !in_array($parsedUrl['scheme'], ['', 'http', 'https'], true)) { $this->logger?->debug(sprintf('Scheme does not match for url "%s"', $url), [ 'crawlerId' => $crawlerId, From 0ee574e194c0454e894f3f0bdabc3f9de515ba5d Mon Sep 17 00:00:00 2001 From: Tomas Norre Mikkelsen Date: Tue, 8 Oct 2024 15:51:12 +0200 Subject: [PATCH 2/3] ci: Update mysql in coveralls --- .github/workflows/Coveralls.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Coveralls.yml b/.github/workflows/Coveralls.yml index bb0cea1a9..fd4e7580d 100644 --- a/.github/workflows/Coveralls.yml +++ b/.github/workflows/Coveralls.yml @@ -14,10 +14,10 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up MySQL 5.7 + - name: Set up MySQL 8.0 uses: mirromutth/mysql-action@v1.1 with: - mysql version: 5.7 + mysql version: 8.0 mysql root password: 'root' - name: Checkout @@ -35,12 +35,12 @@ jobs: - name: Unit Tests run: | export "UNIT_XML"=Tests/UnitTests.xml - .Build/bin/phpunit --coverage-filter Classes --coverage-clover=unittest-coverage.clover --colors -c $UNIT_XML Tests/Unit + XDEBUG_MODE=coverage .Build/bin/phpunit --coverage-filter Classes --coverage-clover=unittest-coverage.clover --colors -c $UNIT_XML Tests/Unit - name: Functional Tests run: | export "FUNCTIONAL_XML"=Tests/FunctionalTests.xml - .Build/bin/phpunit --coverage-filter Classes --coverage-clover=functional-coverage.clover --colors -c $FUNCTIONAL_XML Tests/Functional --process-isolation + XDEBUG_MODE=coverage .Build/bin/phpunit --coverage-filter Classes --coverage-clover=functional-coverage.clover --colors -c $FUNCTIONAL_XML Tests/Functional --process-isolation env: typo3DatabaseHost: 127.0.0.1 typo3DatabaseName: typo3 From 98a3ebad2519627f666caf7774945732665859de Mon Sep 17 00:00:00 2001 From: Tomas Norre Mikkelsen Date: Tue, 8 Oct 2024 16:03:17 +0200 Subject: [PATCH 3/3] ci: Change php-coveralls command --- .github/workflows/Coveralls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Coveralls.yml b/.github/workflows/Coveralls.yml index fd4e7580d..367160c37 100644 --- a/.github/workflows/Coveralls.yml +++ b/.github/workflows/Coveralls.yml @@ -52,5 +52,5 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} run: | composer global require php-coveralls/php-coveralls --no-progress --no-suggest --no-interaction - /home/runner/.composer/vendor/bin/php-coveralls -c .coveralls.yml -vvv --json_path=var/log/coveralls-upload.json - continue-on-error: true + /home/runner/.composer/vendor/bin/php-coveralls -c .coveralls.yml -vvv --json_path=Tests/coveralls-upload.json + #continue-on-error: true