Upgrade for Laravel 5.4

Author: intrip

.travis.yml

@@ -3,10 +3,12 @@ language: php
 php: 
   - 5.6
   - 7.0
+  - 7.1
 
 before_script:
   - curl -s http://getcomposer.org/installer | php
   - php composer.phar install --dev
+  - php composer.phar dump-autoload
 
 script: phpunit
 

app/Authentication/AuthenticationServiceProvider.php

@@ -172,7 +172,7 @@ public function provides()
 
     private function registerInstallCommand()
     {
-        $this->app['authentication.install'] = $this->app->share(function ($app)
+        $this->app->singleton('authentication.install', function ($app)
         {
             return new InstallCommand;
         });

app/Authentication/Classes/CustomProfile/Events/ProfilePermissionSubscriber.php

@@ -7,7 +7,7 @@
  *
  * @author jacopo beschi jacopo@jacopobeschi.com
  */
-class ProfilePermissionSubscriber 
+class ProfilePermissionSubscriber
 {
     protected $permission_error_message = "You don't have the permission to edit custom the user profiles.";
 
@@ -32,4 +32,4 @@ public function subscribe($events)
         $events->listen('customprofile.deleting', 'LaravelAcl\Authentication\Classes\CustomProfile\Events\ProfilePermissionSubscriber@checkProfileTypePermission');
     }
 
-} 
+}

app/Authentication/Classes/CustomProfile/Repository/CustomProfileRepository.php

@@ -27,7 +27,7 @@ public static function getAllTypes()
 
     public static function addNewType($description)
     {
-        // firing event so it can get catched for permission handling
+        // firing event for permission handling
         Event::fire('customprofile.creating');
         $profile_field_type = ProfileFieldType::create(["description" => $description]);
 
@@ -36,7 +36,7 @@ public static function addNewType($description)
 
     public static function deleteType($id)
     {
-        // firing event so it can get catched for permission handling
+        // firing event for permission handling
         Event::fire('customprofile.deleting');
         $success = ProfileFieldType::findOrFail($id)->delete();
 
@@ -144,4 +144,4 @@ protected function fetchProfileValueAssociated($profile_type)
         return $profile_type->profile_field()->whereProfileId($this->profile_id)->first()->value;
     }
 
-}
+}

app/Authentication/Controllers/UserController.php

@@ -24,6 +24,7 @@
 use View, Redirect, App, Config;
 use LaravelAcl\Authentication\Interfaces\AuthenticateInterface;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use LaravelAcl\Library\Form\FormModel;
 
 class UserController extends Controller {
     /**
@@ -48,7 +49,8 @@ public function __construct(UserValidator $v, FormHelper $fh, UserProfileValidat
     {
         $this->user_repository = App::make('user_repository');
         $this->user_validator = $v;
-        $this->f = App::make('form_model', [$this->user_validator, $this->user_repository]);
+        //@todo use IOC correctly with a factory and passing the correct parameters
+        $this->f = new FormModel($this->user_validator, $this->user_repository);
         $this->form_helper = $fh;
         $this->profile_validator = $vp;
         $this->profile_repository = App::make('profile_repository');
@@ -347,4 +349,4 @@ public function refreshCaptcha()
         return View::make('laravel-authentication-acl::client.auth.captcha-image')
                    ->with(['captcha' => App::make('captcha_validator')]);
     }
-} 
+}

app/Authentication/Services/ReminderService.php

@@ -149,4 +149,4 @@ public function getMailer()
         return $this->mailer;
     }
 
-} 
+} 

app/Library/Email/SwiftMailer.php

@@ -19,7 +19,7 @@ public function sendTo($to, $body, $subject, $template)
     {
         try
         {
-            App::make('mailer')->queue($template, ["body" => $body], function($message) use($to, $subject){
+            App::make('mailer')->send($template, ["body" => $body], function($message) use($to, $subject){
                 $message->to($to)->subject($subject);
             });
         }
@@ -36,4 +36,4 @@ public function sendTo($to, $body, $subject, $template)
 
         return true;
     }
-}
+}

app/Library/LibraryServiceProvider.php

@@ -6,59 +6,57 @@
 
 class LibraryServiceProvider extends ServiceProvider {
 
-	/**
-	 * Indicates if loading of the provider is deferred.
-	 *
-	 * @var bool
-	 */
-	protected $defer = false;
-
-	/**
-	 * Bootstrap the application events.
-	 *
-	 * @return void
-	 */
-	public function boot()
-	{
-        $this->bindMailer();
-        $this->bindFormModel();
-
-    }
-
-    protected function bindMailer()
-    {
-        $this->app->bind('jmailer', function ()
-        {
-            return new SwiftMailer;
-        });
-    }
-
-    protected function bindFormModel()
+  /**
+   * Indicates if loading of the provider is deferred.
+   *
+   * @var bool
+   */
+  protected $defer = false;
+
+  /**
+   * Bootstrap the application events.
+   *
+   * @return void
+   */
+  public function boot()
+  {
+    $this->bindMailer();
+    $this->bindFormModel();
+  }
+
+  protected function bindMailer()
+  {
+    $this->app->bind('jmailer', function ()
     {
-        $this->app->bind('form_model', function ($app, $params) {
-            // validator, repository
-            return new FormModel($params[0], $params[1]);
-        });
-    }
-
-	/**
-	 * Register the service provider.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-		//
-	}
-
-	/**
-	 * Get the services provided by the provider.
-	 *
-	 * @return array
-	 */
-	public function provides()
-	{
-		return array();
-	}
-
-}
+      return new SwiftMailer;
+    });
+  }
+
+  protected function bindFormModel()
+  {
+    $this->app->bind('form_model', function ($app) {
+      return new FormModel();
+    });
+  }
+
+  /**
+   * Register the service provider.
+   *
+   * @return void
+   */
+  public function register()
+  {
+    //
+  }
+
+  /**
+   * Get the services provided by the provider.
+   *
+   * @return array
+   */
+  public function provides()
+  {
+    return array();
+  }
+
+}

composer.json

@@ -19,19 +19,17 @@
   "license": "MIT",
   "type": "project",
   "require": {
-    "laravel/framework": "5.3.*",
-    "laravelcollective/html" : "5.3.*",
+    "laravel/framework": "5.4.*",
+    "laravelcollective/html" : "5.4.*",
     "intervention/image": "2.*",
-    "jacopo/authentication-sentry": "3.0.4",
-    "gregwar/captcha": "1.0.11"
+    "jacopo/authentication-sentry": "3.0.7",
+    "gregwar/captcha": "1.1.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "phpspec/phpspec": "~2.1",
+    "phpunit/phpunit": "~5.7",
     "mockery/mockery": "0.9.*",
-    "fzaninotto/faker": "1.4.*",
-    "doctrine/dbal": "2.5.*"
-
+    "fzaninotto/faker": "~1.4",
+    "sebastian/exporter": "^2.0"
   },
   "autoload": {
     "classmap": [

docs/index.md

@@ -32,6 +32,15 @@ To install authentication follow this steps:
 
   2. Add to your _composer.json_ require field the following lines:
 
+      __For Laravel version 5.4:__
+
+      ```
+      "require": {
+        ...
+        "jacopo/laravel-authentication-acl": "1.4.*"
+      },
+      ```
+
       __For Laravel version 5.3:__
       
       ```

public/packages/jacopo/laravel-authentication-acl/css/style.css

@@ -165,4 +165,4 @@ div.paginator
 
 .form-error{
   border: 1px solid red;
-}
+}

readme.md

@@ -4,15 +4,15 @@ laravel-authentication-acl
 [![Build Status](https://travis-ci.org/intrip/laravel-authentication-acl.svg?branch=1.3)](https://travis-ci.org/intrip/laravel-authentication-acl)
 [![Total Downloads](https://poser.pugx.org/jacopo/laravel-authentication-acl/d/total.svg)](https://packagist.org/packages/jacopo/laravel-authentication-acl)
 
-## This is the Laravel 5.3 Version, for Laravel 5.2 use the version 1.3.15, for Laravel 5.1/5.0 use the version 1.3.11, for Laravel4 version use the 1.2 branch
+## This is the Laravel 5.4 Version, for Laravel 5.3 use the version 1.3.*, for Laravel 5.2 use the version 1.3.15, for Laravel 5.1/5.0 use the version 1.3.11, for Laravel4 version use the 1.2 branch
 
 Laravel Authentication ACL is a Laravel 5 package, based on <a href="https://github.com/cartalyst/sentry" target="_blank">sentry2</a>. <br/>
 This package is made with the purpose of helping other developers to set-up
 a fully featured admin panel with an ACL using Laravel framework.
 
 You can see the full documentation and usage [here](docs/index.md)
 
-####Main features:
+#### Main features:
  - User authentication and signup
  - Configurable email confirmation
  - Configurable captcha integration
@@ -43,6 +43,6 @@ Please support the project development, even a small donation can help the life
 
 <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=SZKN8MCQACLSC" target="_blank"><img src="https://www.paypalobjects.com/it_IT/IT/i/btn/btn_donate_LG.gif"></a>
 
-####Interested in some new feature?
+#### Interested in some new feature?
 There's something you like to see in this package?
 Contact me and i'll do my best to implement that in next releases.