Merge remote-tracking branch 'origin/master'

msyk · Aug 17, 2024 · 2298739 · 2298739
2 parents 4583a37 + 2c3b225
commit 2298739
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -26,12 +26,35 @@ jobs:
         run: composer require --dev phpstan/phpstan
 
       - name: Run PHPStan
-        if:  matrix.level == matrix.current-level
+        if: matrix.level == matrix.current-level
         run: ./vendor/bin/phpstan analyse -c spec/phpstan.neon --memory-limit 1024M src spec/INTER-Mediator-UnitTest --level "${{ matrix.level }}"
 
       - name: Run PHPStan
-        if:  matrix.level > matrix.current-level
+        if: matrix.level > matrix.current-level && github.event_name != 'pull_request'
         continue-on-error: true
         run: |
-             ./vendor/bin/phpstan analyse -c spec/phpstan.neon --memory-limit 1024M src spec/INTER-Mediator-UnitTest --level "${{ matrix.level }}"
-             exit 0
+          ./vendor/bin/phpstan analyse -c spec/phpstan.neon --memory-limit 1024M src spec/INTER-Mediator-UnitTest --level "${{ matrix.level }}"
+          exit 0
+
+      - uses: actions/checkout@v4
+        name: checkout "${{ github.base_ref }}"
+        if: matrix.level > matrix.current-level && github.event_name == 'pull_request'
+        with:
+          fetch-depth: 1
+          ref: ${{ github.base_ref }}
+
+      - uses: actions/checkout@v4
+        name: checkout "${{ github.head_ref }}"
+        if: matrix.level > matrix.current-level && github.event_name == 'pull_request'
+        with:
+          fetch-depth: 1
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Run PHPStan for pull request event
+        if: matrix.level > matrix.current-level && github.event_name == 'pull_request'
+        shell: bash
+        continue-on-error: true
+        run: |
+          FILES=(`git diff origin/${{ github.base_ref }} --name-only src spec/INTER-Mediator-UnitTest | tr '\n' ' '`)
+          if [[ "$FILES" != "" ]]; then composer require --dev phpstan/phpstan; ./vendor/bin/phpstan analyse -c spec/phpstan.neon --memory-limit 1024M ${FILES} --level "${{ matrix.level }}"; fi
+          exit 0
diff --git a/src/php/DB/Support/ProxyVisitors/OperationVisitor.php b/src/php/DB/Support/ProxyVisitors/OperationVisitor.php
@@ -35,7 +35,7 @@ public function __construct(Proxy $proxy)
 
     /**
      * @param OperationElement $e
-     * @return void
+     * @return bool
      */
     abstract public function visitIsAuthAccessing(OperationElement $e): bool;
 
@@ -47,7 +47,7 @@ abstract public function visitCheckAuthentication(OperationElement $e): bool;
 
     /**
      * @param OperationElement $e
-     * @return void
+     * @return bool
      */
     abstract public function visitCheckAuthorization(OperationElement $e): bool;
 
@@ -429,4 +429,4 @@ function clearAuthenticationCookies(): void
     }
 
 
-}
+}