Fix test matrix, use Ubuntu 20.04 (#37)

mpdude · web-flow · commit b9a672fba4b8 · 2022-01-21T11:33:53.000+01:00
Switch GitHub Actions to Ubuntu 20.04 and make sure matrix tests really use the indicated PHP versions
diff --git a/.github/workflows/fix-cs-php.yml b/.github/workflows/fix-cs-php.yml
@@ -1,6 +1,3 @@
-# Update this by running
-# curl https://gist.githubusercontent.com/mpdude/ca93a185bcbf56eb7e341632ad4f8263/raw/fix-cs-php.yml > .github/workflows/fix-cs-php.yml
-
 on:
     push:
         branches:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
diff --git a/.github/workflows/lock-symfony-version.sh b/.github/workflows/lock-symfony-version.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cat <<< $(jq --arg version $VERSION '.require  |= with_entries(if ((.key|test("^symfony/monolog")|not) and (.key|test("^symfony/"))) then .value=$version else . end)' < composer.json) > composer.json
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,25 +1,39 @@
-name: Run Tests
+name: Tests
 
 on:
     push:
-        branches: 
+        branches:
             - master
     pull_request:
 
+env:
+    SYMFONY_DEPRECATIONS_HELPER: weak
+
 jobs:
     PHPUnit:
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
-                php: [7.2, 7.3, 7.4]
+                include:
+                    - { php-version: 7.2, symfony-locked-version: none, dependency-version: prefer-lowest }
+                    - { php-version: 7.4, symfony-locked-version: 4.4.*, dependency-version: prefer-stable }
+                    - { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-stable }
+        name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})
         steps:
             -   uses: actions/checkout@v2
-            -   run: composer install --no-interaction --no-scripts --no-progress --no-suggest
-            -   run: mkdir -p build/logs
-            -   run: vendor/bin/phpunit --coverage-clover=build/logs/clover.xml
-            # Commented out Coveralls reporting until https://github.com/php-coveralls/php-coveralls/pull/275 is resolved
-            #-   run: tools/php-coveralls --verbose
-            #    env:
-            #        COVERALLS_RUN_LOCALLY: 1
-            #        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+            -   uses: shivammathur/setup-php@v2
+                with:
+                  php-version: ${{ matrix.php-version }}
+                  tools: composer:v2
+            -   uses: actions/cache@v2
+                with:
+                    path: vendor
+                    key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
+                    restore-keys: |
+                        composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
+            -   run: VERSION=${{ matrix.symfony-locked-version }} .github/workflows/lock-symfony-version.sh
+                if: matrix.symfony-locked-version != 'none'
+            -   run: composer update --${{ matrix.dependency-version }} --no-interaction --no-scripts --no-progress --ansi
+            -   run: composer show
+            -   run: vendor/bin/phpunit
diff --git a/Tests/Twig/ExtensionIntegrationTest.php b/Tests/Twig/ExtensionIntegrationTest.php
@@ -22,8 +22,8 @@ public function testExpressionGetsTransformedByTwigEnvironment()
 
         $output = $this->renderWithExtension('{{ piwik_code() }}', new Extension(false, $siteId, $hostname, false));
 
-        $this->assertContains((string) $siteId, $output);
-        $this->assertContains($hostname, $output);
+        self::assertStringContainsString((string) $siteId, $output);
+        self::assertStringContainsString($hostname, $output);
     }
 
     public function testCustomApiCallsThroughPiwikFunction()
@@ -33,7 +33,7 @@ public function testCustomApiCallsThroughPiwikFunction()
             {{ piwik_code() }}
         ", new Extension(false, 1, 'my.host', false));
 
-        $this->assertContains('["foo","bar","baz"]', $output);
+        self::assertStringContainsString('["foo","bar","baz"]', $output);
     }
 
     private function renderWithExtension($templateString, ExtensionInterface $extension)
diff --git a/Tests/Twig/ExtensionTest.php b/Tests/Twig/ExtensionTest.php
@@ -10,26 +10,26 @@ class ExtensionTest extends TestCase
     public function testPiwikCodeReturnsNoScriptWhenDisabled()
     {
         $extension = new Extension(true, 1, '', false);
-        $this->assertNotContains('script', $extension->piwikCode());
+        self::assertStringNotContainsString('script', $extension->piwikCode());
     }
 
     public function testPiwikCodeReturnsScript()
     {
         $extension = new Extension(false, 1, '', false);
-        $this->assertContains('script', $extension->piwikCode());
+        self::assertStringContainsString('script', $extension->piwikCode());
     }
 
     public function testPiwikCodeContainsSiteId()
     {
         $siteId = 1234;
         $extension = new Extension(false, $siteId, '', false);
-        $this->assertContains((string) $siteId, $extension->piwikCode());
+        self::assertStringContainsString((string) $siteId, $extension->piwikCode());
     }
 
     public function testPiwikCodeContainsApiURL()
     {
         $extension = new Extension(false, 1, 'my.host', '/js/');
-        $this->assertContains('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());
+        self::assertStringContainsString('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());
     }
 
     public function testPiwikCodeDoesNotContainApiURL()
@@ -38,39 +38,39 @@ public function testPiwikCodeDoesNotContainApiURL()
         $hostname = 'myHost.de';
         $path = 'piwik.php';
         $extension = new Extension(false, $siteId, $hostname, $path);
-        $this->assertNotContains('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());
+        self::assertStringNotContainsString('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());
     }
 
     public function testPiwikCodeContainsHostName()
     {
         $hostname = 'myHost.de';
         $extension = new Extension(false, 1, $hostname, false);
-        $this->assertContains($hostname, $extension->piwikCode());
+        self::assertStringContainsString($hostname, $extension->piwikCode());
     }
 
     public function testAdditionalApiCallsCanBeAdded()
     {
         $extension = new Extension(false, 1, 'my.host', false);
         $extension->piwikPush('foo', 'bar', 'baz');
-        $this->assertContains('["foo","bar","baz"]', $extension->piwikCode());
+        self::assertStringContainsString('["foo","bar","baz"]', $extension->piwikCode());
     }
 
     public function testTrackPageViewEnabledByDefault()
     {
         $extension = new Extension(false, 1, 'my.host', false);
-        $this->assertContains('"trackPageView"', $extension->piwikCode());
+        self::assertStringContainsString('"trackPageView"', $extension->piwikCode());
     }
 
     public function testCookiesCanBeDisabled()
     {
         $extension = new Extension(false, 1, 'my.host', false);
-        $this->assertContains('"disableCookies"', $extension->piwikCode());
+        self::assertStringContainsString('"disableCookies"', $extension->piwikCode());
     }
 
     public function testCookiesCanBeEnabled()
     {
         $extension = new Extension(false, 1, 'my.host', false, false);
-        $this->assertNotContains('"disableCookies"', $extension->piwikCode());
+        self::assertStringNotContainsString('"disableCookies"', $extension->piwikCode());
     }
 
     public function testTrackSiteSearchDisablesPageTracking()
@@ -79,8 +79,8 @@ public function testTrackSiteSearchDisablesPageTracking()
         $extension->piwikPush('trackSiteSearch', 'Banana', 'Organic Food', 42);
 
         $code = $extension->piwikCode();
-        $this->assertContains('"trackSiteSearch"', $code);
-        $this->assertNotContains('"trackPageView"', $code);
+        self::assertStringContainsString('"trackSiteSearch"', $code);
+        self::assertStringNotContainsString('"trackPageView"', $code);
     }
 
     public function testIsTwigExtension()
diff --git a/composer.json b/composer.json
@@ -29,8 +29,8 @@
         "twig/twig": "^1.34|^2.0|^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.0",
-        "symfony/phpunit-bridge": "*"
+        "phpunit/phpunit": "^8.5",
+        "symfony/phpunit-bridge": ">= 4.4"
     },
     "config": {
         "sort-packages": true

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+cat <<< $(jq --arg version $VERSION '.require \|= with_entries(if ((.key\|test("^symfony/monolog")\|not) and (.key\|test("^symfony/"))) then .value=$version else . end)' < composer.json) > composer.json`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ public function testExpressionGetsTransformedByTwigEnvironment()`
`22`	`22`
`23`	`23`	`$output = $this->renderWithExtension('{{ piwik_code() }}', new Extension(false, $siteId, $hostname, false));`
`24`	`24`
`25`		`- $this->assertContains((string) $siteId, $output);`
`26`		`- $this->assertContains($hostname, $output);`
	`25`	`+ self::assertStringContainsString((string) $siteId, $output);`
	`26`	`+ self::assertStringContainsString($hostname, $output);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function testCustomApiCallsThroughPiwikFunction()`
`@@ -33,7 +33,7 @@ public function testCustomApiCallsThroughPiwikFunction()`
`33`	`33`	`{{ piwik_code() }}`
`34`	`34`	`", new Extension(false, 1, 'my.host', false));`
`35`	`35`
`36`		`- $this->assertContains('["foo","bar","baz"]', $output);`
	`36`	`+ self::assertStringContainsString('["foo","bar","baz"]', $output);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`private function renderWithExtension($templateString, ExtensionInterface $extension)`
Original file line number	Diff line number	Diff line change
`@@ -10,26 +10,26 @@ class ExtensionTest extends TestCase`
`10`	`10`	`public function testPiwikCodeReturnsNoScriptWhenDisabled()`
`11`	`11`	`{`
`12`	`12`	`$extension = new Extension(true, 1, '', false);`
`13`		`- $this->assertNotContains('script', $extension->piwikCode());`
	`13`	`+ self::assertStringNotContainsString('script', $extension->piwikCode());`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public function testPiwikCodeReturnsScript()`
`17`	`17`	`{`
`18`	`18`	`$extension = new Extension(false, 1, '', false);`
`19`		`- $this->assertContains('script', $extension->piwikCode());`
	`19`	`+ self::assertStringContainsString('script', $extension->piwikCode());`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function testPiwikCodeContainsSiteId()`
`23`	`23`	`{`
`24`	`24`	`$siteId = 1234;`
`25`	`25`	`$extension = new Extension(false, $siteId, '', false);`
`26`		`- $this->assertContains((string) $siteId, $extension->piwikCode());`
	`26`	`+ self::assertStringContainsString((string) $siteId, $extension->piwikCode());`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public function testPiwikCodeContainsApiURL()`
`30`	`30`	`{`
`31`	`31`	`$extension = new Extension(false, 1, 'my.host', '/js/');`
`32`		`- $this->assertContains('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());`
	`32`	`+ self::assertStringContainsString('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public function testPiwikCodeDoesNotContainApiURL()`
`@@ -38,39 +38,39 @@ public function testPiwikCodeDoesNotContainApiURL()`
`38`	`38`	`$hostname = 'myHost.de';`
`39`	`39`	`$path = 'piwik.php';`
`40`	`40`	`$extension = new Extension(false, $siteId, $hostname, $path);`
`41`		`- $this->assertNotContains('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());`
	`41`	`+ self::assertStringNotContainsString('_paq.push([\'setAPIUrl\', u]);', $extension->piwikCode());`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public function testPiwikCodeContainsHostName()`
`45`	`45`	`{`
`46`	`46`	`$hostname = 'myHost.de';`
`47`	`47`	`$extension = new Extension(false, 1, $hostname, false);`
`48`		`- $this->assertContains($hostname, $extension->piwikCode());`
	`48`	`+ self::assertStringContainsString($hostname, $extension->piwikCode());`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function testAdditionalApiCallsCanBeAdded()`
`52`	`52`	`{`
`53`	`53`	`$extension = new Extension(false, 1, 'my.host', false);`
`54`	`54`	`$extension->piwikPush('foo', 'bar', 'baz');`
`55`		`- $this->assertContains('["foo","bar","baz"]', $extension->piwikCode());`
	`55`	`+ self::assertStringContainsString('["foo","bar","baz"]', $extension->piwikCode());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function testTrackPageViewEnabledByDefault()`
`59`	`59`	`{`
`60`	`60`	`$extension = new Extension(false, 1, 'my.host', false);`
`61`		`- $this->assertContains('"trackPageView"', $extension->piwikCode());`
	`61`	`+ self::assertStringContainsString('"trackPageView"', $extension->piwikCode());`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function testCookiesCanBeDisabled()`
`65`	`65`	`{`
`66`	`66`	`$extension = new Extension(false, 1, 'my.host', false);`
`67`		`- $this->assertContains('"disableCookies"', $extension->piwikCode());`
	`67`	`+ self::assertStringContainsString('"disableCookies"', $extension->piwikCode());`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public function testCookiesCanBeEnabled()`
`71`	`71`	`{`
`72`	`72`	`$extension = new Extension(false, 1, 'my.host', false, false);`
`73`		`- $this->assertNotContains('"disableCookies"', $extension->piwikCode());`
	`73`	`+ self::assertStringNotContainsString('"disableCookies"', $extension->piwikCode());`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`public function testTrackSiteSearchDisablesPageTracking()`
`@@ -79,8 +79,8 @@ public function testTrackSiteSearchDisablesPageTracking()`
`79`	`79`	`$extension->piwikPush('trackSiteSearch', 'Banana', 'Organic Food', 42);`
`80`	`80`
`81`	`81`	`$code = $extension->piwikCode();`
`82`		`- $this->assertContains('"trackSiteSearch"', $code);`
`83`		`- $this->assertNotContains('"trackPageView"', $code);`
	`82`	`+ self::assertStringContainsString('"trackSiteSearch"', $code);`
	`83`	`+ self::assertStringNotContainsString('"trackPageView"', $code);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`public function testIsTwigExtension()`