Merge 2.x into 3.x

sonata-project · Mar 9, 2022 · b8cc6d7 · b8cc6d7
2 parents a911794 + c3d8a93
commit b8cc6d7
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -28,7 +28,7 @@ jobs:
               with:
                   php-version: '8.1'
                   coverage: none
-                  tools: composer:v2, php-cs-fixer:3.4
+                  tools: composer:v2, php-cs-fixer:3
               env:
                   COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -7,28 +7,28 @@
 name: Stale
 
 on:
-  schedule:
-    - cron: 0 9-18 * * *
+    schedule:
+        - cron: 0 9-18 * * *
 
 jobs:
-  stale:
-    runs-on: ubuntu-latest
+    stale:
+        runs-on: ubuntu-latest
 
-    steps:
-      - name: Close stale issues and pull requests
-        uses: actions/stale@v1.1.0
-        with:
-          days-before-close: 7
-          days-before-stale: 180
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          exempt-issue-label: keep
-          stale-issue-label: stale
-          stale-issue-message: >
-            This issue has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions.
-          stale-pr-label: stale
-          stale-pr-message: >
-            This PR has been automatically marked as stale because it has not had
-            recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions.
+        steps:
+            - name: Close stale issues and pull requests
+              uses: actions/stale@v1.1.0
+              with:
+                  days-before-close: 7
+                  days-before-stale: 180
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  exempt-issue-label: keep
+                  stale-issue-label: stale
+                  stale-issue-message: >
+                      This issue has been automatically marked as stale because it has not had
+                      recent activity. It will be closed if no further activity occurs. Thank you
+                      for your contributions.
+                  stale-pr-label: stale
+                  stale-pr-message: >
+                      This PR has been automatically marked as stale because it has not had
+                      recent activity. It will be closed if no further activity occurs. Thank you
+                      for your contributions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -33,7 +33,6 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '7.3'
                     - '7.4'
                     - '8.0'
                     - '8.1'
@@ -42,7 +41,7 @@ jobs:
                 symfony-require: ['']
                 variant: [normal]
                 include:
-                    - php-version: '7.3'
+                    - php-version: '7.4'
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
@@ -90,10 +89,6 @@ jobs:
               if: matrix.variant != 'normal' && !startsWith(matrix.variant, 'symfony/symfony')
               run: composer require ${{ matrix.variant }} --no-update
 
-            - name: Allow unstable dependencies
-              if: matrix.symfony-require == '6.0.*'
-              run: composer config minimum-stability dev
-
             - name: Install Composer dependencies (${{ matrix.dependencies }})
               uses: ramsey/composer-install@v2
               with:

diff --git a/src/Writer/XmlWriter.php b/src/Writer/XmlWriter.php
@@ -101,7 +101,7 @@ private function generateNode(string $name, $value): void
     {
         if (\is_array($value)) {
             throw new RuntimeException('Not implemented');
-        } elseif (is_scalar($value) || null === $value) {
+        } elseif (\is_scalar($value) || null === $value) {
             fwrite($this->file, sprintf("<%s><![CDATA[%s]]></%s>\n", $name, $value, $name));
         } else {
             throw new InvalidDataFormatException('Invalid data');

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -31,5 +31,10 @@
 }
 
 if (file_exists($file = __DIR__.'/custom_bootstrap.php')) {
+    /**
+     * @psalm-suppress MissingFile,UnusedPsalmSuppress
+     *
+     * @see https://github.com/vimeo/psalm/issues/3886
+     */
     require_once $file;
 }