3.x phpstan

.gitlab-ci.yml

@@ -8,7 +8,7 @@ phpstan:
   image: registry.gitlab.com/socialconnect-php/auth:7.3
   script:
     - composer install -o
-    - ./vendor/bin/phpstan.phar analyse src/ tests/ --no-progress --level 2
+    - ./vendor/bin/phpstan.phar analyse src/ tests/ --no-progress
   tags:
     - docker
 

.travis.yml

@@ -1,26 +1,42 @@
-
 dist: trusty
 sudo: false
 
+env:
+  global:
+    - DEFAULT=1
+
 language: php
 
 php:
   - 7.1
   - 7.2
   - 7.3
 
+matrix:
+  fast_finish: true
+
+  include:
+    - php: 7.3
+      env: DEFAULT=0 STATIC_ANALYSIS=1
+
+    - php: 7.3
+      env: DEFAULT=0 PHPCS=1
+
 install:
-  - composer self-update
   - composer --prefer-dist install
 
 script:
-  - ./vendor/bin/phpcs --standard=PSR2 --report=emacs --extensions=php --warning-severity=0 src/ tests/Test
-  - 'if [ {$TRAVIS_PHP_VERSION} = "7.3" ]; then
-      ./vendor/bin/phpunit --process-isolation -v --debug --coverage-clover=coverage.clover;
-    else
-      ./vendor/bin/phpunit -v --debug --no-coverage;
-    fi'
+  - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION == "7.3" ]]; then vendor/bin/phpunit --process-isolation -v --debug --coverage-clover=coverage.clover; fi
+  - if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION != "7.3" ]]; then vendor/bin/phpunit -v --debug --no-coverage; fi
+  - if [[ $PHPCS == 1 ]]; then vendor/bin/phpcs --standard=PSR2 --report=emacs --extensions=php --warning-severity=0 src/ tests/Test; fi
+  - if [[ $STATIC_ANALYSIS == 1 ]]; then vendor/bin/phpstan.phar analyse src/ tests/; fi
 
 after_script:
-  - if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ "$TRAVIS_PHP_VERSION" == "7.3" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - |
+      if [[ $DEFAULT == 1 && $TRAVIS_PHP_VERSION == "7.3" ]]; then
+        wget https://scrutinizer-ci.com/ocular.phar
+        php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+      fi
+
+notifications:
+  email: false

phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+    level: 4
+    ignoreErrors:
+        - '#should return SocialConnect\\Common\\Entity\\User but returns object#'

src/OAuth2/Provider/Vimeo.php

@@ -73,8 +73,10 @@ public function parseToken(string $body)
                     'name' => 'fullname',
                 ]);
 
-                $this->user = $hydrator->hydrate(new User(), $response['user']);
-                $this->user->id = str_replace('/users/', '', $this['user']['uri']);
+                /** @var \SocialConnect\Common\Entity\User $user */
+                $user = $hydrator->hydrate(new User(), $response['user']);
+                $this->user = $user;
+                $this->user->id = str_replace('/users/', '', $response['user']['uri']);
 
                 $token->setUserId((string) $this->user->id);
             }

src/OpenID/AbstractProvider.php

@@ -72,7 +72,7 @@ protected function discover(string $url)
         $xml = new \SimpleXMLElement($response->getBody()->getContents());
 
         $this->version = 2;
-        $this->loginEntrypoint = $xml->XRD->Service->URI;
+        $this->loginEntrypoint = (string)$xml->XRD->Service->URI;
 
         return $this->getOpenIdUrl();
     }