fixed tests, updated travis config

frameworkwtf · Mar 12, 2020 · d1dc64b · d1dc64b
1 parent 72874d8
commit d1dc64b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,23 +3,23 @@ language: php
 
 git:
   depth: 1
-                                                                                                                                                                                             
-cache:                                                                                                                                                                                       
-  directories:                                                                                                                                                                               
-    - $HOME/.composer                                                                                                                                                                        
-                                                                                                                                                                                             
+
+cache:
+  directories:
+    - $HOME/.composer
+
 env:
   global:
     - PHP_CS_FIXER_IGNORE_ENV=1
 
 php:
-  - 7.1
   - 7.2
+  - 7.3
 
 before_script:
 - composer install
 - composer require phpunit/phpunit:7.0.2 satooshi/php-coveralls wtf/rest wtf/html dflydev/fig-cookies symfony/ldap:^4
-- wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.3/php-cs-fixer.phar -O php-cs-fixer
+- wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.16.1/php-cs-fixer.phar -O php-cs-fixer
 - chmod +x ./php-cs-fixer
 - mkdir -p tests/coverage
 

diff --git a/src/Auth/Storage/Cookie.php b/src/Auth/Storage/Cookie.php
@@ -19,7 +19,7 @@ public function setUser(Root $user)
         }
         //@codeCoverageIgnoreEnd
 
-        return \Dflydev\FigCookies\Cookie::create('user_id', $user->getId());
+        return \Dflydev\FigCookies\Cookie::create('user_id', (string) $user->getId());
     }
 
     /**

diff --git a/tests/Auth/Repository/LDAPTest.php b/tests/Auth/Repository/LDAPTest.php
@@ -45,7 +45,7 @@ public function testLogin(): void
 
     public function testUniplemented(): void
     {
-        $this->assertInternalType('string', $this->app->getContainer()->auth_repository->forgot('nevermind'));
+        $this->assertIsString($this->app->getContainer()->auth_repository->forgot('nevermind'));
         $this->assertFalse($this->app->getContainer()->auth_repository->reset('nevermind', 'nevermind'));
     }
 }
diff --git a/tests/Auth/Storage/CookieTest.php b/tests/Auth/Storage/CookieTest.php
@@ -34,7 +34,7 @@ public function testGetUserNull(): void
 
     public function testGetUser(): void
     {
-        $cookie = \Dflydev\FigCookies\Cookie::create('user_id', 1);
+        $cookie = \Dflydev\FigCookies\Cookie::create('user_id', '1');
         $request = $this->app->getContainer()['request'];
         unset($this->app->getContainer()['request']);
         $this->app->getContainer()['request'] = \Dflydev\FigCookies\FigRequestCookies::set($request, $cookie);

diff --git a/tests/Auth/Storage/JWTTest.php b/tests/Auth/Storage/JWTTest.php
@@ -36,7 +36,7 @@ public function testGetUserFromRequest(): void
     {
         $request = $this->app->getContainer()['request'];
         unset($this->app->getContainer()['request']);
-        $this->app->getContainer()['request'] = $request->withAttribute('token', ['data' => ['login' => 'login']]);
+        $this->app->getContainer()['request'] = $request->withAttribute('token', ['data' => ['id' => 1, 'login' => 'login']]);
         $this->assertInstanceOf('\Wtf\Root', $this->app->getContainer()->auth->getUser());
         $this->assertEquals('login', $this->app->getContainer()->auth->getUser()->get('login'));
     }
@@ -45,7 +45,7 @@ public function testLogin(): void
     {
         $this->assertNull($this->app->getContainer()->auth->login('notexist', 'password'));
         $this->assertNull($this->app->getContainer()->auth->login('login', 'wrongpassword'));
-        $this->assertInternalType('string', $this->app->getContainer()->auth->login('login', 'me'));
+        $this->assertIsString($this->app->getContainer()->auth->login('login', 'me'));
     }
 
     public function testLogout(): void

diff --git a/tests/Auth/Storage/SessionTest.php b/tests/Auth/Storage/SessionTest.php
@@ -69,7 +69,7 @@ public function testGetUserNull(): void
     public function testGetUser(): void
     {
         \session_start();
-        $_SESSION['user'] = ['login' => 'login'];
+        $_SESSION['user'] = ['id' => 1, 'login' => 'login'];
 
         $this->assertInstanceOf('\Wtf\Root', $this->app->getContainer()->auth->getUser());
         $this->assertEquals('login', $this->app->getContainer()->auth->getUser()->get('login'));
@@ -104,8 +104,8 @@ public function testLogout(): void
     public function testForgot(): void
     {
         \session_start();
-        $this->assertInternalType('string', $this->app->getContainer()->auth->forgot('wrong'));
-        $this->assertInternalType('string', $this->app->getContainer()->auth->forgot('login'));
+        $this->assertIsString($this->app->getContainer()->auth->forgot('wrong'));
+        $this->assertIsString($this->app->getContainer()->auth->forgot('login'));
     }
 
     /**