kevin/hypothetical
1
0
Fork 0
mirror of https://github.com/prurigro/hypothetical.git synced 2024-11-21 23:52:31 -05:00
Code Issues Projects Releases Packages Wiki Activity

Conclude the update to laravel 6.12.0, including the removal of tinx as it's no longer maintained

Browse source
This commit is contained in:
Kevin MacMartin 2020-02-25 16:26:38 -05:00
parent aca480023f
commit 07526e6693
13 changed files with 46 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Exceptions/Handler.php
View file

@ -31,6 +31,8 @@ class Handler extends ExceptionHandler
* *
* @param \Exception $exception * @param \Exception $exception
* @return void * @return void
*
* @throws \Exception
*/ */
public function report(Exception $exception) public function report(Exception $exception)
{ {
@ -42,7 +44,9 @@ class Handler extends ExceptionHandler
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Exception $exception * @param \Exception $exception
* @return \Illuminate\Http\Response * @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Exception
*/ */
public function render($request, Exception $exception) public function render($request, Exception $exception)
{ {

2
app/Http/Middleware/Authenticate.php
View file

@ -10,7 +10,7 @@ class Authenticate extends Middleware
* Get the path the user should be redirected to when they are not authenticated. * Get the path the user should be redirected to when they are not authenticated.
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @return string * @return string|null
*/ */
protected function redirectTo($request) protected function redirectTo($request)
{ {

7
app/Providers/RouteServiceProvider.php
View file

@ -16,6 +16,13 @@ class RouteServiceProvider extends ServiceProvider
*/ */
protected $namespace = 'App\Http\Controllers'; protected $namespace = 'App\Http\Controllers';
/**
* The path to the "home" route for your application.
*
* @var string
*/
public const HOME = '/dashboard';
/** /**
* Define your route model bindings, pattern filters, etc. * Define your route model bindings, pattern filters, etc.
* *

1
composer.json
View file

@ -9,7 +9,6 @@
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^7.2", "php": "^7.2",
"ajthinking/tinx": "^2.4",
"doctrine/dbal": "^2.6", "doctrine/dbal": "^2.6",
"erusev/parsedown": "~1.6", "erusev/parsedown": "~1.6",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",

82
composer.lock generated
View file

@ -4,59 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "c456fcfe9c2d7e2e737bbd91ebdc1ee1", "content-hash": "970a7f7543a80cb4e788008e8555589a",
"packages": [ "packages": [
{
"name": "ajthinking/tinx",
"version": "v2.6.0",
"source": {
"type": "git",
"url": "https://github.com/furey/tinx.git",
"reference": "1521cf0a8035d8192ac317f39e1a09b3222b9cf0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/furey/tinx/zipball/1521cf0a8035d8192ac317f39e1a09b3222b9cf0",
"reference": "1521cf0a8035d8192ac317f39e1a09b3222b9cf0",
"shasum": ""
},
"require": {
"illuminate/container": "^5.2|^6.0",
"laravel/tinker": "~1.0"
},
"require-dev": {
"phpunit/phpunit": "^6.4|^7.0"
},
"type": "laravel",
"extra": {
"laravel": {
"providers": [
"Ajthinking\\Tinx\\TinxServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Ajthinking\\Tinx\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Anders Jürisoo",
"email": "jurisoo@hotmail.com"
},
{
"name": "James Furey",
"homepage": "https://github.com/furey"
}
],
"description": "Reload your Laravel Tinker session from inside Tinker, plus magic shortcuts for first(), find(), where(), and more!",
"time": "2019-10-03T14:56:43+00:00"
},
{ {
"name": "composer/semver", "name": "composer/semver",
"version": "1.5.1", "version": "1.5.1",
@ -1216,36 +1165,37 @@
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v1.0.10", "version": "v2.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/tinker.git", "url": "https://github.com/laravel/tinker.git",
"reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7" "reference": "37579c93271ec30ef099dd633ec7c2de5e5fb112"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/ad571aacbac1539c30d480908f9d0c9614eaf1a7", "url": "https://api.github.com/repos/laravel/tinker/zipball/37579c93271ec30ef099dd633ec7c2de5e5fb112",
"reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7", "reference": "37579c93271ec30ef099dd633ec7c2de5e5fb112",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"illuminate/console": "~5.1|^6.0", "illuminate/console": "^6.0|^7.0",
"illuminate/contracts": "~5.1|^6.0", "illuminate/contracts": "^6.0|^7.0",
"illuminate/support": "~5.1|^6.0", "illuminate/support": "^6.0|^7.0",
"php": ">=5.5.9", "php": "^7.2",
"psy/psysh": "0.7.*|0.8.*|0.9.*", "psy/psysh": "^0.9",
"symfony/var-dumper": "~3.0|~4.0" "symfony/var-dumper": "^4.0|^5.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~4.0|~5.0" "mockery/mockery": "^1.3.1",
"phpunit/phpunit": "^8.0|^9.0"
}, },
"suggest": { "suggest": {
"illuminate/database": "The Illuminate Database package (~5.1)." "illuminate/database": "The Illuminate Database package (^6.0|^7.0)."
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0-dev" "dev-master": "2.x-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
@ -1275,7 +1225,7 @@
"laravel", "laravel",
"psysh" "psysh"
], ],
"time": "2019-08-07T15:10:45+00:00" "time": "2020-02-05T15:00:44+00:00"
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",

8
config/database.php
View file

@ -130,16 +130,16 @@ return [
'url' => env('REDIS_URL'), 'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'), 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379), 'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_DB', 0), 'database' => env('REDIS_DB', '0'),
], ],
'cache' => [ 'cache' => [
'url' => env('REDIS_URL'), 'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'), 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379), 'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_CACHE_DB', 1), 'database' => env('REDIS_CACHE_DB', '1'),
], ],
], ],

6
config/logging.php
View file

@ -37,7 +37,7 @@ return [
'channels' => [ 'channels' => [
'stack' => [ 'stack' => [
'driver' => 'stack', 'driver' => 'stack',
'channels' => ['daily'], 'channels' => ['single'],
'ignore_exceptions' => false, 'ignore_exceptions' => false,
], ],
@ -95,6 +95,10 @@ return [
'driver' => 'monolog', 'driver' => 'monolog',
'handler' => NullHandler::class, 'handler' => NullHandler::class,
], ],
'emergency' => [
'path' => storage_path('logs/laravel.log'),
],
], ],
]; ];

2
config/session.php
View file

@ -190,7 +190,7 @@ return [
| take place, and can be used to mitigate CSRF attacks. By default, we | take place, and can be used to mitigate CSRF attacks. By default, we
| do not enable this as other CSRF protection services are in place. | do not enable this as other CSRF protection services are in place.
| |
| Supported: "lax", "strict" | Supported: "lax", "strict", "none"
| |
*/ */

1
database/factories/UserFactory.php
View file

@ -1,6 +1,7 @@
<?php <?php
/** @var \Illuminate\Database\Eloquent\Factory $factory */ /** @var \Illuminate\Database\Eloquent\Factory $factory */
use App\User; use App\User;
use Faker\Generator as Faker; use Faker\Generator as Faker;
use Illuminate\Support\Str; use Illuminate\Support\Str;

2
phpunit.xml
View file

@ -28,6 +28,8 @@
<server name="APP_ENV" value="testing"/> <server name="APP_ENV" value="testing"/>
<server name="BCRYPT_ROUNDS" value="4"/> <server name="BCRYPT_ROUNDS" value="4"/>
<server name="CACHE_DRIVER" value="array"/> <server name="CACHE_DRIVER" value="array"/>
<server name="DB_CONNECTION" value="sqlite"/>
<server name="DB_DATABASE" value=":memory:"/>
<server name="MAIL_DRIVER" value="array"/> <server name="MAIL_DRIVER" value="array"/>
<server name="QUEUE_CONNECTION" value="sync"/> <server name="QUEUE_CONNECTION" value="sync"/>
<server name="SESSION_DRIVER" value="array"/> <server name="SESSION_DRIVER" value="array"/>

2
resources/lang/en/passwords.php
View file

@ -15,8 +15,8 @@ return [
'reset' => 'Your password has been reset!', 'reset' => 'Your password has been reset!',
'sent' => 'We have e-mailed your password reset link!', 'sent' => 'We have e-mailed your password reset link!',
'throttled' => 'Please wait before retrying.',
'token' => 'This password reset token is invalid.', 'token' => 'This password reset token is invalid.',
'user' => "We can't find a user with that e-mail address.", 'user' => "We can't find a user with that e-mail address.",
'throttled' => 'Please wait before retrying.',
]; ];

4
resources/lang/en/validation.php
View file

@ -40,7 +40,7 @@ return [
'dimensions' => 'The :attribute has invalid image dimensions.', 'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.', 'distinct' => 'The :attribute field has a duplicate value.',
'email' => 'The :attribute must be a valid email address.', 'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values', 'ends_with' => 'The :attribute must end with one of the following: :values.',
'exists' => 'The selected :attribute is invalid.', 'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.', 'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.', 'filled' => 'The :attribute field must have a value.',
@ -110,7 +110,7 @@ return [
'string' => 'The :attribute must be :size characters.', 'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.', 'array' => 'The :attribute must contain :size items.',
], ],
'starts_with' => 'The :attribute must start with one of the following: :values', 'starts_with' => 'The :attribute must start with one of the following: :values.',
'string' => 'The :attribute must be a string.', 'string' => 'The :attribute must be a string.',
'timezone' => 'The :attribute must be a valid zone.', 'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.', 'unique' => 'The :attribute has already been taken.',

3
tests/Unit/ExampleTest.php
View file

@ -2,8 +2,7 @@
namespace Tests\Unit; namespace Tests\Unit;
use Illuminate\Foundation\Testing\RefreshDatabase; use PHPUnit\Framework\TestCase;
use Tests\TestCase;
class ExampleTest extends TestCase class ExampleTest extends TestCase
{ {