Merge pull request #39 from nextcloud/phpstan

implement phpstan
nextcloud · Feb 16, 2022 · ca51dba · ca51dba
2 parents 80bac8f + 6cb56e0
commit ca51dba
Show file tree

Hide file tree

Showing 17 changed files with 388 additions and 112 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,6 +5,9 @@ name: CI
 jobs:
   build:
     name: CI
+    strategy:
+      matrix:
+        nextcloudVersion: [ v23.0.0, master ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -34,7 +37,14 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install PHP Dependencies
-        run: composer install --no-progress --prefer-dist --optimize-autoloader
+        run: |
+          composer install --no-progress --prefer-dist --optimize-autoloader
+          git clone --depth 1 https://github.com/nextcloud/server.git -b ${{ matrix.nextcloudVersion }}
+          cd server && git submodule update --init
+          ./occ maintenance:install --admin-pass=admin
+
+      - name: PHP stan
+        run: make phpstan
 
       - name: PHP code style
         run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 )
@@ -49,12 +59,10 @@ jobs:
         run: npm run stylelint
 
       - name: PHP & Vue Unit Tests
-        run: |
-          git clone --depth 1 https://github.com/nextcloud/server.git -b v23.0.0
-          make test
+        run: make test
 
       - name: JS Code Coverage Summary Report
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' }}
         uses: romeovs/lcov-reporter-action@v0.3.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -63,7 +71,7 @@ jobs:
           title: "JS Code Coverage"
 
       - name: Convert PHP cobertura coverage to lcov
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' }}
         uses: danielpalme/ReportGenerator-GitHub-Action@5.0.3
         with:
           reports: './coverage/php/cobertura.xml' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
@@ -82,7 +90,7 @@ jobs:
           toolpath: 'reportgeneratortool' # Default directory for installing the dotnet tool.
 
       - name: PHP Code Coverage Summary Report
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' }}
         uses: romeovs/lcov-reporter-action@v0.3.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -91,14 +99,14 @@ jobs:
           title: "PHP Code Coverage"
 
       - name: JS coverage check
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' }}
         uses: VeryGoodOpenSource/very_good_coverage@v1.2.0
         with:
           min_coverage: '24'
           path: './coverage/jest/lcov.info'
 
       - name: PHP coverage check
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' && matrix.nextcloudVersion == 'master' }}
         uses: VeryGoodOpenSource/very_good_coverage@v1.2.0
         with:
           min_coverage: '36'

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -14,5 +14,6 @@
 	->notPath('l10n')
 	->notPath('src')
 	->notPath('vendor')
+	->notPath('server')
 	->in(__DIR__);
 return $config;
diff --git a/bootstrap.php b/bootstrap.php
@@ -1,5 +1,6 @@
 <?php
 
+define('PHPUNIT_RUN', 1);
 use Composer\Autoload\ClassLoader;
 
 include_once __DIR__.'/vendor/autoload.php';
@@ -8,11 +9,14 @@
 } else {
 	$serverPath = __DIR__ . '/../..';
 }
+include_once $serverPath.'/3rdparty/autoload.php';
+require_once $serverPath. '/lib/base.php';
 
 $classLoader = new ClassLoader();
 $classLoader->addPsr4("OCA\\OpenProject\\Service\\", __DIR__ . '/lib/Service', true);
 $classLoader->addPsr4("OCP\\", $serverPath . '/lib/public', true);
 $classLoader->addPsr4("OC\\", $serverPath . '/lib/private', true);
+$classLoader->addPsr4("OCA\\Files\\Event\\", $serverPath . '/apps/files/lib/Event', true);
 $classLoader->addPsr4("OCA\\OpenProject\\AppInfo\\", __DIR__ . '/lib/AppInfo', true);
 $classLoader->addPsr4("OCA\\OpenProject\\Controller\\", __DIR__ . '/lib/Controller', true);
 $classLoader->register();

diff --git a/composer.json b/composer.json
@@ -3,10 +3,14 @@
 		"phpunit/phpunit": "^9.5",
 		"pact-foundation/pact-php": "^7.1",
 		"friendsofphp/php-cs-fixer": "^3.5",
-		"nextcloud/coding-standard": "^1.0"
+		"nextcloud/coding-standard": "^1.0",
+		"phpstan/phpstan": "^1.4",
+		"phpstan/phpstan-phpunit": "^1.0",
+		"phpstan/extension-installer": "^1.1"
 	},
 	"scripts": {
 		"cs:fix": "php-cs-fixer fix",
-		"cs:check": "php-cs-fixer fix --dry-run --diff"
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"phpstan": "phpstan analyse"
 	}
 }