Add test cases for code coverage, update of workflow actions (#1)

devanych · web-flow · commit 22c70c785f55 · 2021-07-20T17:03:48.000+03:00
* Update dev dependencies

* Cleanup psalm.xml

* Add more test cases for code coverage

* Update .scrutinizer.yml

* Update of workflow actions

* Format phpunit.xml.dist
diff --git a/.editorconfig b/.editorconfig
@@ -12,3 +12,6 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,10 +6,11 @@ name: build
 
 jobs:
   tests:
-    name: PHP ${{ matrix.php-version }}-${{ matrix.os }}
+    name: PHP ${{ matrix.php }}-${{ matrix.os }}
+
     runs-on: ${{ matrix.os }}
+
     env:
-      extensions: curl, mbstring, dom
       key: cache-v1
 
     strategy:
@@ -18,19 +19,18 @@ jobs:
           - ubuntu-latest
           - windows-latest
 
-        php-version:
+        php:
           - "7.4"
           - "8.0"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
-          extensions: ${{ env.extensions }}
+          php-version: ${{ matrix.php }}
           ini-values: date.timezone='UTC'
           tools: composer:v2
           coverage: pcov
@@ -44,38 +44,18 @@ jobs:
         run: echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
-          key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+          key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-              php${{ matrix.php-version }}-composer-
+            php${{ matrix.php }}-composer-
 
       - name: Update composer
         run: composer self-update
 
-      - name: Install dependencies with composer php 7.4
-        if: matrix.php-version == '7.4'
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
-
-      - name: Install dependencies with composer php 8.0
-        if: matrix.php-version == '8.0'
-        run: composer update --ignore-platform-reqs --prefer-dist --no-interaction --no-progress --optimize-autoloader
-
-      - name: PHPUnit run with coverage on Linux PHP 7.4
-        if: matrix.os == 'ubuntu-latest' && matrix.php-version == '7.4'
-        run: vendor/bin/phpunit --coverage-clover=coverage.clover
-
-      - name: PHPUnit run without coverage on Linux PHP 8.0
-        if: matrix.os == 'ubuntu-latest' && matrix.php-version == '8.0'
-        run: vendor/bin/phpunit
-
-      - name: PHPUnit run without coverage on Windows
-        if: matrix.os == 'windows-latest'
-        run: vendor/bin/phpunit
+      - name: Install dependencies with composer
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
-      - name: Code coverage scrutinizer on Linux PHP 7.4
-        if: matrix.os == 'ubuntu-latest' && matrix.php-version == '7.4'
-        run: |
-          wget https://scrutinizer-ci.com/ocular.phar
-          php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+      - name: Run tests with phpunit
+        run: vendor/bin/phpunit --colors=always
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -6,7 +6,7 @@ name: static
 
 jobs:
   static:
-    name: PHP ${{ matrix.php-version }}-${{ matrix.os }}
+    name: PHP ${{ matrix.php }}-${{ matrix.os }}
 
     runs-on: ${{ matrix.os }}
 
@@ -15,17 +15,18 @@ jobs:
         os:
           - ubuntu-latest
 
-        php-version:
+        php:
           - "7.4"
+          - "8.0"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2
 
       - name: Install PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
+          php-version: ${{ matrix.php }}
           ini-values: memory_limit=-1
           tools: composer:v2
 
@@ -36,15 +37,15 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
-          key: php${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}
+          key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-              php${{ matrix.php-version }}-composer-
+            php${{ matrix.php }}-composer-
 
       - name: Update composer
         run: composer self-update
 
       - name: Install dependencies with composer
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: PHPCS check
         run: vendor/bin/phpcs
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,18 +1,33 @@
-build:
-    environment:
-        php: "7.4"
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-filter:
-    paths:
-        - "src/*"
 checks:
-    php: true
-tools:
-    php_code_coverage:
-        enabled: true
-    external_code_coverage:
-        timeout: 600
+  php: true
+
+filter:
+  paths:
+    - "src/*"
+
+build:
+  nodes:
+    analysis:
+      environment:
+        php: 7.4.12
+
+      tests:
+        override:
+          - php-scrutinizer-run
+
+    tests-and-coverage:
+      environment:
+        php: 7.4.12
+
+      dependencies:
+        override:
+          - composer self-update
+          - composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      tests:
+        override:
+          - command: "./vendor/bin/phpunit --coverage-clover ./coverage.xml"
+            on_node: 1
+            coverage:
+              file: coverage.xml
+              format: php-clover
diff --git a/composer.json b/composer.json
@@ -24,8 +24,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
-        "squizlabs/php_codesniffer": "^3.5",
-        "vimeo/psalm": "^4.3"
+        "squizlabs/php_codesniffer": "^3.6",
+        "vimeo/psalm": "^4.8"
     },
     "provide": {
         "psr/http-message-implementation": "1.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
-        bootstrap="./vendor/autoload.php"
-        executionOrder="depends,defects"
-        beStrictAboutCoversAnnotation="true"
-        beStrictAboutOutputDuringTests="true"
-        beStrictAboutTodoAnnotatedTests="true"
-        convertWarningsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertErrorsToExceptions="true"
-        stopOnFailure="false"
-        verbose="true"
-        colors="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+    bootstrap="./vendor/autoload.php"
+    executionOrder="depends,defects"
+    beStrictAboutCoversAnnotation="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTodoAnnotatedTests="true"
+    convertWarningsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertErrorsToExceptions="true"
+    stopOnFailure="false"
+    verbose="true"
+    colors="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
diff --git a/psalm.xml b/psalm.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="true"
-    resolveFromConfigFile="true"
+    errorLevel="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
         <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
     </projectFiles>
 </psalm>
diff --git a/tests/PhpInputStreamTest.php b/tests/PhpInputStreamTest.php
@@ -138,6 +138,7 @@ public function testGetContentsReturnRemainingContents()
 
         $stream = new PhpInputStream('data://,123');
         $this->assertSame('123', $stream->getContents());
+        $this->assertSame('123', $stream->getContents());
 
         $stream = new PhpInputStream('data://,123');
         $stream->read(1);
diff --git a/tests/SapiNormalizerTest.php b/tests/SapiNormalizerTest.php
@@ -28,12 +28,16 @@ public function setUp(): void
             'SERVER_PORT' => '443',
             'REQUEST_METHOD' => 'GET',
             'SERVER_PROTOCOL' => 'HTTP/1.1',
+            'SERVER_NAME' => 'example.org',
             'HTTP_HOST' => 'example.com',
             'HTTP_CACHE_CONTROL' => 'max-age=0',
             'HTTP_X_FORWARDED_PROTO' => 'https',
             'CONTENT_TYPE' => 'text/html; charset=UTF-8',
             'REQUEST_URI' => '/path?name=value',
             'QUERY_STRING' => 'name=value',
+            'REDIRECT_STATUS' => '200',
+            'REDIRECT_HTTP_HOST' => 'example.org',
+            'REDIRECT_HTTP_CONNECTION' => 'keep-alive',
         ];
     }
 
@@ -97,6 +101,19 @@ public function testNormalizeUri(): void
         $this->assertSame('/path', $uri->getPath());
         $this->assertSame($this->server['QUERY_STRING'], $uri->getQuery());
         $this->assertSame('https://example.com/path?name=value', (string) $uri);
+
+        unset($this->server['HTTPS'], $this->server['HTTP_HOST']);
+
+        $uri = $this->normalizer->normalizeUri($this->server);
+        $this->assertInstanceOf(UriInterface::class, $uri);
+        $this->assertSame($this->server['HTTP_X_FORWARDED_PROTO'], $uri->getScheme());
+        $this->assertSame($this->server['SERVER_NAME'], $uri->getAuthority());
+        $this->assertSame('', $uri->getUserInfo());
+        $this->assertSame($this->server['SERVER_NAME'], $uri->getHost());
+        $this->assertSame(null, $uri->getPort());
+        $this->assertSame('/path', $uri->getPath());
+        $this->assertSame($this->server['QUERY_STRING'], $uri->getQuery());
+        $this->assertSame('https://example.org/path?name=value', (string) $uri);
     }
 
     public function testNormalizeUriIfServerIsEmpty(): void
@@ -117,17 +134,13 @@ public function testNormalizeHeaders(): void
     {
         $headers = $this->normalizer->normalizeHeaders($this->server);
 
-        $this->assertSame($this->server['HTTP_HOST'], $headers['Host']);
-        $this->assertSame($this->server['HTTP_CACHE_CONTROL'], $headers['Cache-Control']);
-        $this->assertSame($this->server['HTTP_X_FORWARDED_PROTO'], $headers['X-Forwarded-Proto']);
-        $this->assertSame($this->server['CONTENT_TYPE'], $headers['Content-Type']);
-
-        $this->assertFalse(isset($headers['HTTPS']));
-        $this->assertFalse(isset($headers['SERVER_PORT']));
-        $this->assertFalse(isset($headers['REQUEST_METHOD']));
-        $this->assertFalse(isset($headers['SERVER_PROTOCOL']));
-        $this->assertFalse(isset($headers['REQUEST_URI']));
-        $this->assertFalse(isset($headers['QUERY_STRING']));
+        $this->assertSame($headers, [
+            'Host' => 'example.com',
+            'Cache-Control' => 'max-age=0',
+            'X-Forwarded-Proto' => 'https',
+            'Content-Type' => 'text/html; charset=UTF-8',
+            'Connection' => 'keep-alive',
+        ]);
     }
 
     public function testNormalizeHeadersIfServerIsEmpty(): void
diff --git a/tests/UploadedFileCreatorTest.php b/tests/UploadedFileCreatorTest.php
