WIP - Upgrading to Laravel 8.

This commit is contained in:
Mike Bronner
2020-09-13 22:29:33 +00:00
parent 928844f2ce
commit fa3d2a14a7
5 changed files with 32 additions and 18 deletions

View File

@@ -16,17 +16,14 @@
"genealabs/laravel-socialiter": "Automatic user resolution and persistence for any Laravel Socialite driver."
},
"require": {
"illuminate/support": "^7.0",
"laravel/socialite": "^4.3"
"illuminate/support": "^8.0",
"laravel/socialite": "^5.0"
},
"require-dev": {
"orchestra/testbench-browser-kit": "^5.0",
"orchestra/testbench-dusk": "^5.0",
"orchestra/testbench": "^5.0",
"phpmd/phpmd": "^2.7",
"squizlabs/php_codesniffer": "^3.5",
"predis/predis": "^1.1",
"phpunit/phpunit": "^8.5"
"orchestra/testbench-browser-kit": "^6.0",
"orchestra/testbench-dusk": "^6.0",
"orchestra/testbench": "^6.0",
"predis/predis": "^1.1"
},
"autoload": {
"psr-4": {

11
phpcs.xml Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="PHP_CodeSniffer" xsi:noNamespaceSchemaLocation="phpcs.xsd">
<description>GeneaLabs coding standards.</description>
<rule ref="PSR1"></rule>
<rule ref="PSR2"></rule>
<rule ref="PSR12">
<exclude name="PSR12.Classes.ClassInstantiation.MissingParentheses"/>
<exclude name="PSR12.Functions.ReturnTypeDeclaration.SpaceBeforeColon"/>
</rule>
</ruleset>

View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
@@ -9,7 +10,13 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="true"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
>
<coverage processUncoveredFiles="false">
<include>
<directory suffix=".php">./src</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Browser">
<directory suffix="Test.php">./tests/Browser</directory>
@@ -21,11 +28,6 @@
<directory suffix="Test.php">./tests/Unit</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="false">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
<php>
<env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
<env name="APP_ENV" value="testing"/>
@@ -35,7 +37,7 @@
<env name="QUEUE_DRIVER" value="sync"/>
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
<env name="REDIS_HOST" value="192.168.10.10"/>
<env name="REDIS_HOST" value="127.0.0.1"/>
<env name="SIGN_IN_WITH_APPLE_LOGIN" value="/siwa-login"/>
<env name="SIGN_IN_WITH_APPLE_REDIRECT" value="http://testing.dev/siwa-callback"/>
<env name="SIGN_IN_WITH_APPLE_CLIENT_ID" value="add-your-own"/>

View File

@@ -7,4 +7,7 @@ use Orchestra\Testbench\Dusk\TestCase;
abstract class BrowserTestCase extends TestCase
{
use CreatesApplication;
protected static $baseServeHost = '127.0.0.1';
protected static $baseServePort = 9000;
}

View File

@@ -2,11 +2,12 @@
namespace GeneaLabs\LaravelSignInWithApple\Tests;
use GeneaLabs\LaravelSignInWithApple\Providers\ServiceProvider;
use GeneaLabs\LaravelSignInWithApple\Tests\Fixtures\Providers\TestingServiceProvider;
use Illuminate\Contracts\Http\Kernel;
use Orchestra\Testbench\Dusk\Options;
use Illuminate\Session\Middleware\StartSession;
use Laravel\Socialite\SocialiteServiceProvider;
use GeneaLabs\LaravelSignInWithApple\Providers\ServiceProvider;
use GeneaLabs\LaravelSignInWithApple\Tests\Fixtures\Providers\TestingServiceProvider;
trait CreatesApplication
{
@@ -14,7 +15,7 @@ trait CreatesApplication
{
parent::setUp();
\Orchestra\Testbench\Dusk\Options::withUI();
Options::withUI();
$this->artisan("view:clear");
$this->artisan("cache:clear");
$this->artisan("config:clear");