Skip to content

Commit

Permalink
Registration inserted with tests
Browse files Browse the repository at this point in the history
  • Loading branch information
carduz committed Nov 16, 2015
1 parent e816e2d commit a412a1c
Show file tree
Hide file tree
Showing 35 changed files with 191 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:
- mysql -uroot -e "create database IF NOT EXISTS meetme;"
- mysql -uroot -e "CREATE USER 'meetme'@'localhost' IDENTIFIED BY 'Lj5Fvj8K';"
- mysql -uroot -e "GRANT ALL ON meetme.* TO 'meetme'@'localhost';"
- php artisan migrate --force
- php artisan migrate --force --seed
tests:
override:
-
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ before_script:
- if [[ "$DB" == "mysql" ]]; then mysql -e "create database IF NOT EXISTS meetme;" -uroot; fi
- if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE USER 'meetme'@'localhost' IDENTIFIED BY 'Lj5Fvj8K';" -uroot; fi
- if [[ "$DB" == "mysql" ]]; then mysql -e "GRANT ALL ON meetme.* TO 'meetme'@'localhost';" -uroot; fi
- php artisan migrate --force
- php artisan migrate --force --seed

# Commands you want to run that will verify your build.
script: phpunit
Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/Inspire.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Console\Commands;
namespace plunner\Console\Commands;

use Illuminate\Console\Command;
use Illuminate\Foundation\Inspiring;
Expand Down
4 changes: 2 additions & 2 deletions app/Console/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Console;
namespace plunner\Console;

use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
Expand All @@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
\Meetme\Console\Commands\Inspire::class,
\plunner\Console\Commands\Inspire::class,
];

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Events/Event.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Events;
namespace plunner\Events;

abstract class Event
{
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Exceptions;
namespace plunner\Exceptions;

use Exception;
use Illuminate\Database\Eloquent\ModelNotFoundException;
Expand Down
8 changes: 5 additions & 3 deletions app/Http/Controllers/Auth/AuthController.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

namespace Meetme\Http\Controllers\Auth;
namespace plunner\Http\Controllers\Auth;

use Meetme\User;
use plunner\User;
use Validator;
use Meetme\Http\Controllers\Controller;
use plunner\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;

Expand All @@ -23,6 +23,8 @@ class AuthController extends Controller

use AuthenticatesAndRegistersUsers, ThrottlesLogins;

protected $redirectPath = "/";

/**
* Create a new authentication controller instance.
*
Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/Auth/PasswordController.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

namespace Meetme\Http\Controllers\Auth;
namespace plunner\Http\Controllers\Auth;

use Meetme\Http\Controllers\Controller;
use plunner\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;

class PasswordController extends Controller
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http\Controllers;
namespace plunner\Http\Controllers;

use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Routing\Controller as BaseController;
Expand Down
10 changes: 5 additions & 5 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http;
namespace plunner\Http;

use Illuminate\Foundation\Http\Kernel as HttpKernel;

Expand All @@ -13,11 +13,11 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Meetme\Http\Middleware\EncryptCookies::class,
\plunner\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Meetme\Http\Middleware\VerifyCsrfToken::class,
\plunner\Http\Middleware\VerifyCsrfToken::class,
];

/**
Expand All @@ -26,8 +26,8 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \Meetme\Http\Middleware\Authenticate::class,
'auth' => \plunner\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'guest' => \Meetme\Http\Middleware\RedirectIfAuthenticated::class,
'guest' => \plunner\Http\Middleware\RedirectIfAuthenticated::class,
];
}
2 changes: 1 addition & 1 deletion app/Http/Middleware/Authenticate.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http\Middleware;
namespace plunner\Http\Middleware;

use Closure;
use Illuminate\Contracts\Auth\Guard;
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Middleware/EncryptCookies.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http\Middleware;
namespace plunner\Http\Middleware;

use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;

Expand Down
4 changes: 2 additions & 2 deletions app/Http/Middleware/RedirectIfAuthenticated.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http\Middleware;
namespace plunner\Http\Middleware;

use Closure;
use Illuminate\Contracts\Auth\Guard;
Expand Down Expand Up @@ -35,7 +35,7 @@ public function __construct(Guard $auth)
public function handle($request, Closure $next)
{
if ($this->auth->check()) {
return redirect('/home');
return redirect('/');
}

return $next($request);
Expand Down
12 changes: 11 additions & 1 deletion app/Http/Middleware/VerifyCsrfToken.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http\Middleware;
namespace plunner\Http\Middleware;

use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;

Expand All @@ -14,4 +14,14 @@ class VerifyCsrfToken extends BaseVerifier
protected $except = [
//
];

protected function tokensMatch($request)
{
// Don't validate CSRF when testing.
if(env('APP_ENV') === 'testing') {
return true;
}

return parent::tokensMatch($request);
}
}
2 changes: 1 addition & 1 deletion app/Http/Requests/Request.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Http\Requests;
namespace plunner\Http\Requests;

use Illuminate\Foundation\Http\FormRequest;

Expand Down
7 changes: 7 additions & 0 deletions app/Http/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,10 @@
Route::get('/', function () {
return view('welcome');
});

// Authentication routes...
Route::post('auth/login', 'Auth\AuthController@postLogin');
Route::get('auth/logout', 'Auth\AuthController@getLogout');

// Registration routes...
Route::post('auth/register', 'Auth\AuthController@postRegister');
2 changes: 1 addition & 1 deletion app/Jobs/Job.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Jobs;
namespace plunner\Jobs;

use Illuminate\Bus\Queueable;

Expand Down
2 changes: 1 addition & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Providers;
namespace plunner\Providers;

use Illuminate\Support\ServiceProvider;

Expand Down
4 changes: 2 additions & 2 deletions app/Providers/AuthServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Providers;
namespace plunner\Providers;

use Illuminate\Contracts\Auth\Access\Gate as GateContract;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
Expand All @@ -13,7 +13,7 @@ class AuthServiceProvider extends ServiceProvider
* @var array
*/
protected $policies = [
'Meetme\Model' => 'Meetme\Policies\ModelPolicy',
'plunner\Model' => 'plunner\Policies\ModelPolicy',
];

/**
Expand Down
6 changes: 3 additions & 3 deletions app/Providers/EventServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Providers;
namespace plunner\Providers;

use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
Expand All @@ -13,8 +13,8 @@ class EventServiceProvider extends ServiceProvider
* @var array
*/
protected $listen = [
'Meetme\Events\SomeEvent' => [
'Meetme\Listeners\EventListener',
'plunner\Events\SomeEvent' => [
'plunner\Listeners\EventListener',
],
];

Expand Down
4 changes: 2 additions & 2 deletions app/Providers/RouteServiceProvider.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme\Providers;
namespace plunner\Providers;

use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
Expand All @@ -14,7 +14,7 @@ class RouteServiceProvider extends ServiceProvider
*
* @var string
*/
protected $namespace = 'Meetme\Http\Controllers';
protected $namespace = 'plunner\Http\Controllers';

/**
* Define your route model bindings, pattern filters, etc.
Expand Down
24 changes: 23 additions & 1 deletion app/User.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Meetme;
namespace plunner;

use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -10,6 +10,28 @@
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;

/**
* plunner\User
*
* @property integer $id
* @property string $name
* @property string $email
* @property string $password
* @property string $remember_token
* @property \Carbon\Carbon $created_at
* @property \Carbon\Carbon $updated_at
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereId($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereName($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereEmail($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User wherePassword($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereRememberToken($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereCreatedAt($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereUpdatedAt($value)
* @property string $deleted_at
* @property boolean $verified
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereDeletedAt($value)
* @method static \Illuminate\Database\Query\Builder|\plunner\User whereVerified($value)
*/
class User extends Model implements AuthenticatableContract,
AuthorizableContract,
CanResetPasswordContract
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@

$app->singleton(
Illuminate\Contracts\Http\Kernel::class,
Meetme\Http\Kernel::class
plunner\Http\Kernel::class
);

$app->singleton(
Illuminate\Contracts\Console\Kernel::class,
Meetme\Console\Kernel::class
plunner\Console\Kernel::class
);

$app->singleton(
Illuminate\Contracts\Debug\ExceptionHandler::class,
Meetme\Exceptions\Handler::class
plunner\Exceptions\Handler::class
);

/*
Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"phpunit/phpunit": "~4.0",
"phpspec/phpspec": "~2.1"
"phpspec/phpspec": "~2.1",
"doctrine/dbal": "~2.3"
},
"autoload": {
"classmap": [
"database"
],
"psr-4": {
"Meetme\\": "app/"
"plunner\\": "app/"
}
},
"autoload-dev": {
Expand Down
8 changes: 4 additions & 4 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@
/*
* Application Service Providers...
*/
Meetme\Providers\AppServiceProvider::class,
Meetme\Providers\AuthServiceProvider::class,
Meetme\Providers\EventServiceProvider::class,
Meetme\Providers\RouteServiceProvider::class,
plunner\Providers\AppServiceProvider::class,
plunner\Providers\AuthServiceProvider::class,
plunner\Providers\EventServiceProvider::class,
plunner\Providers\RouteServiceProvider::class,

/*
* helper
Expand Down
2 changes: 1 addition & 1 deletion config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
|
*/

'model' => Meetme\User::class,
'model' => plunner\User::class,

/*
|--------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion config/services.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
],

'stripe' => [
'model' => Meetme\User::class,
'model' => plunner\User::class,
'key' => env('STRIPE_KEY'),
'secret' => env('STRIPE_SECRET'),
],
Expand Down
2 changes: 1 addition & 1 deletion database/factories/ModelFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
|
*/

$factory->define(Meetme\User::class, function (Faker\Generator $faker) {
$factory->define(plunner\User::class, function (Faker\Generator $faker) {
return [
'name' => $faker->name,
'email' => $faker->email,
Expand Down
Loading

0 comments on commit a412a1c

Please sign in to comment.