Migrate to Laravel 5

Author: driesvints

.coveralls.yml

@@ -1,6 +1,6 @@
 service_name: travis-ci
 
 # for php-coveralls
-src_dir: app/Lio
+src_dir: app/
 coverage_clover: build/logs/clover.xml
-json_path: build/logs/coveralls-upload.json
+json_path: build/logs/coveralls-upload.json

.env.example

@@ -0,0 +1,24 @@
+APP_ENV=local
+APP_DEBUG=true
+
+DB_HOST=localhost
+DB_DATABASE=laravelio
+DB_USERNAME=homestead
+DB_PASSWORD=secret
+
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+QUEUE_DRIVER=sync
+
+MAIL_DRIVER=smtp
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+NOCAPTCHA_SITEKEY=
+NOCAPTCHA_SECRET=
+GITHUB_ID=
+GITHUB_SECRET=
+GITHUB_URL=

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .idea
-bootstrap/compiled.php
-vendor/
+/vendor
+/node_modules
+Homestead.yaml
 .env

.scrutinizer.yml

@@ -1,5 +1,5 @@
 filter:
-    paths: [app/Lio/*]
+    paths: [app/*]
 tools:
     php_analyzer: true
     php_code_sniffer:
@@ -60,4 +60,4 @@ checks:
         classes_in_camel_caps: true
         blank_line_after_namespace_declaration: true
         avoid_usage_of_logical_operators: true
-        avoid_tab_indentation: true
+        avoid_tab_indentation: true

.travis.yml

@@ -1,26 +1,24 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
+  - 7.0
   - hhvm
 
+sudo: false
+
 before_script:
-  - travis_retry composer self-update
-  - travis_retry composer require satooshi/php-coveralls:dev-master --dev --no-progress --prefer-source
-  - travis_retry composer install --prefer-source --no-interaction --dev
+  - composer self-update
+  - composer install --prefer-source --no-interaction --dev
 
 script:
-  - touch .env
-  - mkdir -p build/logs
-  - vendor/bin/phpspec run --verbose --format=dot
-  - vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
+  - vendor/bin/phpspec run --verbose
+  - vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml
 
 after_script:
   - php vendor/bin/coveralls -v
 
 matrix:
   allow_failures:
+    - php: 7.0
     - php: hhvm
-  fast_finish: true

app/Accounts/InvalidRoleException.php

@@ -0,0 +1,4 @@
+<?php
+namespace Lio\Accounts;
+
+class InvalidRoleException extends \Exception {}

src/Accounts/Role.php renamed to app/Accounts/Role.php

@@ -1,11 +1,22 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 use Lio\Core\Entity;
 
 class Role extends Entity
 {
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
     protected $table = 'roles';
 
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
     protected $fillable = ['name', 'description'];
 
     protected $validationRules = [
@@ -14,6 +25,6 @@ class Role extends Entity
 
     public function users()
     {
-        $this->belongsToMany('Lio\Accounts\User');
+        $this->belongsToMany(User::class);
     }
 }

src/Accounts/RoleRepository.php renamed to app/Accounts/RoleRepository.php

@@ -1,4 +1,5 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 use Lio\Core\EloquentRepository;
 

src/Accounts/SendConfirmationEmail.php renamed to app/Accounts/SendConfirmationEmail.php

@@ -31,7 +31,7 @@ public function __construct(Mailer $mailer)
      *
      * @param \Lio\Accounts\User $user
      */
-    public function send($user)
+    public function send(User $user)
     {
         $this->mailer->send(
             $this->view,

src/Accounts/User.php renamed to app/Accounts/User.php

@@ -1,26 +1,47 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 use Carbon\Carbon;
-use Illuminate\Auth\Reminders\RemindableTrait;
-use Illuminate\Auth\UserInterface;
-use Illuminate\Auth\Reminders\RemindableInterface;
-use Illuminate\Auth\UserTrait;
-use Illuminate\Database\Eloquent\SoftDeletingTrait;
-use Lio\Core\Entity;
 use Eloquent;
-use McCool\LaravelAutoPresenter\PresenterInterface;
+use Illuminate\Auth\Authenticatable;
+use Illuminate\Auth\Passwords\CanResetPassword;
+use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Lio\Core\Entity;
+use McCool\LaravelAutoPresenter\HasPresenter;
 
-class User extends Entity implements UserInterface, RemindableInterface, PresenterInterface
+class User extends Entity implements AuthenticatableContract, CanResetPasswordContract, HasPresenter
 {
-    use UserTrait, RemindableTrait, SoftDeletingTrait;
+    use Authenticatable, CanResetPassword, SoftDeletes;
 
-    const STATE_ACTIVE  = 1;
-    const STATE_BLOCKED = 2;
+    /**
+     * The database table used by the model.
+     *
+     * @var string
+     */
+    protected $table = 'users';
 
-    protected $table    = 'users';
-    protected $hidden   = ['github_id', 'email', 'remember_token'];
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
     protected $fillable = ['email', 'name', 'github_url', 'github_id', 'image_url', 'is_banned', 'ip'];
-    protected $dates    = ['deleted_at'];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    protected $hidden = ['github_id', 'email', 'remember_token'];
+
+    /**
+     * The attributes that should be mutated to dates.
+     *
+     * @var array
+     */
+    protected $dates = ['deleted_at'];
 
     protected $validationRules = [
         'github_id' => 'unique:users,github_id,<id>',
@@ -30,21 +51,14 @@ class User extends Entity implements UserInterface, RemindableInterface, Present
 
     private $rolesCache;
 
-    // Articles
-    public function articles()
-    {
-        return $this->hasMany('Lio\Articles\Article', 'author_id');
-    }
-
-    // Roles
     public function roles()
     {
-        return $this->belongsToMany('Lio\Accounts\Role');
+        return $this->belongsToMany(Role::class);
     }
 
     public function getRoles()
     {
-        if ( ! isset($this->rolesCache)) {
+        if (! isset($this->rolesCache)) {
             $this->rolesCache = $this->roles;
         }
 
@@ -68,16 +82,16 @@ public function hasRole($roleName)
 
     public function hasRoles($roleNames = [])
     {
-        $roleList = \App::make('Lio\Accounts\RoleRepository')->getRoleList();
+        $roleList = app(RoleRepository::class)->getRoleList();
 
         foreach ((array) $roleNames as $allowedRole) {
             // validate that the role exists
-            if ( ! in_array($allowedRole, $roleList)) {
+            if (! $roleList->contains($allowedRole)) {
                 throw new InvalidRoleException("Unidentified role: {$allowedRole}");
             }
 
             // validate that the user has the role
-            if ( ! $this->roleCollectionHasRole($allowedRole)) {
+            if (! $this->roleCollectionHasRole($allowedRole)) {
                 return false;
             }
         }
@@ -89,7 +103,7 @@ private function roleCollectionHasRole($allowedRole)
     {
         $roles = $this->getRoles();
 
-        if ( ! $roles) {
+        if (! $roles) {
             return false;
         }
 
@@ -135,32 +149,36 @@ public function getLatestRepliesPaginated($max = 5)
 
     public function hasCreatedAThreadRecently()
     {
-        $thread = $this->forumThreads()->first();
-
-        if ($thread) {
+        if ($thread = $this->forumThreads()->first()) {
             return $thread->created_at->gte(new Carbon('10 minutes ago'));
         }
 
         return false;
     }
 
     /**
-     * Determine if the user has confirmed his email address already or not
-     *
      * @return bool
      */
     public function isConfirmed()
     {
         return (bool) $this->confirmed;
     }
 
+    /**
+     * @return bool
+     */
+    public function isBanned()
+    {
+        return (bool) $this->is_banned;
+    }
+
     /**
      * Get the presenter class.
      *
-     * @return string The class path to the presenter.
+     * @return string
      */
-    public function getPresenter()
+    public function getPresenterClass()
     {
-        return 'Lio\Accounts\UserPresenter';
+        return UserPresenter::class;
     }
 }

src/Accounts/UserCreator.php renamed to app/Accounts/UserCreator.php

@@ -1,4 +1,5 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 use Illuminate\Support\Str;
 
@@ -65,4 +66,4 @@ private function createValidUserRecord($listener, $data)
 
         return $listener->userCreated($user);
     }
-}
+}

src/Accounts/UserCreatorListener.php renamed to app/Accounts/UserCreatorListener.php

@@ -1,7 +1,8 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 interface UserCreatorListener
 {
     public function userValidationError($errors);
     public function userCreated($user);
-}
+}

src/Accounts/UserPresenter.php renamed to app/Accounts/UserPresenter.php

@@ -1,16 +1,16 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
-use HTML;
 use McCool\LaravelAutoPresenter\BasePresenter;
 
 class UserPresenter extends BasePresenter
 {
     public function roleList()
     {
-        $roles = $this->getRoles();
+        $roles = $this->roles;
 
-        if ( ! $roles->count()) {
-            return "none";
+        if (! $roles->count()) {
+            return 'none';
         }
 
         $roleArray = [];
@@ -24,16 +24,16 @@ public function roleList()
 
     public function profileUrl()
     {
-        return action('UsersController@getProfile', [$this->resource->name]);
+        return action('UsersController@getProfile', [$this->getWrappedObject()->name]);
     }
 
     public function thumbnail()
     {
-        return HTML::image($this->image_url . "&size=50", $this->resource->name);
+        return '<img src="' . $this->image_url . '&size=50" alt="' . $this->getWrappedObject()->name . '">';
     }
 
     public function imageMedium()
     {
-        return HTML::image($this->image_url . "&size=300");
+        return '<img src="' . $this->image_url . '&size=300">';
     }
-}
+}

src/Accounts/UserRepository.php renamed to app/Accounts/UserRepository.php

@@ -1,4 +1,5 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 use Lio\Core\EloquentRepository;
 use Lio\Core\Exceptions\EntityNotFoundException;

src/Accounts/UserUpdater.php renamed to app/Accounts/UserUpdater.php

@@ -1,4 +1,5 @@
-<?php namespace Lio\Accounts;
+<?php
+namespace Lio\Accounts;
 
 use Illuminate\Support\Str;
 use Illuminate\Validation\Validator;
@@ -82,4 +83,4 @@ private function updateUser(User $user, UserUpdaterListener $listener, array $da
 
         return $listener->userUpdated($user, $data['email'] !== $oldEmail);
     }
-}
+}