Merge pull request #369 from cakephp/update-travis

Updated travis and fixed CS errors.

.coveralls.yml

@@ -0,0 +1,2 @@
+coverage_clover: clover.xml
+json_path: coveralls-upload.json

.travis.yml

@@ -1,5 +1,11 @@
 language: php
 
+dist: xenial
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
 php:
   - 7.2
   - 7.4
@@ -29,7 +35,12 @@ matrix:
       env: PREFER_LOWEST=1
 
 before_install:
-  - echo 'extension = ldap.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - phpenv config-rm xdebug.ini
+  - |
+      if [[ $COVERAGE == 1 ]]; then
+        pecl channel-update pecl.php.net
+        pecl install pcov
+      fi
 
 install:
   - if [[ $PREFER_LOWEST != 1 ]]; then composer install --prefer-dist --no-interaction; fi
@@ -41,14 +52,19 @@ before_script:
   - if [[ $STATIC_ANALYSIS == 1 ]]; then composer stan-setup; fi
 
 script:
-  - if [[ $COVERAGE == 1 ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=clover.xml; fi
-  - if [[ $COVERAGE != 1 ]]; then vendor/bin/phpunit; fi
+  - if [[ $COVERAGE == 1 ]]; then vendor/bin/phpunit --verbose --coverage-clover=clover.xml; fi
+  - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit --verbose; fi
 
   - if [[ $PHPCS == 1 ]]; then composer cs-check; fi
   - if [[ $STATIC_ANALYSIS == 1 ]]; then composer stan; fi
 
 after_success:
-  - if [[ $COVERAGE == 1 ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - |
+      if [[ $COVERAGE == 1 ]]; then
+        wget https://github.com/php-coveralls/php-coveralls/releases/download/v2.1.0/php-coveralls.phar
+        chmod +x php-coveralls.phar
+        ./php-coveralls.phar
+      fi
 
 notifications:
   email: false

src/AuthenticationService.php

@@ -372,6 +372,7 @@ public function getUnauthenticatedRedirectUrl(ServerRequestInterface $request):
         }
         $query = urlencode($param) . '=' . urlencode($redirect);
 
+        /** @var array $url */
         $url = parse_url($target);
         if (isset($url['query']) && strlen($url['query'])) {
             $url['query'] .= '&' . $query;
@@ -413,9 +414,11 @@ public function getLoginRedirect(ServerRequestInterface $request): ?string
             return null;
         }
         $parsed += ['path' => '/', 'query' => ''];
+        /** @psalm-suppress PossiblyUndefinedArrayOffset */
         if (strlen($parsed['path']) && $parsed['path'][0] !== '/') {
             $parsed['path'] = "/{$parsed['path']}";
         }
+        /** @psalm-suppress PossiblyUndefinedArrayOffset */
         if ($parsed['query']) {
             $parsed['query'] = "?{$parsed['query']}";
         }