Merge pull request #42 from Laragear/feat/new-meta

[1.x] Properly adds PHP 8.0, Laravel 10 support

Author: DarkGhostHunter

.gitignore

@@ -3,5 +3,6 @@
 /.idea
 .php-cs-fixer.cache
 .phpunit.result.cache
+.phpunit.cache
 composer.lock
-phpunit.xml.bak
+phpunit.xml.bak

README.md

@@ -36,8 +36,8 @@ Your support allows me to keep this package free, up-to-date and maintainable. A
 
 ## Requirements
 
-* Laravel 9.x or later
-* PHP 8.0 or later
+* PHP 8 or later
+* Laravel 9, 10 or later
 
 ## Installation
 
@@ -585,4 +585,4 @@ If you discover any security related issues, please email darkghosthunter@gmail.
 
 This specific package version is licensed under the terms of the [MIT License](LICENSE.md), at time of publishing.
 
-[Laravel](https://laravel.com) is a Trademark of [Taylor Otwell](https://github.com/TaylorOtwell/). Copyright © 2011-2022 Laravel LLC.
+[Laravel](https://laravel.com) is a Trademark of [Taylor Otwell](https://github.com/TaylorOtwell/). Copyright © 2011-2023 Laravel LLC.

composer.json

@@ -24,22 +24,21 @@
         "issues": "https://github.com/Laragear/TwoFactor/issues"
     },
     "require": {
-        "php": ">=8.0.2",
+        "php": "8.*",
         "ext-json": "*",
-        "laragear/meta": "^1.3",
-        "bacon/bacon-qr-code": "^2.0",
+        "laragear/meta": "^2.0.2",
+        "bacon/bacon-qr-code": "2.*",
         "paragonie/constant_time_encoding": "^2.5",
-        "illuminate/config": "^9.0|^10.0",
-        "illuminate/validation": "^9.0|^10.0",
-        "illuminate/database": "^9.0|^10.0",
-        "illuminate/support": "^9.0|^10.0",
-        "illuminate/http": "^9.0|^10.0",
-        "illuminate/auth": "^9.0|^10.0"
+        "illuminate/config": "9.*|10.*",
+        "illuminate/validation": "9.*|10.*",
+        "illuminate/database": "9.*|10.*",
+        "illuminate/support": "9.*|10.*",
+        "illuminate/http": "9.*|10.*",
+        "illuminate/auth": "9.*|10.*"
     },
     "require-dev": {
-        "mockery/mockery": "^1.5",
-        "orchestra/testbench": "^7.0|^8.0",
-        "phpunit/phpunit": "^9.5"
+        "laragear/meta-testing": "^1.2.2",
+        "orchestra/testbench": "^7.22|8.*"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,28 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false"
-         backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false"
-         stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-        <report>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="APP_DEBUG" value="true"/>
-        <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
-        <env name="DB_CONNECTION" value="testing"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+    <env name="APP_DEBUG" value="true"/>
+    <env name="APP_KEY" value="AckfSECXIvnK5r28GVIWUAxmbBSjTsmF"/>
+    <env name="DB_CONNECTION" value="testing"/>
+  </php>
 </phpunit>

tests/ServiceProviderTest.php

@@ -3,7 +3,7 @@
 namespace Tests;
 
 use Illuminate\Support\ServiceProvider;
-use Laragear\Meta\Testing\InteractsWithServiceProvider;
+use Laragear\MetaTesting\InteractsWithServiceProvider;
 use Laragear\TwoFactor\Http\Middleware\ConfirmTwoFactorCode;
 use Laragear\TwoFactor\Http\Middleware\RequireTwoFactorEnabled;
 use Laragear\TwoFactor\Rules\Totp;