add phpstan and cs-fixer to build

rokka-io · Jan 9, 2024 · 0ef6a2c · 0ef6a2c
1 parent 594a71a
commit 0ef6a2c
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 5 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,34 @@
+name: Linting
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  phpunit:
+    name: Lint
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '8.3'
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install composer dependencies
+        run: |
+          composer update --prefer-dist --no-interaction --no-progress --no-ansi ${COMPOSER_FLAGS}
+
+      - name: PHP CS Fixer Tests
+        run: composer lint
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -0,0 +1,39 @@
+name: Static analysis
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  phpstan:
+    name: phpstan ${{ matrix.php }} 
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '8.0'
+          - php: '8.1'
+          - php: '8.2'
+          - php: '8.3'
+
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: composer:v2
+          coverage: none
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Install composer dependencies
+        run: |
+          composer update --prefer-dist --no-interaction --no-progress --no-ansi ${COMPOSER_FLAGS}
+
+      - name: PHPStan
+        run: composer phpstan
diff --git a/composer.json b/composer.json
@@ -24,6 +24,7 @@
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.46.0",
+    "phpstan/phpstan": "^1.7",
     "symfony/phpunit-bridge": "^5.2 || ^6.0"
   },
   "conflict": {
@@ -37,6 +38,11 @@
       "RokkaCli\\": "src/"
     }
   },
+  "scripts": {
+    "phpstan": "phpstan analyze",
+    "lint:fix": "php-cs-fixer fix -v --diff --using-cache=yes src/",
+    "lint": "php-cs-fixer fix -v --dry-run --diff --using-cache=yes src/"
+  },
   "config": {
     "sort-packages": true
   }

diff --git a/phpstan.neon b/phpstan.neon
@@ -0,0 +1,7 @@
+parameters:
+    level: 1
+    paths:
+        - src/
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    treatPhpDocTypesAsCertain: false
diff --git a/src/Command/ImageCopyAllCommand.php b/src/Command/ImageCopyAllCommand.php
@@ -66,11 +66,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             try {
-                $output->writeln('Copying '.\count($hashes).' images from <comment>'.$image->organization.'</comment> to <comment>'.$orgDest.'</comment>');
+                $organization = isset($image) ? $image->organization : '';
+                $output->writeln('Copying '.\count($hashes).' images from <comment>'.$organization.'</comment> to <comment>'.$orgDest.'</comment>');
 
                 $hashes = $this->copyImages($orgDest, $orgSource, $hashes, $client);
                 $total = \count($hashes['existing']) + \count($hashes['created']);
-                $output->writeln($total.' images copied from <comment>'.$image->organization.'</comment> to <comment>'.$orgDest.'</comment> ('.
+                $output->writeln($total.' images copied from <comment>'.$organization.'</comment> to <comment>'.$orgDest.'</comment> ('.
                     \count($hashes['existing']).' existing, '.\count($hashes['created']).' newly created).'
                 );
 

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -13,7 +13,7 @@ class Configuration
     public function __construct(string $apiUri, ?string $apiKey, ?string $organization)
     {
         if (4 === \func_num_args()) {
-            @trigger_error(sprintf('The $apiSecret argument to the configuration has been removed in version 1.5, adjust how you instantiate the configuration.', __METHOD__), \E_USER_DEPRECATED);
+            @trigger_error('The $apiSecret argument to the Configuration constructor has been removed in version 1.5, adjust how you instantiate the configuration.', \E_USER_DEPRECATED);
             // if old sig (with $apiSecret as 3rd arg) was used
             $organization = func_get_arg(3);
         }

diff --git a/tests/Unit/ConfigurationTest.php b/tests/Unit/ConfigurationTest.php
@@ -18,11 +18,10 @@ public function testConfiguration()
 
     /**
      * @group legacy
-     *
-     * @expectedDeprecation The $apiSecret argument to the configuration has been removed in version 1.5, adjust how you instantiate the configuration.
      */
     public function testConfigurationBC()
     {
+        $this->expectDeprecationMessage('The $apiSecret argument to the Configuration has been removed in version 1.5, adjust how you instantiate the configuration.');
         $configuration = new Configuration('uri', 'key', 'secret', 'organization');
 
         $this->assertEquals('uri', $configuration->getApiUri());