diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 0eb1679..716d1e9 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -23,7 +23,7 @@ class RegisterController extends Controller
use RegistersUsers;
/**
- * Where to redirect users after login / registration.
+ * Where to redirect users after registration.
*
* @var string
*/
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index bcabec4..66d34c3 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -15,6 +15,9 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
+ \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
+ \App\Http\Middleware\TrimStrings::class,
+ \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];
/**
@@ -27,6 +30,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
+ // \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
new file mode 100644
index 0000000..943e9a4
--- /dev/null
+++ b/app/Http/Middleware/TrimStrings.php
@@ -0,0 +1,18 @@
+id === (int) $userId;
- });
+ require base_path('routes/channels.php');
}
}
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 87ffb05..5ea48d3 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -51,12 +51,9 @@ class RouteServiceProvider extends ServiceProvider
*/
protected function mapWebRoutes()
{
- Route::group([
- 'middleware' => 'web',
- 'namespace' => $this->namespace,
- ], function ($router) {
- require base_path('routes/web.php');
- });
+ Route::middleware('web')
+ ->namespace($this->namespace)
+ ->group(base_path('routes/web.php'));
}
/**
@@ -68,12 +65,9 @@ class RouteServiceProvider extends ServiceProvider
*/
protected function mapApiRoutes()
{
- Route::group([
- 'middleware' => 'api',
- 'namespace' => $this->namespace,
- 'prefix' => 'api',
- ], function ($router) {
- require base_path('routes/api.php');
- });
+ Route::prefix('api')
+ ->middleware('api')
+ ->namespace($this->namespace)
+ ->group(base_path('routes/api.php'));
}
}
diff --git a/composer.json b/composer.json
index 9e49af1..1c62fa9 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,8 @@
"type": "project",
"require": {
"php": ">=5.6.4",
- "laravel/framework": "5.3.*",
+ "laravel/framework": "5.4.*",
+ "laravel/tinker": "~1.0",
"radic/blade-extensions": "~6.2",
"erusev/parsedown": "~1.5",
"spatie/laravel-newsletter": "^2.2",
@@ -16,9 +17,7 @@
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
- "phpunit/phpunit": "~5.0",
- "symfony/css-selector": "3.1.*",
- "symfony/dom-crawler": "3.1.*"
+ "phpunit/phpunit": "~5.0"
},
"autoload": {
"classmap": [
@@ -29,9 +28,9 @@
}
},
"autoload-dev": {
- "classmap": [
- "tests/TestCase.php"
- ]
+ "psr-4": {
+ "Tests\\": "tests/"
+ }
},
"scripts": {
"post-root-package-install": [
@@ -50,6 +49,7 @@
]
},
"config": {
- "preferred-install": "dist"
+ "preferred-install": "dist",
+ "sort-packages": true
}
}
diff --git a/composer.lock b/composer.lock
index cfcec30..0c204fc 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "c5ae019c9fbd719d3382cd546dd41491",
+ "content-hash": "9707f4ee2899e12fb2a63d9fc1003961",
"packages": [
{
"name": "anahkiasen/underscore-php",
@@ -56,60 +56,6 @@
],
"time": "2015-05-16T19:24:58+00:00"
},
- {
- "name": "classpreloader/classpreloader",
- "version": "3.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ClassPreloader/ClassPreloader.git",
- "reference": "bc7206aa892b5a33f4680421b69b191efd32b096"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ClassPreloader/ClassPreloader/zipball/bc7206aa892b5a33f4680421b69b191efd32b096",
- "reference": "bc7206aa892b5a33f4680421b69b191efd32b096",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.0|^2.0|^3.0",
- "php": ">=5.5.9"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.8|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "ClassPreloader\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Michael Dowling",
- "email": "mtdowling@gmail.com"
- },
- {
- "name": "Graham Campbell",
- "email": "graham@alt-three.com"
- }
- ],
- "description": "Helps class loading performance by generating a single PHP file containing all of the autoloaded files for a specific use case",
- "keywords": [
- "autoload",
- "class",
- "preload"
- ],
- "time": "2016-09-16T12:50:15+00:00"
- },
{
"name": "danielstjules/stringy",
"version": "2.3.2",
@@ -566,102 +512,42 @@
],
"time": "2015-04-20T18:58:01+00:00"
},
- {
- "name": "jeremeamia/SuperClosure",
- "version": "2.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/jeremeamia/super_closure.git",
- "reference": "443c3df3207f176a1b41576ee2a66968a507b3db"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/jeremeamia/super_closure/zipball/443c3df3207f176a1b41576ee2a66968a507b3db",
- "reference": "443c3df3207f176a1b41576ee2a66968a507b3db",
- "shasum": ""
- },
- "require": {
- "nikic/php-parser": "^1.2|^2.0|^3.0",
- "php": ">=5.4",
- "symfony/polyfill-php56": "^1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0|^5.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "2.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "SuperClosure\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Jeremy Lindblom",
- "email": "jeremeamia@gmail.com",
- "homepage": "https://github.com/jeremeamia",
- "role": "Developer"
- }
- ],
- "description": "Serialize Closure objects, including their context and binding",
- "homepage": "https://github.com/jeremeamia/super_closure",
- "keywords": [
- "closure",
- "function",
- "lambda",
- "parser",
- "serializable",
- "serialize",
- "tokenizer"
- ],
- "time": "2016-12-07T09:37:55+00:00"
- },
{
"name": "laravel/framework",
- "version": "v5.3.30",
+ "version": "v5.4.5",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "2d4e8c95f584b38d2279b552e2868fc447b97578"
+ "reference": "6f2395d3a97728c1150da083898d1f5a2904b3a0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/2d4e8c95f584b38d2279b552e2868fc447b97578",
- "reference": "2d4e8c95f584b38d2279b552e2868fc447b97578",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/6f2395d3a97728c1150da083898d1f5a2904b3a0",
+ "reference": "6f2395d3a97728c1150da083898d1f5a2904b3a0",
"shasum": ""
},
"require": {
- "classpreloader/classpreloader": "~3.0",
"doctrine/inflector": "~1.0",
+ "erusev/parsedown": "~1.6",
"ext-mbstring": "*",
"ext-openssl": "*",
- "jeremeamia/superclosure": "~2.2",
"league/flysystem": "~1.0",
"monolog/monolog": "~1.11",
"mtdowling/cron-expression": "~1.0",
"nesbot/carbon": "~1.20",
"paragonie/random_compat": "~1.4|~2.0",
"php": ">=5.6.4",
- "psy/psysh": "0.7.*|0.8.*",
"ramsey/uuid": "~3.0",
"swiftmailer/swiftmailer": "~5.4",
- "symfony/console": "3.1.*",
- "symfony/debug": "3.1.*",
- "symfony/finder": "3.1.*",
- "symfony/http-foundation": "3.1.*",
- "symfony/http-kernel": "3.1.*",
- "symfony/process": "3.1.*",
- "symfony/routing": "3.1.*",
- "symfony/translation": "3.1.*",
- "symfony/var-dumper": "3.1.*",
+ "symfony/console": "~3.2",
+ "symfony/debug": "~3.2",
+ "symfony/finder": "~3.2",
+ "symfony/http-foundation": "~3.2",
+ "symfony/http-kernel": "~3.2",
+ "symfony/process": "~3.2",
+ "symfony/routing": "~3.2",
+ "symfony/var-dumper": "~3.2",
+ "tijsverkoyen/css-to-inline-styles": "~2.2",
"vlucas/phpdotenv": "~2.2"
},
"replace": {
@@ -698,31 +584,34 @@
},
"require-dev": {
"aws/aws-sdk-php": "~3.0",
+ "doctrine/dbal": "~2.5",
"mockery/mockery": "~0.9.4",
"pda/pheanstalk": "~3.0",
- "phpunit/phpunit": "~5.4",
+ "phpunit/phpunit": "~5.7",
"predis/predis": "~1.0",
- "symfony/css-selector": "3.1.*",
- "symfony/dom-crawler": "3.1.*"
+ "symfony/css-selector": "~3.2",
+ "symfony/dom-crawler": "~3.2"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver and SES mail driver (~3.0).",
- "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).",
+ "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.5).",
"fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).",
- "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~5.3|~6.0).",
+ "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
+ "laravel/tinker": "Required to use the tinker console command (~1.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
"league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
+ "nexmo/client": "Required to use the Nexmo transport (~1.0).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (~3.0).",
"predis/predis": "Required to use the redis cache and queue drivers (~1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).",
- "symfony/css-selector": "Required to use some of the crawler integration testing tools (3.1.*).",
- "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (3.1.*).",
- "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)."
+ "symfony/css-selector": "Required to use some of the crawler integration testing tools (~3.2).",
+ "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (~3.2).",
+ "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)."
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.3-dev"
+ "dev-master": "5.4-dev"
}
},
"autoload": {
@@ -750,32 +639,90 @@
"framework",
"laravel"
],
- "time": "2017-01-26T14:29:55+00:00"
+ "time": "2017-01-26T20:30:57+00:00"
},
{
- "name": "laravelcollective/html",
- "version": "v5.3.1",
+ "name": "laravel/tinker",
+ "version": "v1.0.0",
"source": {
"type": "git",
- "url": "https://github.com/LaravelCollective/html.git",
- "reference": "2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35"
+ "url": "https://github.com/laravel/tinker.git",
+ "reference": "3d5b675b55b24ccbf86395964042dbe061d5a965"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/LaravelCollective/html/zipball/2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35",
- "reference": "2f7f2e127c6fed47f269ea29ab5efeb8f65e9d35",
+ "url": "https://api.github.com/repos/laravel/tinker/zipball/3d5b675b55b24ccbf86395964042dbe061d5a965",
+ "reference": "3d5b675b55b24ccbf86395964042dbe061d5a965",
"shasum": ""
},
"require": {
- "illuminate/http": "5.3.*",
- "illuminate/routing": "5.3.*",
- "illuminate/session": "5.3.*",
- "illuminate/support": "5.3.*",
- "illuminate/view": "5.3.*",
+ "illuminate/console": "~5.1",
+ "illuminate/contracts": "~5.1",
+ "illuminate/support": "~5.1",
+ "php": ">=5.5.9",
+ "psy/psysh": "0.7.*|0.8.*",
+ "symfony/var-dumper": "~3.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "~4.0|~5.0"
+ },
+ "suggest": {
+ "illuminate/database": "The Illuminate Database package (~5.1)."
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Laravel\\Tinker\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Taylor Otwell",
+ "email": "taylor@laravel.com"
+ }
+ ],
+ "description": "Powerful REPL for the Laravel framework.",
+ "keywords": [
+ "REPL",
+ "Tinker",
+ "laravel",
+ "psysh"
+ ],
+ "time": "2016-12-30T18:13:17+00:00"
+ },
+ {
+ "name": "laravelcollective/html",
+ "version": "v5.4.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/LaravelCollective/html.git",
+ "reference": "7570f25d58a00fd6909c0563808590f9cdb14d47"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/LaravelCollective/html/zipball/7570f25d58a00fd6909c0563808590f9cdb14d47",
+ "reference": "7570f25d58a00fd6909c0563808590f9cdb14d47",
+ "shasum": ""
+ },
+ "require": {
+ "illuminate/http": "5.4.*",
+ "illuminate/routing": "5.4.*",
+ "illuminate/session": "5.4.*",
+ "illuminate/support": "5.4.*",
+ "illuminate/view": "5.4.*",
"php": ">=5.6.4"
},
"require-dev": {
- "illuminate/database": "5.3.*",
+ "illuminate/database": "5.4.*",
"mockery/mockery": "~0.9.4",
"phpunit/phpunit": "~5.4"
},
@@ -804,7 +751,7 @@
],
"description": "HTML and Form Builders for the Laravel Framework",
"homepage": "http://laravelcollective.com",
- "time": "2016-12-13T14:23:36+00:00"
+ "time": "2017-01-26T19:27:05+00:00"
},
{
"name": "league/flysystem",
@@ -1879,16 +1826,16 @@
},
{
"name": "symfony/console",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52"
+ "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/047f16485d68c083bd5d9b73ff16f9cb9c1a9f52",
- "reference": "047f16485d68c083bd5d9b73ff16f9cb9c1a9f52",
+ "url": "https://api.github.com/repos/symfony/console/zipball/4f9e449e76996adf310498a8ca955c6deebe29dd",
+ "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd",
"shasum": ""
},
"require": {
@@ -1899,17 +1846,19 @@
"require-dev": {
"psr/log": "~1.0",
"symfony/event-dispatcher": "~2.8|~3.0",
+ "symfony/filesystem": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0"
},
"suggest": {
"psr/log": "For using the console logger",
"symfony/event-dispatcher": "",
+ "symfony/filesystem": "",
"symfony/process": ""
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1936,20 +1885,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-01-08T20:43:43+00:00"
+ "time": "2017-01-08T20:47:33+00:00"
},
{
"name": "symfony/css-selector",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d"
+ "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d",
- "reference": "722a87478a72d95dc2a3bcf41dc9c2d13fd4cb2d",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
+ "reference": "f0e628f04fc055c934b3211cfabdb1c59eefbfaa",
"shasum": ""
},
"require": {
@@ -1958,7 +1907,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -1989,20 +1938,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/debug",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "73f1c337907ba963af8028844fea1af98498dfff"
+ "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/73f1c337907ba963af8028844fea1af98498dfff",
- "reference": "73f1c337907ba963af8028844fea1af98498dfff",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/810ba5c1c5352a4ddb15d4719e8936751dff0b05",
+ "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05",
"shasum": ""
},
"require": {
@@ -2019,7 +1968,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2046,7 +1995,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/event-dispatcher",
@@ -2159,16 +2108,16 @@
},
{
"name": "symfony/finder",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "59687a255d1562f2c17b012418273862083d85f7"
+ "reference": "8c71141cae8e2957946b403cc71a67213c0380d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/59687a255d1562f2c17b012418273862083d85f7",
- "reference": "59687a255d1562f2c17b012418273862083d85f7",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6",
+ "reference": "8c71141cae8e2957946b403cc71a67213c0380d6",
"shasum": ""
},
"require": {
@@ -2177,7 +2126,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2204,20 +2153,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/http-foundation",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0"
+ "reference": "33eb76bf1d833c705433e5361a646c164696394b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cef0ad49a2e90455cfc649522025b5a2929648c0",
- "reference": "cef0ad49a2e90455cfc649522025b5a2929648c0",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/33eb76bf1d833c705433e5361a646c164696394b",
+ "reference": "33eb76bf1d833c705433e5361a646c164696394b",
"shasum": ""
},
"require": {
@@ -2230,7 +2179,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2257,20 +2206,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2017-01-08T20:43:43+00:00"
+ "time": "2017-01-08T20:47:33+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "d7578a0ed01e689f5b058e1ed37b9ad0718a1ef3"
+ "reference": "8a898e340a89022246645b1288d295f49c9381e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d7578a0ed01e689f5b058e1ed37b9ad0718a1ef3",
- "reference": "d7578a0ed01e689f5b058e1ed37b9ad0718a1ef3",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8a898e340a89022246645b1288d295f49c9381e4",
+ "reference": "8a898e340a89022246645b1288d295f49c9381e4",
"shasum": ""
},
"require": {
@@ -2298,7 +2247,7 @@
"symfony/stopwatch": "~2.8|~3.0",
"symfony/templating": "~2.8|~3.0",
"symfony/translation": "~2.8|~3.0",
- "symfony/var-dumper": "~2.8|~3.0"
+ "symfony/var-dumper": "~3.2"
},
"suggest": {
"symfony/browser-kit": "",
@@ -2312,7 +2261,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2339,7 +2288,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2017-01-12T20:43:39+00:00"
+ "time": "2017-01-12T21:36:33+00:00"
},
{
"name": "symfony/options-resolver",
@@ -2454,126 +2403,18 @@
],
"time": "2016-11-14T01:06:16+00:00"
},
- {
- "name": "symfony/polyfill-php56",
- "version": "v1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-php56.git",
- "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c",
- "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3",
- "symfony/polyfill-util": "~1.0"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Php56\\": ""
- },
- "files": [
- "bootstrap.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
- "homepage": "https://symfony.com",
- "keywords": [
- "compatibility",
- "polyfill",
- "portable",
- "shim"
- ],
- "time": "2016-11-14T01:06:16+00:00"
- },
- {
- "name": "symfony/polyfill-util",
- "version": "v1.3.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/polyfill-util.git",
- "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb",
- "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb",
- "shasum": ""
- },
- "require": {
- "php": ">=5.3.3"
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "1.3-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Polyfill\\Util\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Grekas",
- "email": "p@tchwork.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony utilities for portability of PHP codes",
- "homepage": "https://symfony.com",
- "keywords": [
- "compat",
- "compatibility",
- "polyfill",
- "shim"
- ],
- "time": "2016-11-14T01:06:16+00:00"
- },
{
"name": "symfony/process",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "b525066a9efe372f0910296e486aa61741b09025"
+ "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/b525066a9efe372f0910296e486aa61741b09025",
- "reference": "b525066a9efe372f0910296e486aa61741b09025",
+ "url": "https://api.github.com/repos/symfony/process/zipball/350e810019fc52dd06ae844b6a6d382f8a0e8893",
+ "reference": "350e810019fc52dd06ae844b6a6d382f8a0e8893",
"shasum": ""
},
"require": {
@@ -2582,7 +2423,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2609,20 +2450,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/routing",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "5cd8d7b88e9f30a7d830fa15876828da272685d3"
+ "reference": "fda2c67d47ec801726ca888c95d701d31b27b444"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/5cd8d7b88e9f30a7d830fa15876828da272685d3",
- "reference": "5cd8d7b88e9f30a7d830fa15876828da272685d3",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/fda2c67d47ec801726ca888c95d701d31b27b444",
+ "reference": "fda2c67d47ec801726ca888c95d701d31b27b444",
"shasum": ""
},
"require": {
@@ -2651,7 +2492,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2684,20 +2525,20 @@
"uri",
"url"
],
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/translation",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "7882149d1e1fd46d960f3e42344c9caf2e535573"
+ "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/7882149d1e1fd46d960f3e42344c9caf2e535573",
- "reference": "7882149d1e1fd46d960f3e42344c9caf2e535573",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/6520f3d4cce604d9dd1e86cac7af954984dd9bda",
+ "reference": "6520f3d4cce604d9dd1e86cac7af954984dd9bda",
"shasum": ""
},
"require": {
@@ -2721,7 +2562,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2748,20 +2589,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-02T20:32:22+00:00"
},
{
"name": "symfony/var-dumper",
- "version": "v3.1.9",
+ "version": "v3.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "d34a930421233f119fe61149ce046bb5b0b412d9"
+ "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d34a930421233f119fe61149ce046bb5b0b412d9",
- "reference": "d34a930421233f119fe61149ce046bb5b0b412d9",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b54b23f9a19b465e76fdaac0f6732410467c83b2",
+ "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2",
"shasum": ""
},
"require": {
@@ -2777,7 +2618,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "3.2-dev"
}
},
"autoload": {
@@ -2811,7 +2652,7 @@
"debug",
"dump"
],
- "time": "2017-01-02T20:31:54+00:00"
+ "time": "2017-01-03T08:53:57+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -4273,62 +4114,6 @@
"homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00"
},
- {
- "name": "symfony/dom-crawler",
- "version": "v3.1.9",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/dom-crawler.git",
- "reference": "a950260ebc947578fba82a3222e2085d90682376"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a950260ebc947578fba82a3222e2085d90682376",
- "reference": "a950260ebc947578fba82a3222e2085d90682376",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9",
- "symfony/polyfill-mbstring": "~1.0"
- },
- "require-dev": {
- "symfony/css-selector": "~2.8|~3.0"
- },
- "suggest": {
- "symfony/css-selector": ""
- },
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1-dev"
- }
- },
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\DomCrawler\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "description": "Symfony DomCrawler Component",
- "homepage": "https://symfony.com",
- "time": "2017-01-02T20:31:54+00:00"
- },
{
"name": "symfony/yaml",
"version": "v3.2.2",
diff --git a/config/app.php b/config/app.php
index da8cbdb..737efa4 100644
--- a/config/app.php
+++ b/config/app.php
@@ -166,8 +166,7 @@ return [
/*
* Package Service Providers...
*/
-
- //
+ Laravel\Tinker\TinkerServiceProvider::class,
/*
* Application Service Providers...
@@ -205,6 +204,7 @@ return [
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
+ 'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
diff --git a/config/broadcasting.php b/config/broadcasting.php
index 19a59ba..5eecd2b 100644
--- a/config/broadcasting.php
+++ b/config/broadcasting.php
@@ -32,8 +32,8 @@ return [
'pusher' => [
'driver' => 'pusher',
- 'key' => env('PUSHER_KEY'),
- 'secret' => env('PUSHER_SECRET'),
+ 'key' => env('PUSHER_APP_KEY'),
+ 'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
diff --git a/config/cache.php b/config/cache.php
index 0581207..c6a0c6b 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -46,7 +46,7 @@ return [
'file' => [
'driver' => 'file',
- 'path' => storage_path('framework/cache'),
+ 'path' => storage_path('framework/cache/data'),
],
'memcached' => [
diff --git a/config/compile.php b/config/compile.php
deleted file mode 100644
index 04807ea..0000000
--- a/config/compile.php
+++ /dev/null
@@ -1,35 +0,0 @@
- [
- //
- ],
-
- /*
- |--------------------------------------------------------------------------
- | Compiled File Providers
- |--------------------------------------------------------------------------
- |
- | Here you may list service providers which define a "compiles" function
- | that returns additional files that should be compiled, providing an
- | easy way to get common files from any packages you are utilizing.
- |
- */
-
- 'providers' => [
- //
- ],
-
-];
diff --git a/config/database.php b/config/database.php
index fd22e8e..df36b2d 100644
--- a/config/database.php
+++ b/config/database.php
@@ -2,19 +2,6 @@
return [
- /*
- |--------------------------------------------------------------------------
- | PDO Fetch Style
- |--------------------------------------------------------------------------
- |
- | By default, database results will be returned as instances of the PHP
- | stdClass object; however, you may desire to retrieve records in an
- | array format for simplicity. Here you can tweak the fetch style.
- |
- */
-
- 'fetch' => PDO::FETCH_OBJ,
-
/*
|--------------------------------------------------------------------------
| Default Database Connection Name
@@ -54,13 +41,13 @@ return [
'mysql' => [
'driver' => 'mysql',
- 'host' => env('DB_HOST', 'localhost'),
+ 'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
'password' => env('DB_PASSWORD', ''),
- 'charset' => 'utf8',
- 'collation' => 'utf8_unicode_ci',
+ 'charset' => 'utf8mb4',
+ 'collation' => 'utf8mb4_unicode_ci',
'prefix' => '',
'strict' => true,
'engine' => null,
@@ -68,7 +55,7 @@ return [
'pgsql' => [
'driver' => 'pgsql',
- 'host' => env('DB_HOST', 'localhost'),
+ 'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'),
'username' => env('DB_USERNAME', 'forge'),
@@ -107,10 +94,10 @@ return [
'redis' => [
- 'cluster' => false,
+ 'client' => 'predis',
'default' => [
- 'host' => env('REDIS_HOST', 'localhost'),
+ 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379),
'database' => 0,
diff --git a/config/filesystems.php b/config/filesystems.php
index e1c4c95..f59cf9e 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -51,15 +51,16 @@ return [
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
+ 'url' => env('APP_URL').'/storage',
'visibility' => 'public',
],
's3' => [
'driver' => 's3',
- 'key' => 'your-key',
- 'secret' => 'your-secret',
- 'region' => 'your-region',
- 'bucket' => 'your-bucket',
+ 'key' => env('AWS_KEY'),
+ 'secret' => env('AWS_SECRET'),
+ 'region' => env('AWS_REGION'),
+ 'bucket' => env('AWS_BUCKET'),
],
],
diff --git a/config/mail.php b/config/mail.php
index f1a7e9a..6226bbf 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -11,8 +11,8 @@ return [
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
- | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill",
- | "ses", "sparkpost", "log"
+ | Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
+ | "sparkpost", "log", "array"
|
*/
@@ -86,30 +86,25 @@ return [
'username' => env('MAIL_USERNAME'),
- /*
- |--------------------------------------------------------------------------
- | SMTP Server Password
- |--------------------------------------------------------------------------
- |
- | Here you may set the password required by your SMTP server to send out
- | messages from your application. This will be given to the server on
- | connection so that the application will be able to send messages.
- |
- */
-
'password' => env('MAIL_PASSWORD'),
/*
|--------------------------------------------------------------------------
- | Sendmail System Path
+ | Markdown Mail Settings
|--------------------------------------------------------------------------
|
- | When using the "sendmail" driver to send e-mails, we will need to know
- | the path to where Sendmail lives on this server. A default path has
- | been provided here, which will work well on most of your systems.
+ | If you are using Markdown based email rendering, you may configure your
+ | theme and component paths here, allowing you to customize the design
+ | of the emails. Or, you may simply stick with the Laravel defaults!
|
*/
- 'sendmail' => '/usr/sbin/sendmail -bs',
+ 'markdown' => [
+ 'theme' => 'default',
+
+ 'paths' => [
+ resource_path('views/vendor/mail'),
+ ],
+ ],
];
diff --git a/config/queue.php b/config/queue.php
index 549322e..4d83ebd 100644
--- a/config/queue.php
+++ b/config/queue.php
@@ -7,7 +7,7 @@ return [
| Default Queue Driver
|--------------------------------------------------------------------------
|
- | The Laravel queue API supports a variety of back-ends via an unified
+ | Laravel's queue API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for each one. Here you may set the default queue driver.
|
diff --git a/phpunit.xml b/phpunit.xml
index 712e0af..a2c496e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -9,8 +9,12 @@
processIsolation="false"
stopOnFailure="false">
-
- ./tests
+
+ ./tests/Feature
+
+
+
+ ./tests/Unit
diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php
index fcab34b..d481411 100644
--- a/resources/lang/en/pagination.php
+++ b/resources/lang/en/pagination.php
@@ -14,6 +14,6 @@ return [
*/
'previous' => '« Previous',
- 'next' => 'Next »',
+ 'next' => 'Next »',
];
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 73b49d0..9608bc2 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -16,11 +16,13 @@ return [
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/routes/api.php b/routes/api.php
index 6b907f3..c641ca5 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -13,6 +13,6 @@ use Illuminate\Http\Request;
|
*/
-Route::get('/user', function (Request $request) {
+Route::middleware('auth:api')->get('/user', function (Request $request) {
return $request->user();
-})->middleware('auth:api');
+});
diff --git a/routes/channels.php b/routes/channels.php
new file mode 100644
index 0000000..f16a20b
--- /dev/null
+++ b/routes/channels.php
@@ -0,0 +1,16 @@
+id === (int) $id;
+});
diff --git a/routes/web.php b/routes/web.php
index 4a25861..62199e3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,16 @@
make(Kernel::class)->bootstrap();
+
+ return $app;
+ }
+}
diff --git a/tests/ExampleTest.php b/tests/Feature/ExampleTest.php
similarity index 58%
rename from tests/ExampleTest.php
rename to tests/Feature/ExampleTest.php
index 2f2d20f..486dc27 100644
--- a/tests/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -1,5 +1,8 @@
visit('/')
- ->see('Laravel');
+ $response = $this->get('/');
+
+ $response->assertStatus(200);
}
}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 8208edc..2932d4a 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -1,25 +1,10 @@
make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
-
- return $app;
- }
+ use CreatesApplication;
}
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
new file mode 100644
index 0000000..5663bb4
--- /dev/null
+++ b/tests/Unit/ExampleTest.php
@@ -0,0 +1,20 @@
+assertTrue(true);
+ }
+}