Add support for laravel 7

I hate you ❤

.github/workflows/php.yml

@@ -1,6 +1,8 @@
 name: PHP Composer
 
-on: [push]
+on:
+  push:
+  pull_request:
 
 jobs:
   test:
@@ -21,35 +23,40 @@ jobs:
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
-      - name: Checkout
-        uses: actions/checkout@v1
-
-      - name: Cache dependencies
-        uses: actions/cache@v1
-        with:
-          path: ~/.composer/cache/files
-          key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-          coverage: xdebug
-
-      - name: Install dependencies
-        run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-          composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
-
-      - name: Run test suite
-        run: composer run-script test
-
-      - name: Upload Coverage to Coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_SERVICE_NAME: github
-        run: |
-          mv -f .github/workflows/composer-coveralls.json composer.json
-          composer install
-          vendor/bin/coveralls build/logs/clover.xml
+    - name: Checkout
+      uses: actions/checkout@v1
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v1
+      with:
+        php-version: ${{ matrix.php }}
+        extensions: mbstring, intl
+        coverage: xdebug
+
+    - name: Get Composer Cache Directory
+      id: composer-cache
+      run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+    - name: Cache dependencies
+      uses: actions/cache@v1
+      with:
+        path: ${{ steps.composer-cache.outputs.dir }}
+        key: ${{ runner.os }}-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
+        restore-keys: ${{ runner.os }}-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-
+
+    - name: Install dependencies
+      run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-progress --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-suggest
+
+    - name: Run test suite
+      run: composer run-script test
+
+    - name: Upload coverage results to Coveralls
+      env:
+        COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        COVERALLS_SERVICE_NAME: github
+      run: |
+        rm -rf composer.* vendor/
+        composer require cedx/coveralls
+        vendor/bin/coveralls build/logs/clover.xml

composer.json

@@ -23,12 +23,13 @@
         "ext-json": "*",
         "bacon/bacon-qr-code": "2.*",
         "paragonie/constant_time_encoding": "2.*",
-        "illuminate/support": "^6.15|7.*",
-        "illuminate/auth": "^6.15|7.*"
+        "illuminate/support": "^6.15||^7.0",
+        "illuminate/auth": "^6.15||^7.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0|^5.0",
-        "orchestra/canvas": "^4.0|^5.0"
+        "orchestra/testbench": "^4.0||^5.0",
+        "orchestra/canvas": "^4.0||5.0",
+        "phpunit/phpunit": "^8.0"
     },
     "autoload": {
         "psr-4": {

src/TwoFactorAuthentication.php

@@ -18,9 +18,7 @@ trait TwoFactorAuthentication
     public function initializeTwoFactorAuthentication()
     {
         // For security, we will hide the Two Factor Authentication data from the parent model.
-        if (! in_array('twoFactorAuth', $this->hidden, true)) {
-            $this->hidden[] = 'twoFactorAuth';
-        }
+        $this->makeHidden('twoFactorAuth');
     }
 
     /**