Merge pull request #29 from ruudk/stable

Make `main` stable
overblog · Dec 8, 2021 · 6c6b097 · 6c6b097
2 parents f3c840b + 9b922cd
commit 6c6b097
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,16 +27,7 @@ jobs:
                     - 'lowest'
                     - 'highest'
                 remove-dependencies: [ '' ]
-                coverage: [ 'none' ]
-                include:
-                    - php-version: '8.0'
-                      symfony-version: '5.3.*'
-                      dependencies: 'lowest'
-                      remove-dependencies: '--dev symfony/validator doctrine/orm doctrine/annotations'
-                    - php-version: '8.0'
-                      symfony-version: '5.3.*'
-                      dependencies: 'lowest'
-                      coverage: "pcov"
+
         steps:
             - name: "Checkout"
               uses: "actions/checkout@v2"
@@ -46,7 +37,7 @@ jobs:
               with:
                   tools: flex
                   php-version: "${{ matrix.php-version }}"
-                  coverage: "${{ matrix.coverage }}"
+                  coverage: none
 
             - name: "Change stability"
               if: "matrix.stability != ''"
@@ -70,13 +61,6 @@ jobs:
             - name: "Run tests"
               run: composer test
 
-            - name: "Upload coverage results to Coveralls"
-              if: "matrix.coverage == 'pcov'"
-              env:
-                  COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              run: |
-                  wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.5.1/php-coveralls.phar
-                  php php-coveralls.phar --coverage_clover=build/logs/clover.xml -v
     coding-standard:
         runs-on: ubuntu-20.04
         name: Coding Standard
@@ -95,35 +79,3 @@ jobs:
 
             - name: "Check coding standard"
               run: composer check-cs
-
-    static-analysis:
-        runs-on: ubuntu-20.04
-        name: "Static analysis"
-        strategy:
-            fail-fast: false
-            matrix:
-                php-version:
-                    - '8.0'
-                    - '8.1'
-        steps:
-            - name: "Checkout"
-              uses: "actions/checkout@v2"
-
-            - name: "Install PHP"
-              uses: "shivammathur/setup-php@v2"
-              with:
-                  php-version: ${{ matrix.php-version }}
-                  coverage: "none"
-
-            - name: "Cache dependencies installed with composer"
-              uses: "actions/cache@v2"
-              with:
-                  path: "~/.composer/cache"
-                  key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
-                  restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
-
-            - name: "Install dependencies"
-              uses: ramsey/[email protected]
-
-            - name: "Run static-analysis"
-              run: composer static-analysis
diff --git a/composer.json b/composer.json
@@ -27,14 +27,14 @@
     "require": {
         "php": "^8.0",
         "overblog/dataloader-php": "^0.7.0",
-        "symfony/dependency-injection": "^5.3 || ^6.0"
+        "symfony/dependency-injection": "^5.3.7 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.10",
-        "react/promise": "^2.5",
+        "react/promise": "^2.8.0",
         "sensio/framework-extra-bundle": "^6.2",
         "symfony/phpunit-bridge": "^6.0",
-        "symfony/yaml": "^5.3 || ^6.0"
+        "symfony/yaml": "^5.3.7 || ^6.0"
     },
     "extra": {
         "branch-alias": {
@@ -43,9 +43,6 @@
     },
   "scripts": {
       "test": "bin/phpunit --color=always --coverage-clover=build/logs/clover.xml",
-      "static-analysis": [
-          "phpstan analyse --ansi --memory-limit=1G"
-      ],
       "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.18.7/php-cs-fixer.phar -O php-cs-fixer.phar",
       "fix-cs": [
           "@install-cs",
@@ -58,7 +55,6 @@
       "code-quality": [
           "rm composer.lock",
           "@composer install --ansi",
-          "@static-analysis",
           "@check-cs"
       ]
   }

diff --git a/tests/Functional/app/config/config.yaml b/tests/Functional/app/config/config.yaml
@@ -2,6 +2,7 @@ framework:
     test: ~
     secret: test
     router:
+        utf8: true
         resource: "%kernel.project_dir%/config/routing.yaml"
     profiler:
         enabled: false