diff --git a/app/Http/Controllers/AccountApiController.php b/app/Http/Controllers/AccountApiController.php index 6d4ef0ccf1e7..ca4ea8002559 100644 --- a/app/Http/Controllers/AccountApiController.php +++ b/app/Http/Controllers/AccountApiController.php @@ -27,7 +27,7 @@ class AccountApiController extends BaseAPIController public function __construct(AccountRepository $accountRepo) { - parent::__construct(); + //parent::__construct(); $this->accountRepo = $accountRepo; } @@ -52,7 +52,7 @@ class AccountApiController extends BaseAPIController // Create a new token only if one does not already exist $user = Auth::user(); $this->accountRepo->createTokens($user, $request->token_name); - + $users = $this->accountRepo->findUsers($user, 'account.account_tokens'); $transformer = new UserAccountTransformer($user->account, $request->serializer, $request->token_name); $data = $this->createCollection($users, $transformer, 'user_account'); diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 0a5d89262a32..8d4af2001182 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -41,7 +41,7 @@ class AccountController extends BaseController public function __construct(AccountRepository $accountRepo, UserMailer $userMailer, ContactMailer $contactMailer, ReferralRepository $referralRepository) { - parent::__construct(); + //parent::__construct(); $this->accountRepo = $accountRepo; $this->userMailer = $userMailer; diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php index 58b831503b78..0bc730129fe1 100644 --- a/app/Http/Controllers/AccountGatewayController.php +++ b/app/Http/Controllers/AccountGatewayController.php @@ -24,7 +24,7 @@ class AccountGatewayController extends BaseController public function __construct(AccountGatewayService $accountGatewayService) { - parent::__construct(); + //parent::__construct(); $this->accountGatewayService = $accountGatewayService; } diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 44d87429d691..897e1d2a978b 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -15,7 +15,7 @@ class ActivityController extends BaseController public function __construct(ActivityService $activityService) { - parent::__construct(); + //parent::__construct(); $this->activityService = $activityService; } diff --git a/app/Http/Controllers/AppController.php b/app/Http/Controllers/AppController.php index 60583b7231a5..a5e787168357 100644 --- a/app/Http/Controllers/AppController.php +++ b/app/Http/Controllers/AppController.php @@ -30,7 +30,7 @@ class AppController extends BaseController public function __construct(AccountRepository $accountRepo, Mailer $mailer, EmailService $emailService) { - parent::__construct(); + //parent::__construct(); $this->accountRepo = $accountRepo; $this->mailer = $mailer; @@ -78,7 +78,7 @@ class AppController extends BaseController } elseif (!$valid) { return Redirect::to('/setup')->withInput(); } - + if (Utils::isDatabaseSetup() && Account::count() > 0) { return Redirect::to('/'); } @@ -114,7 +114,7 @@ class AppController extends BaseController } Cache::flush(); Artisan::call('optimize', array('--force' => true)); - + $firstName = trim(Input::get('first_name')); $lastName = trim(Input::get('last_name')); $email = trim(strtolower(Input::get('email'))); @@ -152,7 +152,7 @@ class AppController extends BaseController $_ENV['DB_DATABASE'] = $db['type']['database']; $_ENV['DB_USERNAME'] = $db['type']['username']; $_ENV['DB_PASSWORD'] = $db['type']['password']; - + if ($mail) { $_ENV['MAIL_DRIVER'] = $mail['driver']; $_ENV['MAIL_PORT'] = $mail['port']; @@ -184,7 +184,7 @@ class AppController extends BaseController foreach ($database['connections'][$dbType] as $key => $val) { Config::set("database.connections.{$dbType}.{$key}", $val); } - + try { DB::reconnect(); $valid = DB::connection()->getDatabaseName() ? true : false; @@ -206,7 +206,7 @@ class AppController extends BaseController Config::set('mail.from.address', $email); Config::set('mail.from.name', $fromName); - + $data = [ 'text' => 'Test email', ]; @@ -280,7 +280,7 @@ class AppController extends BaseController { $messageId = Input::get('MessageID'); return $this->emailService->markOpened($messageId) ? RESULT_SUCCESS : RESULT_FAILURE; - + return RESULT_SUCCESS; } diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 62bae4cbdd8f..bd8813912d25 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -27,7 +27,6 @@ class AuthController extends Controller { use AuthenticatesAndRegistersUsers; - protected $loginPath = '/login'; protected $redirectTo = '/dashboard'; protected $authService; protected $accountRepo; diff --git a/app/Http/Controllers/BankAccountController.php b/app/Http/Controllers/BankAccountController.php index 9222a4cab1e3..bce86bce42f1 100644 --- a/app/Http/Controllers/BankAccountController.php +++ b/app/Http/Controllers/BankAccountController.php @@ -27,7 +27,7 @@ class BankAccountController extends BaseController public function __construct(BankAccountService $bankAccountService, BankAccountRepository $bankAccountRepo) { - parent::__construct(); + //parent::__construct(); $this->bankAccountService = $bankAccountService; $this->bankAccountRepo = $bankAccountRepo; @@ -91,7 +91,7 @@ class BankAccountController extends BaseController $publicId = Input::get('public_id'); $username = trim(Input::get('bank_username')); $password = trim(Input::get('bank_password')); - + if ($publicId) { $bankAccount = BankAccount::scope($publicId)->firstOrFail(); if ($username != $bankAccount->username) { diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 1a2f6c8dc526..ee7f62686fb4 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -1,10 +1,10 @@ beforeFilter('csrf', array('on' => array('post', 'delete', 'put'))); } + */ } diff --git a/app/Http/Controllers/ClientApiController.php b/app/Http/Controllers/ClientApiController.php index 4bac33236646..7efdcac54cba 100644 --- a/app/Http/Controllers/ClientApiController.php +++ b/app/Http/Controllers/ClientApiController.php @@ -20,7 +20,7 @@ class ClientApiController extends BaseAPIController public function __construct(ClientRepository $clientRepo, ClientService $clientService) { - parent::__construct(); + //parent::__construct(); $this->clientRepo = $clientRepo; $this->clientService = $clientService; @@ -174,7 +174,7 @@ class ClientApiController extends BaseAPIController if(!$client) return $this->errorResponse(['message'=>'Client not found.'],400); - + $transformer = new ClientTransformer(Auth::user()->account, Input::get('serializer')); $data = $this->createItem($client, $transformer, ENTITY_CLIENT); @@ -203,7 +203,7 @@ class ClientApiController extends BaseAPIController * ) * ) */ - + public function destroy($publicId) { diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 84145afe9c1c..e9bc9835a682 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -35,7 +35,7 @@ class ClientController extends BaseController public function __construct(ClientRepository $clientRepo, ClientService $clientService) { - parent::__construct(); + //parent::__construct(); $this->clientRepo = $clientRepo; $this->clientService = $clientService; diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 27b3f45272fd..b3a6ac7b1f59 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -1,11 +1,11 @@ creditRepo = $creditRepo; $this->creditService = $creditService; @@ -88,9 +88,9 @@ class CreditController extends BaseController public function store(CreateCreditRequest $request) { $credit = $this->creditRepo->save($request->input()); - + Session::flash('message', trans('texts.created_credit')); - + return redirect()->to($credit->client->getRoute()); } diff --git a/app/Http/Controllers/ExpenseApiController.php b/app/Http/Controllers/ExpenseApiController.php index 88ff5497cefd..513826cef3b7 100644 --- a/app/Http/Controllers/ExpenseApiController.php +++ b/app/Http/Controllers/ExpenseApiController.php @@ -18,7 +18,7 @@ class ExpenseApiController extends BaseAPIController public function __construct(ExpenseRepository $expenseRepo, ExpenseService $expenseService) { - parent::__construct(); + //parent::__construct(); $this->expenseRepo = $expenseRepo; $this->expenseService = $expenseService; diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php index 5535b863e857..2d4294d540a1 100644 --- a/app/Http/Controllers/ExpenseController.php +++ b/app/Http/Controllers/ExpenseController.php @@ -28,7 +28,7 @@ class ExpenseController extends BaseController public function __construct(ExpenseRepository $expenseRepo, ExpenseService $expenseService) { - parent::__construct(); + //parent::__construct(); $this->expenseRepo = $expenseRepo; $this->expenseService = $expenseService; diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 571ac731938c..f01c4a6f1354 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -17,7 +17,7 @@ class HomeController extends BaseController public function __construct(Mailer $mailer) { - parent::__construct(); + //parent::__construct(); $this->mailer = $mailer; } diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index b078fb6f955e..38618475064b 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -13,7 +13,7 @@ class ImportController extends BaseController { public function __construct(ImportService $importService) { - parent::__construct(); + //parent::__construct(); $this->importService = $importService; } diff --git a/app/Http/Controllers/InvoiceApiController.php b/app/Http/Controllers/InvoiceApiController.php index f99e12a4d740..ea595485c183 100644 --- a/app/Http/Controllers/InvoiceApiController.php +++ b/app/Http/Controllers/InvoiceApiController.php @@ -28,7 +28,7 @@ class InvoiceApiController extends BaseAPIController public function __construct(InvoiceService $invoiceService, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, PaymentRepository $paymentRepo, Mailer $mailer) { - parent::__construct(); + //parent::__construct(); $this->invoiceRepo = $invoiceRepo; $this->clientRepo = $clientRepo; @@ -149,7 +149,7 @@ class InvoiceApiController extends BaseAPIController $client = Client::scope()->whereHas('contacts', function($query) use ($email) { $query->where('email', '=', $email); })->first(); - + if (!$client) { $validator = Validator::make(['email'=>$email], ['email' => 'email']); if ($validator->fails()) { @@ -220,7 +220,7 @@ class InvoiceApiController extends BaseAPIController { $account = Auth::user()->account; $account->loadLocalizationSettings($client); - + // set defaults for optional fields $fields = [ 'discount' => 0, diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index bb124c07c46c..08b67c62ba56 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -37,7 +37,7 @@ class InvoiceController extends BaseController public function __construct(Mailer $mailer, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, InvoiceService $invoiceService, RecurringInvoiceService $recurringInvoiceService) { - parent::__construct(); + //parent::__construct(); $this->mailer = $mailer; $this->invoiceRepo = $invoiceRepo; diff --git a/app/Http/Controllers/PaymentApiController.php b/app/Http/Controllers/PaymentApiController.php index 7022f0c3e840..61fa4a3994ec 100644 --- a/app/Http/Controllers/PaymentApiController.php +++ b/app/Http/Controllers/PaymentApiController.php @@ -19,7 +19,7 @@ class PaymentApiController extends BaseAPIController public function __construct(PaymentRepository $paymentRepo, ContactMailer $contactMailer) { - parent::__construct(); + //parent::__construct(); $this->paymentRepo = $paymentRepo; $this->contactMailer = $contactMailer; diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 8d769c126053..24c4005f1d21 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -32,7 +32,7 @@ class PaymentController extends BaseController { public function __construct(PaymentRepository $paymentRepo, InvoiceRepository $invoiceRepo, AccountRepository $accountRepo, ContactMailer $contactMailer, PaymentService $paymentService) { - parent::__construct(); + //parent::__construct(); $this->paymentRepo = $paymentRepo; $this->invoiceRepo = $invoiceRepo; diff --git a/app/Http/Controllers/PaymentTermController.php b/app/Http/Controllers/PaymentTermController.php index 623ca1bf42da..35b57ce26d9d 100644 --- a/app/Http/Controllers/PaymentTermController.php +++ b/app/Http/Controllers/PaymentTermController.php @@ -22,8 +22,8 @@ class PaymentTermController extends BaseController public function __construct(PaymentTermService $paymentTermService) { - parent::__construct(); - + //parent::__construct(); + $this->paymentTermService = $paymentTermService; } @@ -99,5 +99,5 @@ class PaymentTermController extends BaseController return Redirect::to('settings/' . ACCOUNT_PAYMENT_TERMS); } - + } diff --git a/app/Http/Controllers/ProductApiController.php b/app/Http/Controllers/ProductApiController.php index 87bf89403b8a..665c1d071beb 100644 --- a/app/Http/Controllers/ProductApiController.php +++ b/app/Http/Controllers/ProductApiController.php @@ -25,7 +25,7 @@ class ProductApiController extends BaseAPIController public function __construct(ProductService $productService, ProductRepository $productRepo) { - parent::__construct(); + //parent::__construct(); $this->productService = $productService; $this->productRepo = $productRepo; diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index e25f486688d5..bd5eed57db94 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -21,7 +21,7 @@ class ProductController extends BaseController public function __construct(ProductService $productService) { - parent::__construct(); + //parent::__construct(); $this->productService = $productService; } diff --git a/app/Http/Controllers/QuoteApiController.php b/app/Http/Controllers/QuoteApiController.php index 3e3cfa580c23..58d1dc6e35bc 100644 --- a/app/Http/Controllers/QuoteApiController.php +++ b/app/Http/Controllers/QuoteApiController.php @@ -15,7 +15,7 @@ class QuoteApiController extends BaseAPIController public function __construct(InvoiceRepository $invoiceRepo) { - parent::__construct(); + //parent::__construct(); $this->invoiceRepo = $invoiceRepo; } @@ -52,7 +52,7 @@ class QuoteApiController extends BaseAPIController } $invoices = $invoices->orderBy('created_at', 'desc')->paginate(); - + $transformer = new QuoteTransformer(\Auth::user()->account, Input::get('serializer')); $paginator = $paginator->paginate(); diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index 47b5c1a338e4..882acb039e08 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -36,7 +36,7 @@ class QuoteController extends BaseController public function __construct(Mailer $mailer, InvoiceRepository $invoiceRepo, ClientRepository $clientRepo, InvoiceService $invoiceService) { - parent::__construct(); + //parent::__construct(); $this->mailer = $mailer; $this->invoiceRepo = $invoiceRepo; @@ -99,7 +99,7 @@ class QuoteController extends BaseController 'title' => trans('texts.new_quote'), ]; $data = array_merge($data, self::getViewModel()); - + return View::make('invoices.edit', $data); } @@ -136,7 +136,7 @@ class QuoteController extends BaseController Session::flash('message', trans('texts.converted_to_invoice')); return Redirect::to('invoices/'.$clone->public_id); } - + $count = $this->invoiceService->bulk($ids, $action); if ($count > 0) { diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index c59370647bb0..2982e04e3312 100644 --- a/app/Http/Controllers/RecurringInvoiceController.php +++ b/app/Http/Controllers/RecurringInvoiceController.php @@ -9,7 +9,7 @@ class RecurringInvoiceController extends BaseController public function __construct(InvoiceRepository $invoiceRepo) { - parent::__construct(); + //parent::__construct(); $this->invoiceRepo = $invoiceRepo; } @@ -29,7 +29,7 @@ class RecurringInvoiceController extends BaseController 'action' ]) ]; - + return response()->view('list', $data); } diff --git a/app/Http/Controllers/TaskApiController.php b/app/Http/Controllers/TaskApiController.php index a302944d2b62..674c7062d2d0 100644 --- a/app/Http/Controllers/TaskApiController.php +++ b/app/Http/Controllers/TaskApiController.php @@ -15,7 +15,7 @@ class TaskApiController extends BaseAPIController public function __construct(TaskRepository $taskRepo) { - parent::__construct(); + //parent::__construct(); $this->taskRepo = $taskRepo; } @@ -49,7 +49,7 @@ class TaskApiController extends BaseAPIController $tasks->whereHas('client', $filter); $paginator->whereHas('client', $filter); } - + $tasks = $tasks->orderBy('created_at', 'desc')->paginate(); $paginator = $paginator->paginate(); $transformer = new TaskTransformer(\Auth::user()->account, Input::get('serializer')); @@ -84,11 +84,11 @@ class TaskApiController extends BaseAPIController { $data = Input::all(); $taskId = isset($data['id']) ? $data['id'] : false; - + if (isset($data['client_id']) && $data['client_id']) { $data['client'] = $data['client_id']; } - + $task = $this->taskRepo->save($taskId, $data); $task = Task::scope($task->public_id)->with('client')->first(); diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php index 735689064a41..e09ed50b4ba5 100644 --- a/app/Http/Controllers/TaskController.php +++ b/app/Http/Controllers/TaskController.php @@ -25,7 +25,7 @@ class TaskController extends BaseController public function __construct(TaskRepository $taskRepo, InvoiceRepository $invoiceRepo, TaskService $taskService) { - parent::__construct(); + //parent::__construct(); $this->taskRepo = $taskRepo; $this->invoiceRepo = $invoiceRepo; diff --git a/app/Http/Controllers/TaxRateApiController.php b/app/Http/Controllers/TaxRateApiController.php index 7cacfcf8311b..e22213a1a564 100644 --- a/app/Http/Controllers/TaxRateApiController.php +++ b/app/Http/Controllers/TaxRateApiController.php @@ -16,7 +16,7 @@ class TaxRateApiController extends BaseAPIController public function __construct(TaxRateService $taxRateService, TaxRateRepository $taxRateRepo) { - parent::__construct(); + //parent::__construct(); $this->taxRateService = $taxRateService; $this->taxRateRepo = $taxRateRepo; diff --git a/app/Http/Controllers/TaxRateController.php b/app/Http/Controllers/TaxRateController.php index acda2602a4d0..223f7491092e 100644 --- a/app/Http/Controllers/TaxRateController.php +++ b/app/Http/Controllers/TaxRateController.php @@ -25,7 +25,7 @@ class TaxRateController extends BaseController public function __construct(TaxRateService $taxRateService, TaxRateRepository $taxRateRepo) { - parent::__construct(); + //parent::__construct(); $this->taxRateService = $taxRateService; $this->taxRateRepo = $taxRateRepo; @@ -76,9 +76,9 @@ class TaxRateController extends BaseController public function update(UpdateTaxRateRequest $request, $publicId) { $taxRate = TaxRate::scope($publicId)->firstOrFail(); - + $this->taxRateRepo->save($request->input(), $taxRate); - + Session::flash('message', trans('texts.updated_tax_rate')); return Redirect::to('settings/' . ACCOUNT_TAX_RATES); } diff --git a/app/Http/Controllers/TokenController.php b/app/Http/Controllers/TokenController.php index 604b94d576b3..8e255d6057be 100644 --- a/app/Http/Controllers/TokenController.php +++ b/app/Http/Controllers/TokenController.php @@ -20,7 +20,7 @@ class TokenController extends BaseController public function __construct(TokenService $tokenService) { - parent::__construct(); + //parent::__construct(); $this->tokenService = $tokenService; } diff --git a/app/Http/Controllers/UserApiController.php b/app/Http/Controllers/UserApiController.php index ee525c1dd9ae..e43cdc6dee7d 100644 --- a/app/Http/Controllers/UserApiController.php +++ b/app/Http/Controllers/UserApiController.php @@ -16,7 +16,7 @@ class UserApiController extends BaseAPIController public function __construct(UserService $userService, UserRepository $userRepo) { - parent::__construct(); + //parent::__construct(); $this->userService = $userService; $this->userRepo = $userRepo; @@ -42,7 +42,7 @@ class UserApiController extends BaseAPIController return $this->save($request); } */ - + public function update(UpdateUserRequest $request, $userPublicId) { /* diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 45549a1030dc..6c07f95646c6 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -30,7 +30,7 @@ class UserController extends BaseController public function __construct(AccountRepository $accountRepo, ContactMailer $contactMailer, UserMailer $userMailer, UserService $userService) { - parent::__construct(); + //parent::__construct(); $this->accountRepo = $accountRepo; $this->contactMailer = $contactMailer; @@ -130,7 +130,7 @@ class UserController extends BaseController { $action = Input::get('bulk_action'); $id = Input::get('bulk_public_id'); - + $user = User::where('account_id', '=', Auth::user()->account_id) ->where('public_id', '=', $id) ->withTrashed() @@ -219,7 +219,7 @@ class UserController extends BaseController Session::flash('message', $message); } - + return Redirect::to('settings/' . ACCOUNT_USER_MANAGEMENT); } @@ -243,7 +243,7 @@ class UserController extends BaseController public function confirm($code, TokenRepositoryInterface $tokenRepo) { $user = User::where('confirmation_code', '=', $code)->get()->first(); - + if ($user) { $notice_msg = trans('texts.security.confirmation'); @@ -294,7 +294,7 @@ class UserController extends BaseController return Redirect::to('/')->with('clearGuestKey', true); } */ - + public function changePassword() { // check the current password is correct @@ -326,7 +326,7 @@ class UserController extends BaseController $oldUserId = Auth::user()->id; $referer = Request::header('referer'); $account = $this->accountRepo->findUserAccounts($newUserId, $oldUserId); - + if ($account) { if ($account->hasUserId($newUserId) && $account->hasUserId($oldUserId)) { Auth::loginUsingId($newUserId); @@ -337,7 +337,7 @@ class UserController extends BaseController Session::put('_token', str_random(40)); } } - + return Redirect::to($referer); } diff --git a/app/Http/Controllers/VendorApiController.php b/app/Http/Controllers/VendorApiController.php index e2cec175bada..3c77231c6b7d 100644 --- a/app/Http/Controllers/VendorApiController.php +++ b/app/Http/Controllers/VendorApiController.php @@ -16,7 +16,7 @@ class VendorApiController extends BaseAPIController public function __construct(VendorRepository $vendorRepo) { - parent::__construct(); + //parent::__construct(); $this->vendorRepo = $vendorRepo; } @@ -83,7 +83,7 @@ class VendorApiController extends BaseAPIController public function store(CreateVendorRequest $request) { $vendor = $this->vendorRepo->save($request->input()); - + $vendor = Vendor::scope($vendor->public_id) ->with('country', 'vendorcontacts', 'industry', 'size', 'currency') ->first(); diff --git a/app/Http/Controllers/VendorController.php b/app/Http/Controllers/VendorController.php index 6a9bae5049dc..5d25f29215d6 100644 --- a/app/Http/Controllers/VendorController.php +++ b/app/Http/Controllers/VendorController.php @@ -33,7 +33,7 @@ class VendorController extends BaseController public function __construct(VendorRepository $vendorRepo, VendorService $vendorService) { - parent::__construct(); + //parent::__construct(); $this->vendorRepo = $vendorRepo; $this->vendorService = $vendorService; diff --git a/app/Http/routes.php b/app/Http/routes.php index c00eb8f8e91c..b6283c09fca1 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -1,6 +1,5 @@ 'signup', 'uses' => 'Auth\AuthController@getRegister')); -post('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@postRegister')); -get('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@getLoginWrapper')); -post('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@postLoginWrapper')); -get('/logout', array('as' => 'logout', 'uses' => 'Auth\AuthController@getLogoutWrapper')); -get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEmail')); -post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail')); -get('/password/reset/{token}', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset')); -post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset')); -get('/user/confirm/{code}', 'UserController@confirm'); +Route::get('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@getRegister')); +Route::post('/signup', array('as' => 'signup', 'uses' => 'Auth\AuthController@postRegister')); +Route::get('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@getLoginWrapper')); +Route::post('/login', array('as' => 'login', 'uses' => 'Auth\AuthController@postLoginWrapper')); +Route::get('/logout', array('as' => 'logout', 'uses' => 'Auth\AuthController@getLogoutWrapper')); +Route::get('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getEmail')); +Route::post('/forgot', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postEmail')); +Route::get('/password/reset/{token}', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@getReset')); +Route::post('/password/reset', array('as' => 'forgot', 'uses' => 'Auth\PasswordController@postReset')); +Route::get('/user/confirm/{code}', 'UserController@confirm'); if (Utils::isNinja()) { @@ -194,8 +193,8 @@ Route::group(['middleware' => 'auth'], function() { Route::get('api/credits/{client_id?}', array('as'=>'api.credits', 'uses'=>'CreditController@getDatatable')); Route::post('credits/bulk', 'CreditController@bulk'); - get('/resend_confirmation', 'AccountController@resendConfirmation'); - post('/update_setup', 'AppController@updateSetup'); + Route::get('/resend_confirmation', 'AccountController@resendConfirmation'); + Route::post('/update_setup', 'AppController@updateSetup'); // vendor diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php index 71905d000bc7..b57eded2fb7f 100644 --- a/app/Models/EntityModel.php +++ b/app/Models/EntityModel.php @@ -42,7 +42,7 @@ class EntityModel extends Eloquent { $className = get_called_class(); - return $className::scope($publicId)->withTrashed()->pluck('id'); + return $className::scope($publicId)->withTrashed()->value('id'); } public function getActivityKey() diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php index dc513c3e8822..87e3c82c0216 100644 --- a/app/Ninja/Mailers/ContactMailer.php +++ b/app/Ninja/Mailers/ContactMailer.php @@ -1,6 +1,6 @@ $invoice->invoice_number, '$link' => $invitation->getLink(), '$viewLink' => $invitation->getLink(), - '$viewButton' => HTML::emailViewButton($invitation->getLink(), $invoice->getEntityType()), + '$viewButton' => Form::emailViewButton($invitation->getLink(), $invoice->getEntityType()), '$paymentLink' => $invitation->getLink('payment'), - '$paymentButton' => HTML::emailPaymentButton($invitation->getLink('payment')), + '$paymentButton' => Form::emailPaymentButton($invitation->getLink('payment')), '$customClient1' => $account->custom_client_label1, '$customClient2' => $account->custom_client_label2, '$customInvoice1' => $account->custom_invoice_text_label1, @@ -260,7 +260,7 @@ class ContactMailer extends Mailer $camelType = Gateway::getPaymentTypeName($type); $type = Utils::toSnakeCase($camelType); $variables["\${$camelType}Link"] = $invitation->getLink() . "/{$type}"; - $variables["\${$camelType}Button"] = HTML::emailPaymentButton($invitation->getLink('payment') . "/{$type}"); + $variables["\${$camelType}Button"] = Form::emailPaymentButton($invitation->getLink('payment') . "/{$type}"); } $str = str_replace(array_keys($variables), array_values($variables), $template); diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php index a080dd89c3d9..15f5007251c3 100644 --- a/app/Ninja/Repositories/PaymentRepository.php +++ b/app/Ninja/Repositories/PaymentRepository.php @@ -116,7 +116,7 @@ class PaymentRepository extends BaseRepository public function save($input) { $publicId = isset($input['public_id']) ? $input['public_id'] : false; - + if ($publicId) { $payment = Payment::scope($publicId)->firstOrFail(); } else { @@ -136,7 +136,7 @@ class PaymentRepository extends BaseRepository } else { $payment->payment_date = date('Y-m-d'); } - + if (isset($input['transaction_reference'])) { $payment->transaction_reference = trim($input['transaction_reference']); } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 2d6689b55456..63598ce0cdd3 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,6 +4,7 @@ use Session; use Auth; use Utils; use HTML; +use Form; use URL; use Request; use Validator; @@ -18,18 +19,22 @@ class AppServiceProvider extends ServiceProvider { */ public function boot() { - HTML::macro('nav_link', function($url, $text, $url2 = '', $extra = '') { + Form::macro('image_data', function($imagePath) { + return 'data:image/jpeg;base64,' . base64_encode(file_get_contents($imagePath)); + }); + + Form::macro('nav_link', function($url, $text, $url2 = '', $extra = '') { $class = ( Request::is($url) || Request::is($url.'/*') || Request::is($url2.'/*') ) ? ' class="active"' : ''; $title = ucwords(trans("texts.$text")) . Utils::getProLabel($text); return ''.$title.''; }); - HTML::macro('tab_link', function($url, $text, $active = false) { + Form::macro('tab_link', function($url, $text, $active = false) { $class = $active ? ' class="active"' : ''; return ''.$text.''; }); - HTML::macro('menu_link', function($type) { + Form::macro('menu_link', function($type) { $types = $type.'s'; $Type = ucfirst($type); $Types = ucfirst($types); @@ -65,15 +70,11 @@ class AppServiceProvider extends ServiceProvider { return $str; }); - HTML::macro('image_data', function($imagePath) { - return 'data:image/jpeg;base64,' . base64_encode(file_get_contents($imagePath)); - }); - - HTML::macro('flatButton', function($label, $color) { + Form::macro('flatButton', function($label, $color) { return ''; }); - HTML::macro('emailViewButton', function($link = '#', $entityType = ENTITY_INVOICE) { + Form::macro('emailViewButton', function($link = '#', $entityType = ENTITY_INVOICE) { return view('partials.email_button') ->with([ 'link' => $link, @@ -83,7 +84,7 @@ class AppServiceProvider extends ServiceProvider { ->render(); }); - HTML::macro('emailPaymentButton', function($link = '#') { + Form::macro('emailPaymentButton', function($link = '#') { return view('partials.email_button') ->with([ 'link' => $link, @@ -93,7 +94,7 @@ class AppServiceProvider extends ServiceProvider { ->render(); }); - HTML::macro('breadcrumbs', function($status = false) { + Form::macro('breadcrumbs', function($status = false) { $str = ''; }); - + Validator::extend('positive', function($attribute, $value, $parameters) { return Utils::parseFloat($value) >= 0; }); diff --git a/app/Services/ActivityService.php b/app/Services/ActivityService.php index 8718f3ee72b9..d3b08b997189 100644 --- a/app/Services/ActivityService.php +++ b/app/Services/ActivityService.php @@ -38,11 +38,11 @@ class ActivityService extends BaseService 'activity_type_id', function ($model) { $data = [ - 'client' => link_to('/clients/' . $model->client_public_id, Utils::getClientDisplayName($model)), - 'user' => $model->is_system ? '' . trans('texts.system') . '' : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), - 'invoice' => $model->invoice ? link_to('/invoices/' . $model->invoice_public_id, $model->is_recurring ? trans('texts.recurring_invoice') : $model->invoice) : null, - 'quote' => $model->invoice ? link_to('/quotes/' . $model->invoice_public_id, $model->invoice) : null, - 'contact' => $model->contact_id ? link_to('/clients/' . $model->client_public_id, Utils::getClientDisplayName($model)) : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), + 'client' => link_to('/clients/' . $model->client_public_id, Utils::getClientDisplayName($model))->toHtml(), + 'user' => $model->is_system ? '' . trans('texts.system') . '' : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), + 'invoice' => $model->invoice ? link_to('/invoices/' . $model->invoice_public_id, $model->is_recurring ? trans('texts.recurring_invoice') : $model->invoice)->toHtml() : null, + 'quote' => $model->invoice ? link_to('/quotes/' . $model->invoice_public_id, $model->invoice)->toHtml() : null, + 'contact' => $model->contact_id ? link_to('/clients/' . $model->client_public_id, Utils::getClientDisplayName($model))->toHtml() : Utils::getPersonDisplayName($model->user_first_name, $model->user_last_name, $model->user_email), 'payment' => $model->payment ?: '', 'credit' => Utils::formatMoney($model->credit, $model->currency_id, $model->country_id) ]; diff --git a/app/Services/BankAccountService.php b/app/Services/BankAccountService.php index c1da419600a3..72aada6e3ff9 100644 --- a/app/Services/BankAccountService.php +++ b/app/Services/BankAccountService.php @@ -121,12 +121,12 @@ class BankAccountService extends BaseService if ($transaction->amount >= 0) { continue; } - + // if vendor has already been imported use current name $vendorName = trim(substr($transaction->name, 0, 20)); $key = strtolower($vendorName); $vendor = isset($vendorMap[$key]) ? $vendorMap[$key] : null; - + $transaction->vendor = $vendor ? $vendor->name : $this->prepareValue($vendorName); $transaction->info = $this->prepareValue(substr($transaction->name, 20)); $transaction->memo = $this->prepareValue($transaction->memo); @@ -228,7 +228,7 @@ class BankAccountService extends BaseService [ 'bank_name', function ($model) { - return link_to("bank_accounts/{$model->public_id}/edit", $model->bank_name); + return link_to("bank_accounts/{$model->public_id}/edit", $model->bank_name)->toHtml(); }, ], [ diff --git a/app/Services/BaseService.php b/app/Services/BaseService.php index 4705417e613e..ca1944d4e5ef 100644 --- a/app/Services/BaseService.php +++ b/app/Services/BaseService.php @@ -1,11 +1,11 @@ public_id}", $model->name ?: ''); + return link_to("clients/{$model->public_id}", $model->name ?: '')->toHtml(); } ], [ 'first_name', function ($model) { - return link_to("clients/{$model->public_id}", $model->first_name.' '.$model->last_name); + return link_to("clients/{$model->public_id}", $model->first_name.' '.$model->last_name)->toHtml(); } ], [ 'email', function ($model) { - return link_to("clients/{$model->public_id}", $model->email ?: ''); + return link_to("clients/{$model->public_id}", $model->email ?: '')->toHtml(); } ], [ diff --git a/app/Services/CreditService.php b/app/Services/CreditService.php index 87aa872c5dea..70c2d13048c2 100644 --- a/app/Services/CreditService.php +++ b/app/Services/CreditService.php @@ -40,7 +40,7 @@ class CreditService extends BaseService [ 'client_name', function ($model) { - return $model->client_public_id ? link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model)) : ''; + return $model->client_public_id ? link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml() : ''; }, ! $hideClient ], diff --git a/app/Services/DatatableService.php b/app/Services/DatatableService.php index 63fe47005bab..285efe717aef 100644 --- a/app/Services/DatatableService.php +++ b/app/Services/DatatableService.php @@ -1,5 +1,6 @@ expenseRepo->save($data); } @@ -63,7 +63,7 @@ class ExpenseService extends BaseService function ($model) { if ($model->vendor_public_id) { - return link_to("vendors/{$model->vendor_public_id}", $model->vendor_name); + return link_to("vendors/{$model->vendor_public_id}", $model->vendor_name)->toHtml(); } else { return ''; } @@ -74,7 +74,7 @@ class ExpenseService extends BaseService function ($model) { if ($model->client_public_id) { - return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model)); + return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml(); } else { return ''; } @@ -83,7 +83,7 @@ class ExpenseService extends BaseService [ 'expense_date', function ($model) { - return link_to("expenses/{$model->public_id}/edit", Utils::fromSqlDate($model->expense_date)); + return link_to("expenses/{$model->public_id}/edit", Utils::fromSqlDate($model->expense_date))->toHtml(); } ], [ @@ -92,7 +92,7 @@ class ExpenseService extends BaseService // show both the amount and the converted amount if ($model->exchange_rate != 1) { $converted = round($model->amount * $model->exchange_rate, 2); - return Utils::formatMoney($model->amount, $model->expense_currency_id) . ' | ' . + return Utils::formatMoney($model->amount, $model->expense_currency_id) . ' | ' . Utils::formatMoney($converted, $model->invoice_currency_id); } else { return Utils::formatMoney($model->amount, $model->expense_currency_id); @@ -178,7 +178,7 @@ class ExpenseService extends BaseService { return []; } - + private function getStatusLabel($invoiceId, $shouldBeInvoiced) { if ($invoiceId) { diff --git a/app/Services/InvoiceService.php b/app/Services/InvoiceService.php index dc712011d5d8..839c6fa6adf3 100644 --- a/app/Services/InvoiceService.php +++ b/app/Services/InvoiceService.php @@ -35,7 +35,7 @@ class InvoiceService extends BaseService } $invoice = $this->invoiceRepo->save($data); - + $client = $invoice->client; $client->load('contacts'); $sendInvoiceIds = []; @@ -45,7 +45,7 @@ class InvoiceService extends BaseService $sendInvoiceIds[] = $contact->id; } } - + foreach ($client->contacts as $contact) { $invitation = Invitation::scope()->whereContactId($contact->id)->whereInvoiceId($invoice->id)->first(); @@ -69,7 +69,7 @@ class InvoiceService extends BaseService if (!$invitation) { return $invoice; } - + foreach ($invoice->invitations as $invoiceInvitation) { if ($invitation->contact_id == $invoiceInvitation->contact_id) { return $invoiceInvitation->invitation_key; @@ -83,7 +83,7 @@ class InvoiceService extends BaseService if (!$quote->is_quote || $quote->quote_invoice_id) { return null; } - + if ($account->auto_convert_quote || ! $account->isPro()) { $invoice = $this->convertQuote($quote, $invitation); @@ -94,7 +94,7 @@ class InvoiceService extends BaseService $quote->markApproved(); event(new QuoteInvitationWasApproved($quote, null, $invitation)); - + foreach ($quote->invitations as $invoiceInvitation) { if ($invitation->contact_id == $invoiceInvitation->contact_id) { return $invoiceInvitation->invitation_key; @@ -117,13 +117,13 @@ class InvoiceService extends BaseService [ 'invoice_number', function ($model) use ($entityType) { - return link_to("{$entityType}s/{$model->public_id}/edit", $model->invoice_number, ['class' => Utils::getEntityRowClass($model)]); + return link_to("{$entityType}s/{$model->public_id}/edit", $model->invoice_number, ['class' => Utils::getEntityRowClass($model)])->toHtml(); } ], [ 'client_name', function ($model) { - return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model)); + return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml(); }, ! $hideClient ], @@ -160,7 +160,7 @@ class InvoiceService extends BaseService [ 'invoice_status_name', function ($model) { - return $model->quote_invoice_id ? link_to("invoices/{$model->quote_invoice_id}/edit", trans('texts.converted')) : self::getStatusLabel($model); + return $model->quote_invoice_id ? link_to("invoices/{$model->quote_invoice_id}/edit", trans('texts.converted'))->toHtml() : self::getStatusLabel($model); } ] ]; @@ -266,5 +266,5 @@ class InvoiceService extends BaseService } return "

$label

"; } - + } diff --git a/app/Services/PaymentService.php b/app/Services/PaymentService.php index 66e94e43dced..83429f5b2068 100644 --- a/app/Services/PaymentService.php +++ b/app/Services/PaymentService.php @@ -202,7 +202,7 @@ class PaymentService extends BaseService if ($response->isRedirect()) { $token = $response->getTransactionReference(); } - + Session::set($invitation->id . 'payment_type', PAYMENT_TYPE_CREDIT_CARD); return $token; @@ -273,7 +273,7 @@ class PaymentService extends BaseService // submit purchase/get response $response = $gateway->purchase($details)->send(); - + if ($response->isSuccessful()) { $ref = $response->getTransactionReference(); return $this->createPayment($invitation, $accountGateway, $ref); @@ -295,13 +295,13 @@ class PaymentService extends BaseService [ 'invoice_number', function ($model) { - return link_to("invoices/{$model->invoice_public_id}/edit", $model->invoice_number, ['class' => Utils::getEntityRowClass($model)]); + return link_to("invoices/{$model->invoice_public_id}/edit", $model->invoice_number, ['class' => Utils::getEntityRowClass($model)])->toHtml(); } ], [ 'client_name', function ($model) { - return $model->client_public_id ? link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model)) : ''; + return $model->client_public_id ? link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml() : ''; }, ! $hideClient ], diff --git a/app/Services/PaymentTermService.php b/app/Services/PaymentTermService.php index bfcf670475b9..1371d20c2c43 100644 --- a/app/Services/PaymentTermService.php +++ b/app/Services/PaymentTermService.php @@ -34,7 +34,7 @@ class PaymentTermService extends BaseService [ 'name', function ($model) { - return link_to("payment_terms/{$model->public_id}/edit", $model->name); + return link_to("payment_terms/{$model->public_id}/edit", $model->name)->toHtml(); } ], [ diff --git a/app/Services/ProductService.php b/app/Services/ProductService.php index a8307f0104cd..f8ec6e1131d5 100644 --- a/app/Services/ProductService.php +++ b/app/Services/ProductService.php @@ -44,7 +44,7 @@ class ProductService extends BaseService [ 'product_key', function ($model) { - return link_to('products/'.$model->public_id.'/edit', $model->product_key); + return link_to('products/'.$model->public_id.'/edit', $model->product_key)->toHtml(); } ], [ diff --git a/app/Services/RecurringInvoiceService.php b/app/Services/RecurringInvoiceService.php index 9adb344a137c..bd23d2a5e048 100644 --- a/app/Services/RecurringInvoiceService.php +++ b/app/Services/RecurringInvoiceService.php @@ -28,13 +28,13 @@ class RecurringInvoiceService extends BaseService [ 'frequency', function ($model) { - return link_to("invoices/{$model->public_id}", $model->frequency); + return link_to("invoices/{$model->public_id}", $model->frequency)->toHtml(); } ], [ 'client_name', function ($model) { - return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model)); + return link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml(); }, ! $hideClient ], diff --git a/app/Services/TaskService.php b/app/Services/TaskService.php index 5eded5db6e26..59f8fd95feb0 100644 --- a/app/Services/TaskService.php +++ b/app/Services/TaskService.php @@ -42,14 +42,14 @@ class TaskService extends BaseService [ 'client_name', function ($model) { - return $model->client_public_id ? link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model)) : ''; + return $model->client_public_id ? link_to("clients/{$model->client_public_id}", Utils::getClientDisplayName($model))->toHtml() : ''; }, ! $hideClient ], [ 'created_at', function ($model) { - return link_to("tasks/{$model->public_id}/edit", Task::calcStartTime($model)); + return link_to("tasks/{$model->public_id}/edit", Task::calcStartTime($model))->toHtml(); } ], [ diff --git a/app/Services/TaxRateService.php b/app/Services/TaxRateService.php index 38d2867f275c..db5b041395f0 100644 --- a/app/Services/TaxRateService.php +++ b/app/Services/TaxRateService.php @@ -41,7 +41,7 @@ class TaxRateService extends BaseService [ 'name', function ($model) { - return link_to("tax_rates/{$model->public_id}/edit", $model->name); + return link_to("tax_rates/{$model->public_id}/edit", $model->name)->toHtml(); } ], [ diff --git a/app/Services/TokenService.php b/app/Services/TokenService.php index 5a687a0552aa..8b428f0eb199 100644 --- a/app/Services/TokenService.php +++ b/app/Services/TokenService.php @@ -40,7 +40,7 @@ class TokenService extends BaseService [ 'name', function ($model) { - return link_to("tokens/{$model->public_id}/edit", $model->name); + return link_to("tokens/{$model->public_id}/edit", $model->name)->toHtml(); } ], [ diff --git a/app/Services/UserService.php b/app/Services/UserService.php index a8b9bc569102..fcc022003658 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -40,7 +40,7 @@ class UserService extends BaseService [ 'first_name', function ($model) { - return $model->public_id ? link_to('users/'.$model->public_id.'/edit', $model->first_name.' '.$model->last_name) : ($model->first_name.' '.$model->last_name); + return $model->public_id ? link_to('users/'.$model->public_id.'/edit', $model->first_name.' '.$model->last_name)->toHtml() : ($model->first_name.' '.$model->last_name); } ], [ diff --git a/app/Services/VendorService.php b/app/Services/VendorService.php index 155443c8e089..cd2dcf8d1844 100644 --- a/app/Services/VendorService.php +++ b/app/Services/VendorService.php @@ -46,7 +46,7 @@ class VendorService extends BaseService [ 'name', function ($model) { - return link_to("vendors/{$model->public_id}", $model->name ?: ''); + return link_to("vendors/{$model->public_id}", $model->name ?: '')->toHtml(); } ], [ @@ -64,7 +64,7 @@ class VendorService extends BaseService [ 'email', function ($model) { - return link_to("vendors/{$model->public_id}", $model->email ?: ''); + return link_to("vendors/{$model->public_id}", $model->email ?: '')->toHtml(); } ], [ diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100644 new mode 100755 diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php old mode 100644 new mode 100755 diff --git a/bootstrap/environment.php b/bootstrap/environment.php old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json index 599bb86582ff..45e6e1872640 100644 --- a/composer.json +++ b/composer.json @@ -15,11 +15,14 @@ "omnipay/2checkout": "dev-master#e9c079c2dde0d7ba461903b3b7bd5caf6dee1248", "omnipay/gocardless": "dev-master", "omnipay/stripe": "2.3.0", - "laravel/framework": "5.1.*", + "laravel/framework": "5.2.*", + "laravelcollective/html": "5.2.*", + "laravelcollective/bus": "5.2.*", + "symfony/css-selector": "~3.0", "patricktalmadge/bootstrapper": "5.5.x", "anahkiasen/former": "4.0.*@dev", - "barryvdh/laravel-debugbar": "~2.0.2", - "chumper/datatable": "dev-develop#7fa47cb", + "barryvdh/laravel-debugbar": "~2.0", + "chumper/datatable": "dev-develop#04ef2bf", "omnipay/omnipay": "~2.3.0", "intervention/image": "dev-master", "webpatser/laravel-countries": "dev-master", @@ -35,7 +38,6 @@ "alfaproject/omnipay-skrill": "dev-master", "omnipay/bitpay": "dev-master", "guzzlehttp/guzzle": "~6.0", - "laravelcollective/html": "~5.0", "wildbit/laravel-postmark-provider": "2.0", "Dwolla/omnipay-dwolla": "dev-master", "laravel/socialite": "~2.0", @@ -71,7 +73,8 @@ "phpspec/phpspec": "~2.1", "codeception/codeception": "*", "codeception/c3": "~2.0", - "fzaninotto/faker": "^1.5" + "fzaninotto/faker": "^1.5", + "symfony/dom-crawler": "~3.0" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 01454a6d581e..61af58eb88b9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "334783c40534b498757994eefba6b9d2", - "content-hash": "be4521507359c58fe19eb34102e78202", + "hash": "e5e8524886bd38794a15e406acc3745a", + "content-hash": "6b3f343959ba3f330c425325574dfe28", "packages": [ { "name": "agmscode/omnipay-agms", @@ -323,28 +323,28 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v2.0.6", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "23672cbbe78278ff1fdb258caa0b1de7b5d0bc0c" + "reference": "13b7058d2120c8d5af7f1ada21b7c44dd87b666a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/23672cbbe78278ff1fdb258caa0b1de7b5d0bc0c", - "reference": "23672cbbe78278ff1fdb258caa0b1de7b5d0bc0c", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/13b7058d2120c8d5af7f1ada21b7c44dd87b666a", + "reference": "13b7058d2120c8d5af7f1ada21b7c44dd87b666a", "shasum": "" }, "require": { - "illuminate/support": "~5.0.17|5.1.*", - "maximebf/debugbar": "~1.10.2", - "php": ">=5.4.0", - "symfony/finder": "~2.6" + "illuminate/support": "5.1.*|5.2.*", + "maximebf/debugbar": "~1.11.0", + "php": ">=5.5.9", + "symfony/finder": "~2.7|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } }, "autoload": { @@ -373,7 +373,7 @@ "profiler", "webprofiler" ], - "time": "2015-09-09 11:39:27" + "time": "2016-02-17 08:32:21" }, { "name": "barryvdh/laravel-ide-helper", @@ -381,12 +381,12 @@ "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-ide-helper.git", - "reference": "4b8ba85b346fc9962521661aa639911535b2bb3f" + "reference": "19553f63e4635480363ff2254350075f285fbbc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/4b8ba85b346fc9962521661aa639911535b2bb3f", - "reference": "4b8ba85b346fc9962521661aa639911535b2bb3f", + "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/19553f63e4635480363ff2254350075f285fbbc5", + "reference": "19553f63e4635480363ff2254350075f285fbbc5", "shasum": "" }, "require": { @@ -394,7 +394,7 @@ "illuminate/filesystem": "5.0.x|5.1.x|5.2.x", "illuminate/support": "5.0.x|5.1.x|5.2.x", "php": ">=5.4.0", - "phpdocumentor/reflection-docblock": "2.0.4", + "phpdocumentor/reflection-docblock": "^2.0.4", "symfony/class-loader": "~2.3|~3.0" }, "require-dev": { @@ -436,7 +436,7 @@ "phpstorm", "sublime" ], - "time": "2016-01-28 08:19:58" + "time": "2016-03-02 10:03:09" }, { "name": "cardgate/omnipay-cardgate", @@ -533,12 +533,12 @@ "source": { "type": "git", "url": "https://github.com/Chumper/Datatable.git", - "reference": "7fa47cb" + "reference": "04ef2bf" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/Chumper/Datatable/zipball/546e8768d7987b0d9a8501e67432309349ef5504", - "reference": "7fa47cb", + "reference": "04ef2bf", "shasum": "" }, "require": { @@ -874,62 +874,6 @@ "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "time": "2014-12-30 15:22:37" }, - { - "name": "danielstjules/stringy", - "version": "1.10.0", - "source": { - "type": "git", - "url": "https://github.com/danielstjules/Stringy.git", - "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/danielstjules/Stringy/zipball/4749c205db47ee5b32e8d1adf6d9aff8db6caf3b", - "reference": "4749c205db47ee5b32e8d1adf6d9aff8db6caf3b", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Stringy\\": "src/" - }, - "files": [ - "src/Create.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Daniel St. Jules", - "email": "danielst.jules@gmail.com", - "homepage": "http://www.danielstjules.com" - } - ], - "description": "A string manipulation library with multibyte support", - "homepage": "https://github.com/danielstjules/Stringy", - "keywords": [ - "UTF", - "helpers", - "manipulation", - "methods", - "multibyte", - "string", - "utf-8", - "utility", - "utils" - ], - "time": "2015-07-23 00:54:12" - }, { "name": "delatbabel/omnipay-fatzebra", "version": "dev-master", @@ -1902,22 +1846,22 @@ }, { "name": "guzzle/guzzle", - "version": "v3.9.3", + "version": "v3.8.1", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/4de0618a01b34aa1c8c33a3f13f396dcd3882eba", + "reference": "4de0618a01b34aa1c8c33a3f13f396dcd3882eba", "shasum": "" }, "require": { "ext-curl": "*", "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" + "symfony/event-dispatcher": ">=2.1" }, "replace": { "guzzle/batch": "self.version", @@ -1944,21 +1888,18 @@ "guzzle/stream": "self.version" }, "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", + "doctrine/cache": "*", + "monolog/monolog": "1.*", "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" - }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + "psr/log": "1.0.*", + "symfony/class-loader": "*", + "zendframework/zend-cache": "<2.3", + "zendframework/zend-log": "<2.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.9-dev" + "dev-master": "3.8-dev" } }, "autoload": { @@ -1982,7 +1923,7 @@ "homepage": "https://github.com/guzzle/guzzle/contributors" } ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", + "description": "Guzzle is a PHP HTTP client library and framework for building RESTful web service clients", "homepage": "http://guzzlephp.org/", "keywords": [ "client", @@ -1993,7 +1934,7 @@ "rest", "web service" ], - "time": "2015-03-18 18:23:50" + "time": "2014-01-28 22:29:15" }, { "name": "guzzlehttp/guzzle", @@ -2329,6 +2270,48 @@ ], "time": "2016-02-26 18:18:19" }, + { + "name": "ircmaxell/password-compat", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/ircmaxell/password_compat.git", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c", + "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "4.*" + }, + "type": "library", + "autoload": { + "files": [ + "lib/password.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anthony Ferrara", + "email": "ircmaxell@php.net", + "homepage": "http://blog.ircmaxell.com" + } + ], + "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash", + "homepage": "https://github.com/ircmaxell/password_compat", + "keywords": [ + "hashing", + "password" + ], + "time": "2014-11-20 16:49:30" + }, { "name": "jakub-onderka/php-console-color", "version": "0.1", @@ -2711,45 +2694,43 @@ }, { "name": "laravel/framework", - "version": "v5.1.31", + "version": "v5.2.22", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "d899fbda59bf3ffcde11a9b443c01043b76f40b3" + "reference": "aec1b7cb9ec0bac0107361a3730cac9b6f945ef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/d899fbda59bf3ffcde11a9b443c01043b76f40b3", - "reference": "d899fbda59bf3ffcde11a9b443c01043b76f40b3", + "url": "https://api.github.com/repos/laravel/framework/zipball/aec1b7cb9ec0bac0107361a3730cac9b6f945ef4", + "reference": "aec1b7cb9ec0bac0107361a3730cac9b6f945ef4", "shasum": "" }, "require": { - "classpreloader/classpreloader": "~2.0|~3.0", - "danielstjules/stringy": "~1.8", + "classpreloader/classpreloader": "~3.0", "doctrine/inflector": "~1.0", "ext-mbstring": "*", "ext-openssl": "*", - "jeremeamia/superclosure": "~2.0", + "jeremeamia/superclosure": "~2.2", "league/flysystem": "~1.0", "monolog/monolog": "~1.11", "mtdowling/cron-expression": "~1.0", - "nesbot/carbon": "~1.19", + "nesbot/carbon": "~1.20", "paragonie/random_compat": "~1.1", "php": ">=5.5.9", "psy/psysh": "0.7.*", "swiftmailer/swiftmailer": "~5.1", - "symfony/console": "2.7.*", - "symfony/css-selector": "2.7.*", - "symfony/debug": "2.7.*", - "symfony/dom-crawler": "2.7.*", - "symfony/finder": "2.7.*", - "symfony/http-foundation": "2.7.*", - "symfony/http-kernel": "2.7.*", - "symfony/process": "2.7.*", - "symfony/routing": "2.7.*", - "symfony/translation": "2.7.*", - "symfony/var-dumper": "2.7.*", - "vlucas/phpdotenv": "~1.0" + "symfony/console": "2.8.*|3.0.*", + "symfony/debug": "2.8.*|3.0.*", + "symfony/finder": "2.8.*|3.0.*", + "symfony/http-foundation": "2.8.*|3.0.*", + "symfony/http-kernel": "2.8.*|3.0.*", + "symfony/polyfill-php56": "~1.0", + "symfony/process": "2.8.*|3.0.*", + "symfony/routing": "2.8.*|3.0.*", + "symfony/translation": "2.8.*|3.0.*", + "symfony/var-dumper": "2.8.*|3.0.*", + "vlucas/phpdotenv": "~2.2" }, "replace": { "illuminate/auth": "self.version", @@ -2783,28 +2764,30 @@ }, "require-dev": { "aws/aws-sdk-php": "~3.0", - "iron-io/iron_mq": "~2.0", "mockery/mockery": "~0.9.2", "pda/pheanstalk": "~3.0", - "phpunit/phpunit": "~4.0", - "predis/predis": "~1.0" + "phpunit/phpunit": "~4.1", + "predis/predis": "~1.0", + "symfony/css-selector": "2.8.*|3.0.*", + "symfony/dom-crawler": "2.8.*|3.0.*" }, "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).", "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).", - "iron-io/iron_mq": "Required to use the iron queue driver (~2.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).", "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)." + "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 (2.8.*|3.0.*).", + "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -2835,7 +2818,7 @@ "framework", "laravel" ], - "time": "2016-02-24 15:13:21" + "time": "2016-02-27 22:09:19" }, { "name": "laravel/socialite", @@ -2892,24 +2875,24 @@ "time": "2015-10-16 15:39:46" }, { - "name": "laravelcollective/html", - "version": "v5.1.9", + "name": "laravelcollective/bus", + "version": "v5.2", "source": { "type": "git", - "url": "https://github.com/LaravelCollective/html.git", - "reference": "f62269629b2a1093039733517bd7e75b3f98dffb" + "url": "https://github.com/LaravelCollective/bus.git", + "reference": "e48b4d44d49f820e1b85ff16b9402e01c770c83a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/f62269629b2a1093039733517bd7e75b3f98dffb", - "reference": "f62269629b2a1093039733517bd7e75b3f98dffb", + "url": "https://api.github.com/repos/LaravelCollective/bus/zipball/e48b4d44d49f820e1b85ff16b9402e01c770c83a", + "reference": "e48b4d44d49f820e1b85ff16b9402e01c770c83a", "shasum": "" }, "require": { - "illuminate/http": "5.1.*", - "illuminate/routing": "5.1.*", - "illuminate/session": "5.1.*", - "illuminate/support": "5.1.*", + "illuminate/container": "5.2.*", + "illuminate/contracts": "5.2.*", + "illuminate/pipeline": "5.2.*", + "illuminate/support": "5.2.*", "php": ">=5.5.9" }, "require-dev": { @@ -2917,6 +2900,53 @@ "phpunit/phpunit": "~4.0" }, "type": "library", + "autoload": { + "psr-4": { + "Collective\\Bus\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylorotwell@gmail.com" + } + ], + "description": "The Laravel Bus (5.1) package for use in Laravel 5.2.", + "homepage": "http://laravelcollective.com", + "time": "2015-12-23 07:43:33" + }, + { + "name": "laravelcollective/html", + "version": "v5.2.4", + "source": { + "type": "git", + "url": "https://github.com/LaravelCollective/html.git", + "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/3a312d39ffe37da0f57b602618b61fd07c1fcec5", + "reference": "3a312d39ffe37da0f57b602618b61fd07c1fcec5", + "shasum": "" + }, + "require": { + "illuminate/http": "5.2.*", + "illuminate/routing": "5.2.*", + "illuminate/session": "5.2.*", + "illuminate/support": "5.2.*", + "illuminate/view": "5.2.*", + "php": ">=5.5.9" + }, + "require-dev": { + "illuminate/database": "5.2.*", + "mockery/mockery": "~0.9", + "phpunit/phpunit": "~4.0" + }, + "type": "library", "autoload": { "psr-4": { "Collective\\Html\\": "src/" @@ -2939,7 +2969,9 @@ "email": "adam@laravelcollective.com" } ], - "time": "2015-11-28 08:27:09" + "description": "HTML and Form Builders for the Laravel Framework", + "homepage": "http://laravelcollective.com", + "time": "2016-01-27 22:29:54" }, { "name": "league/flysystem", @@ -3255,16 +3287,16 @@ }, { "name": "maatwebsite/excel", - "version": "v2.1.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "4c89f4cb1d30090a256530e1dce0ed3765eca7fa" + "reference": "aae17dbd6f39606cf8f588359a7a79438ab5aa53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/4c89f4cb1d30090a256530e1dce0ed3765eca7fa", - "reference": "4c89f4cb1d30090a256530e1dce0ed3765eca7fa", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/aae17dbd6f39606cf8f588359a7a79438ab5aa53", + "reference": "aae17dbd6f39606cf8f588359a7a79438ab5aa53", "shasum": "" }, "require": { @@ -3319,29 +3351,29 @@ "import", "laravel" ], - "time": "2015-12-15 20:14:50" + "time": "2016-03-01 17:45:44" }, { "name": "maximebf/debugbar", - "version": "v1.10.5", + "version": "v1.11.1", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636" + "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e53e8a28284b69dd223c9f5ee8957befd72636", - "reference": "30e53e8a28284b69dd223c9f5ee8957befd72636", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d9302891c1f0a0ac5a4f66725163a00537c6359f", + "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f", "shasum": "" }, "require": { "php": ">=5.3.0", - "psr/log": "~1.0", - "symfony/var-dumper": "~2.6" + "psr/log": "^1.0", + "symfony/var-dumper": "^2.6|^3.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.0|^5.0" }, "suggest": { "kriswallsmith/assetic": "The best way to manage assets", @@ -3351,12 +3383,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-master": "1.11-dev" } }, "autoload": { - "psr-0": { - "DebugBar": "src/" + "psr-4": { + "DebugBar\\": "src/DebugBar/" } }, "notification-url": "https://packagist.org/downloads/", @@ -3368,14 +3400,19 @@ "name": "Maxime Bouroumeau-Fuseau", "email": "maxime.bouroumeau@gmail.com", "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" } ], "description": "Debug bar in the browser for php application", "homepage": "https://github.com/maximebf/php-debugbar", "keywords": [ - "debug" + "debug", + "debugbar" ], - "time": "2015-10-19 20:35:12" + "time": "2016-01-22 12:22:23" }, { "name": "meebio/omnipay-creditcall", @@ -3550,16 +3587,16 @@ }, { "name": "monolog/monolog", - "version": "1.17.2", + "version": "1.18.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24" + "reference": "e19b764b5c855580e8ffa7e615f72c10fd2f99cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bee7f0dc9c3e0b69a6039697533dca1e845c8c24", - "reference": "bee7f0dc9c3e0b69a6039697533dca1e845c8c24", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/e19b764b5c855580e8ffa7e615f72c10fd2f99cc", + "reference": "e19b764b5c855580e8ffa7e615f72c10fd2f99cc", "shasum": "" }, "require": { @@ -3588,6 +3625,7 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", "php-console/php-console": "Allow sending log messages to Google Chrome", "raven/raven": "Allow sending log messages to a Sentry server", "rollbar/rollbar": "Allow sending log messages to Rollbar", @@ -3597,7 +3635,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.16.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -3623,7 +3661,7 @@ "logging", "psr-3" ], - "time": "2015-10-14 12:51:02" + "time": "2016-03-01 18:00:40" }, { "name": "mtdowling/cron-expression", @@ -4117,20 +4155,20 @@ }, { "name": "omnipay/common", - "version": "v2.3.4", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/thephpleague/omnipay-common.git", - "reference": "fcd5a606713d11536c89315a5ae02d965a737c21" + "reference": "e4c54a314a2529c1008ad3f77e9eef26ed1f311b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/fcd5a606713d11536c89315a5ae02d965a737c21", - "reference": "fcd5a606713d11536c89315a5ae02d965a737c21", + "url": "https://api.github.com/repos/thephpleague/omnipay-common/zipball/e4c54a314a2529c1008ad3f77e9eef26ed1f311b", + "reference": "e4c54a314a2529c1008ad3f77e9eef26ed1f311b", "shasum": "" }, "require": { - "guzzle/guzzle": "~3.9", + "guzzle/http": "~3.1", "php": ">=5.3.2", "symfony/http-foundation": "~2.1" }, @@ -4229,7 +4267,7 @@ "payment", "purchase" ], - "time": "2015-03-30 14:34:46" + "time": "2015-01-11 04:54:29" }, { "name": "omnipay/dummy", @@ -5986,37 +6024,35 @@ }, { "name": "sly/notification-pusher", - "version": "v2.2.12", + "version": "v2.2.2", "source": { "type": "git", "url": "https://github.com/Ph3nol/NotificationPusher.git", - "reference": "f9a99edb4e26254baf1f7fb1354aa5a3f2c3b0ae" + "reference": "6112841c4b679bc4f6cf01f6cf655e24794bc670" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ph3nol/NotificationPusher/zipball/f9a99edb4e26254baf1f7fb1354aa5a3f2c3b0ae", - "reference": "f9a99edb4e26254baf1f7fb1354aa5a3f2c3b0ae", + "url": "https://api.github.com/repos/Ph3nol/NotificationPusher/zipball/6112841c4b679bc4f6cf01f6cf655e24794bc670", + "reference": "6112841c4b679bc4f6cf01f6cf655e24794bc670", "shasum": "" }, "require": { - "doctrine/inflector": "~1.0", - "php": ">=5.5", - "symfony/console": "~2.3", - "symfony/options-resolver": "~2.3", - "symfony/process": "~2.3", - "zendframework/zendservice-apple-apns": "^1.1.0", + "php": ">=5.3.2", + "symfony/console": ">=2.3", + "symfony/options-resolver": ">=2.3", + "symfony/process": ">=2.3", + "zendframework/zendservice-apple-apns": "1.*", "zendframework/zendservice-google-gcm": "1.*" }, "require-dev": { "atoum/atoum": "dev-master" }, - "bin": [ - "np" - ], "type": "standalone", "autoload": { "psr-0": { - "Sly": "src/" + "Sly": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -6046,7 +6082,7 @@ "push", "pusher" ], - "time": "2015-10-01 07:56:41" + "time": "2013-12-08 20:35:03" }, { "name": "softcommerce/omnipay-paytrace", @@ -6211,25 +6247,26 @@ }, { "name": "symfony/console", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "ee91ec301cd88ee38ab14505025fe94bbc19a9c1" + "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ee91ec301cd88ee38ab14505025fe94bbc19a9c1", - "reference": "ee91ec301cd88ee38ab14505025fe94bbc19a9c1", + "url": "https://api.github.com/repos/symfony/console/zipball/2ed5e2706ce92313d120b8fe50d1063bcfd12e04", + "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" }, "suggest": { "psr/log": "For using the console logger", @@ -6239,7 +6276,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6266,29 +6303,29 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:19:47" + "time": "2016-02-28 16:24:34" }, { "name": "symfony/css-selector", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "5377825bb6496514f63603af417fa07afaa12357" + "reference": "6605602690578496091ac20ec7a5cbd160d4dff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/5377825bb6496514f63603af417fa07afaa12357", - "reference": "5377825bb6496514f63603af417fa07afaa12357", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/6605602690578496091ac20ec7a5cbd160d4dff4", + "reference": "6605602690578496091ac20ec7a5cbd160d4dff4", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6319,37 +6356,37 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2016-01-27 05:09:39" + "time": "2016-01-27 05:14:46" }, { "name": "symfony/debug", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "e96f1ff28e2b8b2f3b906245b18d5e6a52e73648" + "reference": "29606049ced1ec715475f88d1bbe587252a3476e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/e96f1ff28e2b8b2f3b906245b18d5e6a52e73648", - "reference": "e96f1ff28e2b8b2f3b906245b18d5e6a52e73648", + "url": "https://api.github.com/repos/symfony/debug/zipball/29606049ced1ec715475f88d1bbe587252a3476e", + "reference": "29606049ced1ec715475f88d1bbe587252a3476e", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": ">=5.5.9", "psr/log": "~1.0" }, "conflict": { "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" }, "require-dev": { - "symfony/class-loader": "~2.2", - "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2" + "symfony/class-loader": "~2.8|~3.0", + "symfony/http-kernel": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6376,86 +6413,31 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-01-25 23:34:19" - }, - { - "name": "symfony/dom-crawler", - "version": "v2.7.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/dom-crawler.git", - "reference": "c7a6dfd2720581a61d06c04489e9b3df1e4f7eaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7a6dfd2720581a61d06c04489e9b3df1e4f7eaf", - "reference": "c7a6dfd2720581a61d06c04489e9b3df1e4f7eaf", - "shasum": "" - }, - "require": { - "php": ">=5.3.9" - }, - "require-dev": { - "symfony/css-selector": "~2.3" - }, - "suggest": { - "symfony/css-selector": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.7-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": "2016-02-28 16:19:47" + "time": "2016-01-27 05:14:46" }, { "name": "symfony/event-dispatcher", - "version": "v2.8.3", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3" + "reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/78c468665c9568c3faaa9c416a7134308f2d85c3", - "reference": "78c468665c9568c3faaa9c416a7134308f2d85c3", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa", + "reference": "4dd5df31a28c0f82b41cb1e1599b74b5dcdbdafa", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" }, "suggest": { "symfony/dependency-injection": "", @@ -6464,7 +6446,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6491,29 +6473,29 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-01-27 05:14:19" + "time": "2016-01-27 05:14:46" }, { "name": "symfony/finder", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "addcb70b33affbca4f3979b0d000259b63dd6711" + "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/addcb70b33affbca4f3979b0d000259b63dd6711", - "reference": "addcb70b33affbca4f3979b0d000259b63dd6711", + "url": "https://api.github.com/repos/symfony/finder/zipball/623bda0abd9aa29e529c8e9c08b3b84171914723", + "reference": "623bda0abd9aa29e529c8e9c08b3b84171914723", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6540,41 +6522,40 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-02-22 16:12:29" + "time": "2016-01-27 05:14:46" }, { "name": "symfony/http-foundation", - "version": "v2.7.10", + "version": "v2.8.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6aeb70d26da8f30753111b3f9cf47eb0421c0735" + "reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6aeb70d26da8f30753111b3f9cf47eb0421c0735", - "reference": "6aeb70d26da8f30753111b3f9cf47eb0421c0735", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b", + "reference": "6f4e41c41e7d352ed9adf71ff6f2ec1756490a1b", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-php54": "~1.0", + "symfony/polyfill-php55": "~1.0" }, "require-dev": { - "symfony/expression-language": "~2.4" + "symfony/expression-language": "~2.4|~3.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\HttpFoundation\\": "" }, - "classmap": [ - "Resources/stubs" - ], "exclude-from-classmap": [ "/Tests/" ] @@ -6595,48 +6576,48 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-02-28 16:19:47" + "time": "2016-02-28 16:20:50" }, { "name": "symfony/http-kernel", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "11082f03c03e17dd2ca9c149988b229e04829fdc" + "reference": "59c0a1972e9aad87b7a56bbe1ccee26b7535a0db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/11082f03c03e17dd2ca9c149988b229e04829fdc", - "reference": "11082f03c03e17dd2ca9c149988b229e04829fdc", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/59c0a1972e9aad87b7a56bbe1ccee26b7535a0db", + "reference": "59c0a1972e9aad87b7a56bbe1ccee26b7535a0db", "shasum": "" }, "require": { - "php": ">=5.3.9", + "php": ">=5.5.9", "psr/log": "~1.0", - "symfony/debug": "~2.6,>=2.6.2", - "symfony/event-dispatcher": "~2.6,>=2.6.7", - "symfony/http-foundation": "~2.5,>=2.5.4" + "symfony/debug": "~2.8|~3.0", + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/http-foundation": "~2.8|~3.0" }, "conflict": { - "symfony/config": "<2.7" + "symfony/config": "<2.8" }, "require-dev": { - "symfony/browser-kit": "~2.3", - "symfony/class-loader": "~2.1", - "symfony/config": "~2.7", - "symfony/console": "~2.3", - "symfony/css-selector": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.2", - "symfony/dom-crawler": "~2.0,>=2.0.5", - "symfony/expression-language": "~2.4", - "symfony/finder": "~2.0,>=2.0.5", - "symfony/process": "~2.0,>=2.0.5", - "symfony/routing": "~2.2", - "symfony/stopwatch": "~2.3", - "symfony/templating": "~2.2", - "symfony/translation": "~2.0,>=2.0.5", - "symfony/var-dumper": "~2.6" + "symfony/browser-kit": "~2.8|~3.0", + "symfony/class-loader": "~2.8|~3.0", + "symfony/config": "~2.8|~3.0", + "symfony/console": "~2.8|~3.0", + "symfony/css-selector": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/dom-crawler": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/finder": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0", + "symfony/routing": "~2.8|~3.0", + "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" }, "suggest": { "symfony/browser-kit": "", @@ -6650,7 +6631,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6677,29 +6658,29 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-02-28 20:37:08" + "time": "2016-02-28 21:33:13" }, { "name": "symfony/options-resolver", - "version": "v2.8.3", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "d1e6e9182d9e5af6367bf85175e708f8b4a828c0" + "reference": "bc7ee3ef3905f7c21fbed4e921cb39d6518b1300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/d1e6e9182d9e5af6367bf85175e708f8b4a828c0", - "reference": "d1e6e9182d9e5af6367bf85175e708f8b4a828c0", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/bc7ee3ef3905f7c21fbed4e921cb39d6518b1300", + "reference": "bc7ee3ef3905f7c21fbed4e921cb39d6518b1300", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6731,7 +6712,180 @@ "configuration", "options" ], - "time": "2016-01-21 09:05:51" + "time": "2016-01-21 09:38:31" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "1289d16209491b584839022f29257ad859b8532d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "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 for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, + { + "name": "symfony/polyfill-php54", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/74663d5a2ff3c530c1bc0571500e0feec9094054", + "reference": "74663d5a2ff3c530c1bc0571500e0feec9094054", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "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.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, + { + "name": "symfony/polyfill-php55", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php55.git", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "reference": "b4f3f07d91702f8f926339fc4fcf81671d8c27e6", + "shasum": "" + }, + "require": { + "ircmaxell/password-compat": "~1.0", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php55\\": "" + }, + "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.5+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" }, { "name": "symfony/polyfill-php56", @@ -6843,25 +6997,25 @@ }, { "name": "symfony/process", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "faa89438017392585abdf7f5a47f3f5f282d93c1" + "reference": "dfecef47506179db2501430e732adbf3793099c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/faa89438017392585abdf7f5a47f3f5f282d93c1", - "reference": "faa89438017392585abdf7f5a47f3f5f282d93c1", + "url": "https://api.github.com/repos/symfony/process/zipball/dfecef47506179db2501430e732adbf3793099c8", + "reference": "dfecef47506179db2501430e732adbf3793099c8", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6888,40 +7042,41 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-02-02 13:32:58" + "time": "2016-02-02 13:44:19" }, { "name": "symfony/routing", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "c63128f6dd5095351a87cd7c8801963001e22aff" + "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/c63128f6dd5095351a87cd7c8801963001e22aff", - "reference": "c63128f6dd5095351a87cd7c8801963001e22aff", + "url": "https://api.github.com/repos/symfony/routing/zipball/fa1e9a8173cf0077dd995205da453eacd758fdf6", + "reference": "fa1e9a8173cf0077dd995205da453eacd758fdf6", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "conflict": { - "symfony/config": "<2.7" + "symfony/config": "<2.8" }, "require-dev": { "doctrine/annotations": "~1.0", "doctrine/common": "~2.2", "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/expression-language": "~2.4", - "symfony/http-foundation": "~2.3", - "symfony/yaml": "~2.0,>=2.0.5" + "symfony/config": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/http-foundation": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", "symfony/config": "For using the all-in-one router or any loader", + "symfony/dependency-injection": "For loading routes from a service", "symfony/expression-language": "For using expression matching", "symfony/http-foundation": "For using a Symfony Request object", "symfony/yaml": "For using the YAML loader" @@ -6929,7 +7084,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -6962,33 +7117,34 @@ "uri", "url" ], - "time": "2016-02-04 13:52:46" + "time": "2016-02-04 13:53:13" }, { "name": "symfony/translation", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "4c61cf815af17eee4cebf0e4c66f56a2f704cfd8" + "reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/4c61cf815af17eee4cebf0e4c66f56a2f704cfd8", - "reference": "4c61cf815af17eee4cebf0e4c66f56a2f704cfd8", + "url": "https://api.github.com/repos/symfony/translation/zipball/2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91", + "reference": "2de0b6f7ebe43cffd8a06996ebec6aab79ea9e91", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.7" + "symfony/config": "<2.8" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.7", - "symfony/intl": "~2.4", - "symfony/yaml": "~2.2" + "symfony/config": "~2.8|~3.0", + "symfony/intl": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" }, "suggest": { "psr/log": "To use logging capability in translator", @@ -6998,7 +7154,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -7025,24 +7181,28 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-02-01 20:45:15" + "time": "2016-02-02 13:44:19" }, { "name": "symfony/var-dumper", - "version": "v2.7.10", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e4fdc92abb3dae0d840f4276af701d58ddc9b733" + "reference": "9a6a883c48acb215d4825ce9de61dccf93d62074" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e4fdc92abb3dae0d840f4276af701d58ddc9b733", - "reference": "e4fdc92abb3dae0d840f4276af701d58ddc9b733", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9a6a883c48acb215d4825ce9de61dccf93d62074", + "reference": "9a6a883c48acb215d4825ce9de61dccf93d62074", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "twig/twig": "~1.20|~2.0" }, "suggest": { "ext-symfony_debug": "" @@ -7050,7 +7210,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -7084,7 +7244,7 @@ "debug", "dump" ], - "time": "2016-02-12 17:39:33" + "time": "2016-02-13 09:23:44" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -7322,28 +7482,33 @@ }, { "name": "vlucas/phpdotenv", - "version": "v1.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa" + "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa", - "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9caf304153dc2288e4970caec6f1f3b3bc205412", + "reference": "9caf304153dc2288e4970caec6f1f3b3bc205412", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.3.9" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^4.8|^5.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.2-dev" + } + }, "autoload": { - "psr-0": { - "Dotenv": "src/" + "psr-4": { + "Dotenv\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -7364,7 +7529,7 @@ "env", "environment" ], - "time": "2015-05-30 15:59:26" + "time": "2015-12-29 15:10:30" }, { "name": "webpatser/laravel-countries", @@ -9188,25 +9353,25 @@ }, { "name": "symfony/browser-kit", - "version": "v2.8.3", + "version": "v3.0.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2" + "reference": "dde849a0485b70a24b36f826ed3fb95b904d80c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2", - "reference": "6b2085020b4e86fcb7ae44c3ab8ddb91774b33d2", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dde849a0485b70a24b36f826ed3fb95b904d80c3", + "reference": "dde849a0485b70a24b36f826ed3fb95b904d80c3", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0" + "php": ">=5.5.9", + "symfony/dom-crawler": "~2.8|~3.0" }, "require-dev": { - "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0", - "symfony/process": "~2.3.34|~2.7,>=2.7.6|~3.0.0" + "symfony/css-selector": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" }, "suggest": { "symfony/process": "" @@ -9214,7 +9379,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -9241,7 +9406,63 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "time": "2016-01-27 11:34:40" + "time": "2016-01-27 11:34:55" + }, + { + "name": "symfony/dom-crawler", + "version": "v3.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/981c8edb4538f88ba976ed44bdcaa683fce3d6c6", + "reference": "981c8edb4538f88ba976ed44bdcaa683fce3d6c6", + "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.0-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": "2016-02-28 16:24:34" }, { "name": "symfony/yaml", diff --git a/config/app.php b/config/app.php index 59a67d677706..c86362a9afea 100644 --- a/config/app.php +++ b/config/app.php @@ -17,6 +17,8 @@ return [ 'debug' => env('APP_DEBUG', ''), + 'env' => env('APP_ENV', 'production'), + /* |-------------------------------------------------------------------------- | Application URL @@ -115,12 +117,11 @@ return [ /* * Laravel Framework Service Providers... */ - 'Illuminate\Foundation\Providers\ArtisanServiceProvider', 'Illuminate\Auth\AuthServiceProvider', - 'Illuminate\Bus\BusServiceProvider', + 'Collective\Html\HtmlServiceProvider', + 'Collective\Bus\BusServiceProvider', 'Illuminate\Cache\CacheServiceProvider', 'Illuminate\Foundation\Providers\ConsoleSupportServiceProvider', - 'Illuminate\Routing\ControllerServiceProvider', 'Illuminate\Cookie\CookieServiceProvider', 'Illuminate\Database\DatabaseServiceProvider', 'Illuminate\Encryption\EncryptionServiceProvider', @@ -149,7 +150,6 @@ return [ 'Intervention\Image\ImageServiceProvider', 'Webpatser\Countries\CountriesServiceProvider', 'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider', - 'Illuminate\Html\HtmlServiceProvider', 'Laravel\Socialite\SocialiteServiceProvider', 'Jlapp\Swaggervel\SwaggervelServiceProvider', 'Maatwebsite\Excel\ExcelServiceProvider', @@ -158,7 +158,7 @@ return [ * Application Service Providers... */ 'App\Providers\AppServiceProvider', - 'App\Providers\BusServiceProvider', + //'App\Providers\BusServiceProvider', 'App\Providers\ConfigServiceProvider', 'App\Providers\EventServiceProvider', 'App\Providers\RouteServiceProvider', diff --git a/config/auth.php b/config/auth.php index 1ce67b55a13e..6bb5e47c7839 100644 --- a/config/auth.php +++ b/config/auth.php @@ -2,66 +2,106 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Authentication Driver - |-------------------------------------------------------------------------- - | - | This option controls the authentication driver that will be utilized. - | This driver manages the retrieval and authentication of the users - | attempting to get access to protected areas of your application. - | - | Supported: "database", "eloquent" - | - */ + /* + |-------------------------------------------------------------------------- + | Authentication Defaults + |-------------------------------------------------------------------------- + | + | This option controls the default authentication "guard" and password + | reset options for your application. You may change these defaults + | as required, but they're a perfect start for most applications. + | + */ - 'driver' => 'eloquent', + 'defaults' => [ + 'guard' => 'web', + 'passwords' => 'users', + ], - /* - |-------------------------------------------------------------------------- - | Authentication Model - |-------------------------------------------------------------------------- - | - | When using the "Eloquent" authentication driver, we need to know which - | Eloquent model should be used to retrieve your users. Of course, it - | is often just the "User" model but you may use whatever you like. - | - */ + /* + |-------------------------------------------------------------------------- + | Authentication Guards + |-------------------------------------------------------------------------- + | + | Next, you may define every authentication guard for your application. + | Of course, a great default configuration has been defined for you + | here which uses session storage and the Eloquent user provider. + | + | All authentication drivers have a user provider. This defines how the + | users are actually retrieved out of your database or other storage + | mechanisms used by this application to persist your user's data. + | + | Supported: "session", "token" + | + */ - 'model' => 'App\Models\User', + 'guards' => [ + 'web' => [ + 'driver' => 'session', + 'provider' => 'users', + ], - /* - |-------------------------------------------------------------------------- - | Authentication Table - |-------------------------------------------------------------------------- - | - | When using the "Database" authentication driver, we need to know which - | table should be used to retrieve your users. We have chosen a basic - | default value but you may easily change it to any table you like. - | - */ + 'api' => [ + 'driver' => 'token', + 'provider' => 'users', + ], + ], - 'table' => 'users', + /* + |-------------------------------------------------------------------------- + | User Providers + |-------------------------------------------------------------------------- + | + | All authentication drivers have a user provider. This defines how the + | users are actually retrieved out of your database or other storage + | mechanisms used by this application to persist your user's data. + | + | If you have multiple user tables or models you may configure multiple + | sources which represent each model / table. These sources may then + | be assigned to any extra authentication guards you have defined. + | + | Supported: "database", "eloquent" + | + */ - /* - |-------------------------------------------------------------------------- - | Password Reset Settings - |-------------------------------------------------------------------------- - | - | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You can also set the name of the - | table that maintains all of the reset tokens for your application. - | - | The expire time is the number of minutes that the reset token should be - | considered valid. This security feature keeps tokens short-lived so - | they have less time to be guessed. You may change this as needed. - | - */ + 'providers' => [ + 'users' => [ + 'driver' => 'eloquent', + 'model' => App\Models\User::class, + ], - 'password' => [ - 'email' => 'emails.password', - 'table' => 'password_resets', - 'expire' => 60, - ], + // 'users' => [ + // 'driver' => 'database', + // 'table' => 'users', + // ], + ], -]; + /* + |-------------------------------------------------------------------------- + | Resetting Passwords + |-------------------------------------------------------------------------- + | + | Here you may set the options for resetting passwords including the view + | that is your password reset e-mail. You may also set the name of the + | table that maintains all of the reset tokens for your application. + | + | You may specify multiple password reset configurations if you have more + | than one user table or model in the application and you want to have + | separate password reset settings based on the specific user types. + | + | The expire time is the number of minutes that the reset token should be + | considered valid. This security feature keeps tokens short-lived so + | they have less time to be guessed. You may change this as needed. + | + */ + + 'passwords' => [ + 'users' => [ + 'provider' => 'users', + 'email' => 'emails.password', //auth.emails.password + 'table' => 'password_resets', + 'expire' => 60, + ], + ], + +]; \ No newline at end of file diff --git a/database/seeds/CurrenciesSeeder.php b/database/seeds/CurrenciesSeeder.php index 9d46bbd12358..c62df1f2fae3 100644 --- a/database/seeds/CurrenciesSeeder.php +++ b/database/seeds/CurrenciesSeeder.php @@ -51,6 +51,7 @@ class CurrenciesSeeder extends Seeder ['name' => 'Aruban Florin', 'code' => 'AWG', 'symbol' => 'Afl. ', 'precision' => '2', 'thousand_separator' => ' ', 'decimal_separator' => '.'], ['name' => 'Turkish Lira', 'code' => 'TRY', 'symbol' => 'TL ', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','], ['name' => 'Romanian New Leu', 'code' => 'RON', 'symbol' => '', 'precision' => '2', 'thousand_separator' => ',', 'decimal_separator' => '.'], + ['name' => 'Croatian', 'code' => 'HKR', 'symbol' => 'kn', 'precision' => '2', 'thousand_separator' => '.', 'decimal_separator' => ','], ]; foreach ($currencies as $currency) { diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php index 2794a5b2e0f8..110665b3f691 100644 --- a/resources/views/accounts/templates_and_reminders.blade.php +++ b/resources/views/accounts/templates_and_reminders.blade.php @@ -212,9 +212,9 @@ "0001", "0001", "{{ URL::to('/view/...') }}", - '{!! HTML::flatButton('view_invoice', '#0b4d78') !!}', + '{!! Form::flatButton('view_invoice', '#0b4d78') !!}', "{{ URL::to('/payment/...') }}", - '{!! HTML::flatButton('pay_now', '#36c157') !!}', + '{!! Form::flatButton('pay_now', '#36c157') !!}', ]; // Add blanks for custom values @@ -227,7 +227,7 @@ {!! "vals.push('" . URL::to('/payment/...') . "');" !!} {!! "keys.push('" . \App\Models\Gateway::getPaymentTypeName($type).'Button' . "');" !!} - {!! "vals.push('" . HTML::flatButton('pay_now', '#36c157') . "');" !!} + {!! "vals.push('" . Form::flatButton('pay_now', '#36c157') . "');" !!} @endforeach for (var i=0; i - {!! HTML::tab_link('#activity', trans('texts.activity'), true) !!} + {!! Form::tab_link('#activity', trans('texts.activity'), true) !!} @if ($hasTasks) - {!! HTML::tab_link('#tasks', trans('texts.tasks')) !!} + {!! Form::tab_link('#tasks', trans('texts.tasks')) !!} @endif @if ($hasQuotes && Utils::isPro()) - {!! HTML::tab_link('#quotes', trans('texts.quotes')) !!} + {!! Form::tab_link('#quotes', trans('texts.quotes')) !!} @endif - {!! HTML::tab_link('#invoices', trans('texts.invoices')) !!} - {!! HTML::tab_link('#payments', trans('texts.payments')) !!} - {!! HTML::tab_link('#credits', trans('texts.credits')) !!} + {!! Form::tab_link('#invoices', trans('texts.invoices')) !!} + {!! Form::tab_link('#payments', trans('texts.payments')) !!} + {!! Form::tab_link('#credits', trans('texts.credits')) !!}
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php index 4c73a7d24875..b370763a793b 100644 --- a/resources/views/datatable.blade.php +++ b/resources/views/datatable.blade.php @@ -7,9 +7,9 @@ @foreach($columns as $i => $c) - @if ($c == 'checkbox' && $hasCheckboxes = true) @@ -48,7 +48,7 @@ function load_{{ $class }}() { window.dataTable = jQuery('.{{ $class }}').dataTable({ - "fnRowCallback": function(row, data) { + "fnRowCallback": function(row, data) { if (data[0].indexOf('ENTITY_DELETED') > 0) { $(row).addClass('entityDeleted'); } @@ -60,7 +60,7 @@ @if (isset($hasCheckboxes) && $hasCheckboxes) 'aaSorting': [['1', 'asc']], // Disable sorting on the first column - "aoColumnDefs": [ + "aoColumnDefs": [ { 'bSortable': false, 'aTargets': [ 0, {{ count($columns) - 1 }} ] diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index f541eec53329..de405212392c 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -386,12 +386,12 @@