From 3dd83bd581d82e9de23436cd1ba03790c584a46b Mon Sep 17 00:00:00 2001 From: diashalabi Date: Sun, 28 Mar 2021 14:30:31 +0300 Subject: [PATCH] #2138 Remove unused code --- .../src/Adress/AdressCollection.php | 8 --- .../src/Adress/AdressCriteria.php | 8 --- .../profile-module/src/Adress/AdressModel.php | 11 ++-- .../src/Adress/AdressObserver.php | 8 --- .../src/Adress/AdressPresenter.php | 8 --- .../src/Adress/AdressRepository.php | 13 +---- .../src/Adress/AdressRouter.php | 8 --- .../src/Adress/AdressSeeder.php | 4 -- .../src/Adress/Command/GetAddress.php | 18 ++----- .../src/Adress/Command/GetAddressByUser.php | 18 ++----- .../src/Adress/Contract/AdressInterface.php | 8 +++ .../src/Adress/Form/AdressFormFields.php | 2 - .../src/Adress/Form/AdressFormHandler.php | 11 +--- .../FormCompany/AddressCompanyFormFields.php | 2 - .../FormCompany/AddressCompanyFormHandler.php | 5 +- .../src/Adress/Table/AdressTableBuilder.php | 44 --------------- .../src/Education/EducationCollection.php | 8 --- .../src/Education/EducationCriteria.php | 8 --- .../src/Education/EducationObserver.php | 8 --- .../src/Education/EducationPresenter.php | 8 --- .../src/Education/EducationRepository.php | 11 ---- .../src/Education/EducationRouter.php | 8 --- .../src/Education/EducationSeeder.php | 4 -- .../Education/Form/EducationFormBuilder.php | 5 -- .../Education/Table/EducationTableBuilder.php | 10 ---- .../EducationPart/EducationPartCollection.php | 8 --- .../EducationPart/EducationPartCriteria.php | 8 --- .../EducationPart/EducationPartObserver.php | 8 --- .../EducationPart/EducationPartPresenter.php | 8 --- .../EducationPart/EducationPartRepository.php | 11 ---- .../src/EducationPart/EducationPartRouter.php | 8 --- .../src/EducationPart/EducationPartSeeder.php | 15 ------ .../Form/EducationPartFormBuilder.php | 5 -- .../Table/EducationPartTableBuilder.php | 10 ---- .../src/Http/Controller/AddressController.php | 5 -- .../Controller/Admin/AdressController.php | 31 +++-------- .../Controller/Admin/EducationController.php | 20 ------- .../Admin/EducationPartController.php | 20 ------- .../Http/Controller/MyProfileController.php | 3 -- .../src/Http/Controller/UserAuthenticator.php | 31 ----------- .../src/Profile/Command/GetProfileDetail.php | 8 --- .../src/Profile/Form/ProfileFormBuilder.php | 54 ------------------- .../Password/ForgotPassFormBuilder.php | 15 ------ .../Profile/Password/ForgotPassFormFields.php | 6 --- .../Password/ForgotPassFormHandler.php | 10 ---- .../Profile/Password/PasswordFormBuilder.php | 1 - .../src/Profile/ProfilePresenter.php | 4 +- .../Command/HandleActivateRequest.php | 11 ---- .../Command/HandleAutomaticRegistration.php | 16 ------ .../Command/HandleEmailRegistration.php | 6 --- .../Command/HandleManualRegistration.php | 13 ----- .../Register2/Register2FormBuilder.php | 40 -------------- .../Register2/Register2FormHandler.php | 1 - .../src/Profile/SignIn/SignInFormBuilder.php | 1 - .../src/Profile/SignIn/SignInFormHandler.php | 1 - .../src/Profile/User/UserFormBuilder.php | 1 - .../src/Profile/UsersExport.php | 3 -- .../Validation/ValidateCredentials.php | 2 - .../Profile/Validation/ValidateRegister.php | 1 + .../src/Profile/sites/SitesFormBuilder.php | 52 ------------------ .../profile-module/src/ProfileModule.php | 17 ------ .../src/ProfileModulePlugin.php | 3 -- .../src/ProfileModuleSeeder.php | 34 ------------ .../src/ProfileModuleServiceProvider.php | 1 - 64 files changed, 30 insertions(+), 708 deletions(-) delete mode 100644 addons/default/visiosoft/profile-module/src/Adress/AdressCollection.php delete mode 100644 addons/default/visiosoft/profile-module/src/Adress/AdressCriteria.php delete mode 100644 addons/default/visiosoft/profile-module/src/Adress/AdressObserver.php delete mode 100644 addons/default/visiosoft/profile-module/src/Adress/AdressPresenter.php delete mode 100644 addons/default/visiosoft/profile-module/src/Adress/AdressRouter.php delete mode 100644 addons/default/visiosoft/profile-module/src/Education/EducationCollection.php delete mode 100644 addons/default/visiosoft/profile-module/src/Education/EducationCriteria.php delete mode 100644 addons/default/visiosoft/profile-module/src/Education/EducationObserver.php delete mode 100644 addons/default/visiosoft/profile-module/src/Education/EducationPresenter.php delete mode 100644 addons/default/visiosoft/profile-module/src/Education/EducationRouter.php delete mode 100644 addons/default/visiosoft/profile-module/src/EducationPart/EducationPartCollection.php delete mode 100644 addons/default/visiosoft/profile-module/src/EducationPart/EducationPartCriteria.php delete mode 100644 addons/default/visiosoft/profile-module/src/EducationPart/EducationPartObserver.php delete mode 100644 addons/default/visiosoft/profile-module/src/EducationPart/EducationPartPresenter.php delete mode 100644 addons/default/visiosoft/profile-module/src/EducationPart/EducationPartRouter.php delete mode 100644 addons/default/visiosoft/profile-module/src/EducationPart/EducationPartSeeder.php diff --git a/addons/default/visiosoft/profile-module/src/Adress/AdressCollection.php b/addons/default/visiosoft/profile-module/src/Adress/AdressCollection.php deleted file mode 100644 index 7ab2d3391..000000000 --- a/addons/default/visiosoft/profile-module/src/Adress/AdressCollection.php +++ /dev/null @@ -1,8 +0,0 @@ -where('id', $id)->whereNull('deleted_at'); } @@ -23,10 +23,9 @@ class AdressModel extends ProfileAdressEntryModel implements AdressInterface public function getUserAdress($id = null) { - if ($id != null) { - return $this->query()->where('user_id', $id)->whereNull('deleted_at')->get(); - } - return $this->query()->where('user_id', Auth::id())->whereNull('deleted_at')->get(); + $id = auth_id_if_null($id); + + return $this->query()->where('user_id', $id)->whereNull('deleted_at')->get(); } public function getCountry() diff --git a/addons/default/visiosoft/profile-module/src/Adress/AdressObserver.php b/addons/default/visiosoft/profile-module/src/Adress/AdressObserver.php deleted file mode 100644 index d8b865b95..000000000 --- a/addons/default/visiosoft/profile-module/src/Adress/AdressObserver.php +++ /dev/null @@ -1,8 +0,0 @@ -model = $model; @@ -25,7 +14,7 @@ class AdressRepository extends EntryRepository implements AdressRepositoryInterf public function findByUser($user_id) { - return $this->newQuery()->where('user_id', $user_id)->get(); + return $this->findAllBy('user_id', $user_id); } public function createAddress($name, $user_id, $first_name, $last_name, $country_id, $city_id, $content, $gsm_phone) diff --git a/addons/default/visiosoft/profile-module/src/Adress/AdressRouter.php b/addons/default/visiosoft/profile-module/src/Adress/AdressRouter.php deleted file mode 100644 index 6c045dccc..000000000 --- a/addons/default/visiosoft/profile-module/src/Adress/AdressRouter.php +++ /dev/null @@ -1,8 +0,0 @@ -id = $id; } - /** - * @param AdressRepositoryInterface $adressRepository - * @return \Anomaly\Streams\Platform\Model\EloquentModel|null - */ - public function handle(AdressRepositoryInterface $adressRepository) + public function handle(AdressRepositoryInterface $addressRepository) { if ($this->id) { - return $adressRepository->find($this->id); + return $addressRepository->find($this->id); } + return null; } } diff --git a/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddressByUser.php b/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddressByUser.php index df16b713c..e19d247e5 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddressByUser.php +++ b/addons/default/visiosoft/profile-module/src/Adress/Command/GetAddressByUser.php @@ -1,34 +1,22 @@ id = $id; } - /** - * @param AdressRepositoryInterface $adressRepository - * @return \Anomaly\Streams\Platform\Model\EloquentModel|null - */ - public function handle(AdressRepositoryInterface $adressRepository) + public function handle(AdressRepositoryInterface $addressRepository) { if ($this->id) { - return $adressRepository->findByUser($this->id); + return $addressRepository->findByUser($this->id); } + return null; } } diff --git a/addons/default/visiosoft/profile-module/src/Adress/Contract/AdressInterface.php b/addons/default/visiosoft/profile-module/src/Adress/Contract/AdressInterface.php index 03db90b61..4b49bc64c 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/Contract/AdressInterface.php +++ b/addons/default/visiosoft/profile-module/src/Adress/Contract/AdressInterface.php @@ -4,5 +4,13 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface AdressInterface extends EntryInterface { + public function getAdress($id = null); + + public function getAdressFirst($id); + + public function getUserAdress($id = null); + public function getCountry(); + + public function getCity(); } diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php index f650d7375..054930ac9 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php +++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormFields.php @@ -1,9 +1,7 @@ setFields( diff --git a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php index c4a8b530a..e37ad73a3 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Adress/Form/AdressFormHandler.php @@ -1,19 +1,10 @@ canSave()) { return; diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php index d647a9ffc..52ada8320 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php +++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormFields.php @@ -1,9 +1,7 @@ setFields( diff --git a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php index 9aa52a88c..3e7554006 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Adress/FormCompany/AddressCompanyFormHandler.php @@ -2,12 +2,9 @@ use Illuminate\Support\Facades\Auth; - class AddressCompanyFormHandler { - - public function handle( - AddressCompanyFormBuilder $builder) + public function handle(AddressCompanyFormBuilder $builder) { if (!$builder->canSave()) { return; diff --git a/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php b/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php index 05384db34..3806fc14e 100644 --- a/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Adress/Table/AdressTableBuilder.php @@ -4,20 +4,6 @@ use Anomaly\Streams\Platform\Ui\Table\TableBuilder; class AdressTableBuilder extends TableBuilder { - - /** - * The table views. - * - * @var array|string - */ - protected $views = [ - ]; - - /** - * The table filters. - * - * @var array|string - */ protected $filters = [ 'search' => [ 'filter' => 'search', @@ -27,11 +13,6 @@ class AdressTableBuilder extends TableBuilder ], ]; - /** - * The table columns. - * - * @var array|string - */ protected $columns = [ 'first_name' => 'entry.user.first_name', 'last_name' => 'entry.user.last_name', @@ -39,11 +20,6 @@ class AdressTableBuilder extends TableBuilder 'adress_gsm_phone' ]; - /** - * The table buttons. - * - * @var array|string - */ protected $buttons = [ 'show' => [ 'type' => 'primary', @@ -52,27 +28,7 @@ class AdressTableBuilder extends TableBuilder ], ]; - /** - * The table actions. - * - * @var array|string - */ protected $actions = [ 'delete' ]; - - /** - * The table options. - * - * @var array - */ - protected $options = []; - - /** - * The table assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/Education/EducationCollection.php b/addons/default/visiosoft/profile-module/src/Education/EducationCollection.php deleted file mode 100644 index e669e4cc2..000000000 --- a/addons/default/visiosoft/profile-module/src/Education/EducationCollection.php +++ /dev/null @@ -1,8 +0,0 @@ -model = $model; diff --git a/addons/default/visiosoft/profile-module/src/Education/EducationRouter.php b/addons/default/visiosoft/profile-module/src/Education/EducationRouter.php deleted file mode 100644 index ffc70a9fc..000000000 --- a/addons/default/visiosoft/profile-module/src/Education/EducationRouter.php +++ /dev/null @@ -1,8 +0,0 @@ -model = $model; diff --git a/addons/default/visiosoft/profile-module/src/EducationPart/EducationPartRouter.php b/addons/default/visiosoft/profile-module/src/EducationPart/EducationPartRouter.php deleted file mode 100644 index 331061459..000000000 --- a/addons/default/visiosoft/profile-module/src/EducationPart/EducationPartRouter.php +++ /dev/null @@ -1,8 +0,0 @@ -setColumns(array_merge($table->getColumns(), [ @@ -30,12 +23,6 @@ class AdressController extends AdminController return $table->render(); } - /** - * Create a new entry. - * - * @param AdressFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ public function create(AdressFormBuilder $form) { $form->setOption('heading', "visiosoft.module.profile::field"); @@ -43,13 +30,6 @@ class AdressController extends AdminController return $form->render(); } - /** - * Edit an existing entry. - * - * @param AdressFormBuilder $form - * @param $id - * @return \Symfony\Component\HttpFoundation\Response - */ public function edit(AdressFormBuilder $form, $id) { $form->setOption('heading', "visiosoft.module.profile::field"); @@ -60,19 +40,20 @@ class AdressController extends AdminController public function adressUpdate(AdressFormBuilder $form,Request $request,$id) { $error = $form->build()->validate()->getFormErrors()->getMessages(); - if(!empty($error)) - { + + if(!empty($error)) { return $this->redirect->back(); } + $New_value = $request->all(); - unset($New_value['_token'],$New_value['action']); + unset($New_value['_token'], $New_value['action']); ProfileAdressEntryModel::find($id)->update($New_value); $message = []; $message[] = trans('visiosoft.module.profile::message.adress_success_update'); - if($request->get('action') == "save_create") - { + if ($request->get('action') == "save_create") { return redirect('admin/profile/adress/create')->with('success', $message); } + return $this->redirect->back()->with('success', $message); } } diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationController.php index b6c61e75b..049a79560 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationController.php @@ -6,36 +6,16 @@ use Anomaly\Streams\Platform\Http\Controller\AdminController; class EducationController extends AdminController { - - /** - * Display an index of existing entries. - * - * @param EducationTableBuilder $table - * @return \Symfony\Component\HttpFoundation\Response - */ public function index(EducationTableBuilder $table) { return $table->render(); } - /** - * Create a new entry. - * - * @param EducationFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ public function create(EducationFormBuilder $form) { return $form->render(); } - /** - * Edit an existing entry. - * - * @param EducationFormBuilder $form - * @param $id - * @return \Symfony\Component\HttpFoundation\Response - */ public function edit(EducationFormBuilder $form, $id) { return $form->render($id); diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationPartController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationPartController.php index 60f997a23..5b26d8867 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationPartController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/Admin/EducationPartController.php @@ -6,36 +6,16 @@ use Anomaly\Streams\Platform\Http\Controller\AdminController; class EducationPartController extends AdminController { - - /** - * Display an index of existing entries. - * - * @param EducationPartTableBuilder $table - * @return \Symfony\Component\HttpFoundation\Response - */ public function index(EducationPartTableBuilder $table) { return $table->render(); } - /** - * Create a new entry. - * - * @param EducationPartFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ public function create(EducationPartFormBuilder $form) { return $form->render(); } - /** - * Edit an existing entry. - * - * @param EducationPartFormBuilder $form - * @param $id - * @return \Symfony\Component\HttpFoundation\Response - */ public function edit(EducationPartFormBuilder $form, $id) { return $form->render($id); diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index 18f60162f..89264aa4e 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -6,13 +6,11 @@ use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; -use Rinvex\Subscriptions\Models\Plan; use Visiosoft\AdvsModule\Adv\AdvModel; use Visiosoft\AdvsModule\Adv\Event\ChangeStatusAd; use Visiosoft\AdvsModule\Status\Contract\StatusRepositoryInterface; use Visiosoft\LocationModule\Country\CountryModel; use Visiosoft\AlgoliaModule\Search\SearchModel; -use Visiosoft\CloudsiteModule\CloudsiteModule; use Visiosoft\PackagesModule\Http\Controller\PackageFEController; use Visiosoft\MessagesModule\Message\MessageModel; use Visiosoft\PackagesModule\Package\PackageModel; @@ -65,7 +63,6 @@ class MyProfileController extends PublicController $isActivePackages = $isActivePackages->is_enabled('packages'); if ($isActivePackages) { - //Search Last Time Packages By User $TimePackages = new PackageFEController(); $LastTimePackages = $TimePackages->getPackagesByUser('lasttime'); diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php index 18f16a4e4..0557a7fb4 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/UserAuthenticator.php @@ -7,24 +7,14 @@ use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Anomaly\UsersModule\User\Event\UserWasLoggedIn; use Visiosoft\AdvsModule\Adv\AdvModel; -use Visiosoft\CloudsiteModule\Site\Event\CreateSite; use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\Redirect; -use Visiosoft\CloudsiteModule\Site\SiteModel; use Visiosoft\ProfileModule\Profile\ProfileRepository; -use Visiosoft\SubscriptionsModule\User\UserModel; -/** - * Class UserAuthenticator - * - * @link http://visiosoft.com.tr/ - * @author Visiosoft, Inc. - * @author Vedat Akdoğan - */ class UserAuthenticator { protected $guard; @@ -34,7 +24,6 @@ class UserAuthenticator protected $settings; protected $advModel; - public function __construct( Guard $guard, Dispatcher $events, @@ -51,14 +40,6 @@ class UserAuthenticator $this->settings = $settings; } - /** - * Attempt to login a user. - * - * @param array $credentials - * @param bool $remember - * @return bool|UserInterface - */ - function valid_email($email) { return !!filter_var($email, FILTER_VALIDATE_EMAIL); @@ -103,12 +84,6 @@ class UserAuthenticator return Redirect::back()->with('error', [trans('visiosoft.module.profile::message.login_error')]); } - /** - * Attempt to authenticate the credentials. - * - * @param array $credentials - * @return bool|UserInterface - */ public function authenticate(array $credentials) { $authenticators = $this->extensions @@ -132,12 +107,6 @@ class UserAuthenticator return false; } - /** - * Force login a user. - * - * @param UserInterface $user - * @param bool $remember - */ public function login(UserInterface $user, $remember = false) { $this->guard->login($user, $remember); diff --git a/addons/default/visiosoft/profile-module/src/Profile/Command/GetProfileDetail.php b/addons/default/visiosoft/profile-module/src/Profile/Command/GetProfileDetail.php index 6a38ea0e7..b0fdb972c 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Command/GetProfileDetail.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Command/GetProfileDetail.php @@ -4,16 +4,8 @@ use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; class GetProfileDetail { - - /** - * @var $id - */ protected $id; - /** - * GetProduct constructor. - * @param $id - */ public function __construct($id) { $this->id = $id; diff --git a/addons/default/visiosoft/profile-module/src/Profile/Form/ProfileFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Form/ProfileFormBuilder.php index 80b68fc6d..e0cdefa34 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Form/ProfileFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Form/ProfileFormBuilder.php @@ -5,12 +5,6 @@ use Anomaly\UsersModule\User\Validation\ValidateEmail; class ProfileFormBuilder extends FormBuilder { - - /** - * The form fields. - * - * @var array|string - */ protected $fields = [ 'email' => [ 'instructions' => false, @@ -26,55 +20,7 @@ class ProfileFormBuilder extends FormBuilder ], ]; - /** - * Additional validation rules. - * - * @var array|string - */ - protected $rules = []; - - /** - * Fields to skip. - * - * @var array|string - */ - protected $skips = []; - - /** - * The form actions. - * - * @var array|string - */ - protected $actions = []; - - /** - * The form buttons. - * - * @var array|string - */ protected $buttons = [ 'cancel', ]; - - /** - * The form options. - * - * @var array - */ - protected $options = []; - - /** - * The form sections. - * - * @var array - */ - protected $sections = []; - - /** - * The form assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormBuilder.php index 44f06a326..b6a29ab9f 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormBuilder.php @@ -7,27 +7,12 @@ class ForgotPassFormBuilder extends FormBuilder { protected $user = null; - /** - * No model. - * - * @var bool - */ protected $model = false; - /** - * The form actions. - * - * @var array - */ protected $actions = [ 'submit', ]; - /** - * The form options. - * - * @var array - */ protected $options = [ 'redirect' => '/', ]; diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php index 8bf1e7c33..54ceeebcf 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormFields.php @@ -2,12 +2,6 @@ class ForgotPassFormFields { - - /** - * Handle the fields. - * - * @param ForgotPassFormBuilder $builder - */ public function handle(ForgotPassFormBuilder $builder) { $builder->setFields( diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php index 03bd457d6..23a1efca7 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/ForgotPassFormHandler.php @@ -8,16 +8,6 @@ use Visiosoft\ProfileModule\Profile\Events\SendForgotPasswordSms; class ForgotPassFormHandler { - - /** - * Handle the form. - * - * @param ForgotPassFormBuilder $builder - * @param UserRepositoryInterface $users - * @param UserPassword $password - * @param MessageBag $messages - * @param Repository $config - */ public function handle( ForgotPassFormBuilder $builder, UserRepositoryInterface $users, diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php index fe5ea5c1a..635b65527 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormBuilder.php @@ -2,7 +2,6 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder; - class PasswordFormBuilder extends FormBuilder { protected $fields = [ diff --git a/addons/default/visiosoft/profile-module/src/Profile/ProfilePresenter.php b/addons/default/visiosoft/profile-module/src/Profile/ProfilePresenter.php index dbe3ebeae..cfeead993 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/ProfilePresenter.php +++ b/addons/default/visiosoft/profile-module/src/Profile/ProfilePresenter.php @@ -4,11 +4,9 @@ use Anomaly\Streams\Platform\Entry\EntryPresenter; class ProfilePresenter extends EntryPresenter { - public function getNotification($type) { $value = $this->object->$type; - if($value == 1) - { + if ($value == 1) { return "checked"; } } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleActivateRequest.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleActivateRequest.php index 68019eb61..3c536c20d 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleActivateRequest.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleActivateRequest.php @@ -8,17 +8,6 @@ use Illuminate\Http\Request; class HandleActivateRequest { - - /** - * Handle the command. - * - * @param UserRepositoryInterface $users - * @param UserAuthenticator $authenticator - * @param UserActivator $activator - * @param Encrypter $encrypter - * @param Request $request - * @return bool - */ public function handle( UserRepositoryInterface $users, UserAuthenticator $authenticator, diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleAutomaticRegistration.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleAutomaticRegistration.php index 0d8e05807..b1a8299bd 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleAutomaticRegistration.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleAutomaticRegistration.php @@ -6,14 +6,6 @@ use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder; use Anomaly\UsersModule\User\UserActivator; use Anomaly\UsersModule\User\UserAuthenticator; - -/** - * Class HandleAutomaticRegistration - * - * @link http://openclassify.com/ - * @author OpenClassify, Inc. - * @author Visiosoft Inc - */ class HandleAutomaticRegistration { protected $builder; @@ -23,13 +15,6 @@ class HandleAutomaticRegistration $this->builder = $builder; } - /** - * Handle the command. - * - * @param UserAuthenticator $authenticator - * @param UserActivator $activator - * @param MessageBag $messages - */ public function handle(UserAuthenticator $authenticator, UserActivator $activator, MessageBag $messages) { /* @var UserInterface $user */ @@ -44,5 +29,4 @@ class HandleAutomaticRegistration $messages->success('anomaly.module.users::message.logged_in'); } - } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleEmailRegistration.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleEmailRegistration.php index 7739a544a..545cd36ec 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleEmailRegistration.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleEmailRegistration.php @@ -14,12 +14,6 @@ class HandleEmailRegistration $this->builder = $builder; } - /** - * Handle the command. - * - * @param UserActivator $activator - * @param MessageBag $messages - */ public function handle(UserActivator $activator, MessageBag $messages) { /* @var UserInterface $user */ diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleManualRegistration.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleManualRegistration.php index 43a64c56e..d8c89d733 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleManualRegistration.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Command/HandleManualRegistration.php @@ -7,13 +7,6 @@ use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder; use Illuminate\Contracts\Config\Repository; use Illuminate\Notifications\AnonymousNotifiable; -/** - * Class HandleManualRegistration - * - * @link http://openclassify.com/ - * @author OpenClassify, Inc. - * @author Visiosoft Inc - */ class HandleManualRegistration { protected $builder; @@ -23,12 +16,6 @@ class HandleManualRegistration $this->builder = $builder; } - /** - * Handle the command. - * - * @param MessageBag $messages - * @param Repository $config - */ public function handle(MessageBag $messages, Repository $config) { if (!is_null($message = $this->builder->getFormOption('pending_message'))) { diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php index 29a291005..a44f61865 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php @@ -1,51 +1,22 @@ - * @author Visiosoft Inc - */ class Register2FormBuilder extends FormBuilder { - - /** - * The form roles. - * - * @var array - */ protected $roles = [ 'user', ]; - /** - * The form model. - * - * @var string - */ protected $model = UserModel::class; - /** - * The form actions. - * - * @var array - */ protected $actions = [ 'blue' => [ 'text' => 'anomaly.module.users::button.register', ], ]; - /** - * The form options. - * - * @var array - */ protected $options = [ 'redirect' => '/', 'success_message' => 'anomaly.module.users::success.user_registered', @@ -54,22 +25,11 @@ class Register2FormBuilder extends FormBuilder 'activated_message' => 'anomaly.module.users::message.account_activated', ]; - /** - * Get the roles. - * - * @return array - */ public function getRoles() { return $this->roles; } - /** - * Set roles. - * - * @param $roles - * @return $this - */ public function setRoles($roles) { $this->roles = $roles; diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php index fd43dc3ab..e24e6b60c 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php @@ -7,7 +7,6 @@ use Anomaly\UsersModule\User\Event\UserHasRegistered; use Anomaly\UsersModule\User\UserActivator; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Support\Facades\Auth; use Visiosoft\ProfileModule\Profile\Register2\Command\HandleAutomaticRegistration; use Visiosoft\ProfileModule\Profile\Register2\Command\HandleEmailRegistration; use Visiosoft\ProfileModule\Profile\Register2\Command\HandleManualRegistration; diff --git a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormBuilder.php index 77eb18e2f..793618da7 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormBuilder.php @@ -5,7 +5,6 @@ use Anomaly\UsersModule\User\Contract\UserInterface; use Anomaly\UsersModule\User\UserSecurity; use Symfony\Component\HttpFoundation\Response; - class SignInFormBuilder extends FormBuilder { protected $model = false; diff --git a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php index 4ccada848..ba08765ce 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/SignIn/SignInFormHandler.php @@ -5,7 +5,6 @@ use Anomaly\UsersModule\User\UserSecurity; use Illuminate\Routing\Redirector; use Symfony\Component\HttpFoundation\Response; - class SignInFormHandler { public function handle( diff --git a/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php index dea2ed4fa..db48ea612 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/User/UserFormBuilder.php @@ -3,7 +3,6 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder; use Anomaly\UsersModule\User\UserModel; - class UserFormBuilder extends FormBuilder { diff --git a/addons/default/visiosoft/profile-module/src/Profile/UsersExport.php b/addons/default/visiosoft/profile-module/src/Profile/UsersExport.php index a3bd6823f..0cddf01d2 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/UsersExport.php +++ b/addons/default/visiosoft/profile-module/src/Profile/UsersExport.php @@ -7,9 +7,6 @@ use Maatwebsite\Excel\Concerns\WithMapping; class UsersExport implements WithMapping, FromCollection, WithHeadings { - /** - * @return User[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection - */ public function collection() { return User::all(); diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php index 83ea1166c..271b7fa8c 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateCredentials.php @@ -10,7 +10,6 @@ use Symfony\Component\HttpFoundation\Response; use Visiosoft\ProfileModule\Profile\Events\SendEmptyPassword; use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder; - class ValidateCredentials { private $extensions; @@ -101,7 +100,6 @@ class ValidateCredentials public function handle(SignInFormBuilder $builder) { - if (!$response = $this->authenticate($builder->getPostData())) { return false; } diff --git a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php index 03ef94cfe..7b9f63ea0 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Validation/ValidateRegister.php @@ -14,6 +14,7 @@ class ValidateRegister $builder->addFormError('phone', trans('visiosoft.module.profile::message.registered_phone')); return false; } + return true; } } diff --git a/addons/default/visiosoft/profile-module/src/Profile/sites/SitesFormBuilder.php b/addons/default/visiosoft/profile-module/src/Profile/sites/SitesFormBuilder.php index bdbe4e5f7..070fea0d1 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/sites/SitesFormBuilder.php +++ b/addons/default/visiosoft/profile-module/src/Profile/sites/SitesFormBuilder.php @@ -1,79 +1,27 @@ [ 'text' => 'visiosoft.module.subscriptions::button.create', ], ]; - /** - * The form buttons. - * - * @var array|string - */ protected $buttons = [ 'cancel', ]; - /** - * The form options. - * - * @var array - */ protected $options = [ 'redirect' => '/admin/subscriptions/', ]; - - /** - * The form sections. - * - * @var array - */ - protected $sections = []; - - /** - * The form assets. - * - * @var array - */ - protected $assets = []; - } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModule.php b/addons/default/visiosoft/profile-module/src/ProfileModule.php index 20ec78a93..6604d020b 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModule.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModule.php @@ -4,26 +4,10 @@ use Anomaly\Streams\Platform\Addon\Module\Module; class ProfileModule extends Module { - - /** - * The navigation display flag. - * - * @var bool - */ protected $navigation = true; - /** - * The addon icon. - * - * @var string - */ protected $icon = 'fa fa-user'; - /** - * The module sections. - * - * @var array - */ protected $sections = [ 'adress' => [ 'buttons' => [ @@ -41,5 +25,4 @@ class ProfileModule extends Module ] ], ]; - } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php index f5ea801fa..bc933a51c 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModulePlugin.php @@ -7,9 +7,6 @@ use Visiosoft\ProfileModule\Profile\Command\GetProfileDetail; class ProfileModulePlugin extends Plugin { - /** - * @return array - */ public function getFunctions() { return [ diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php index 874069301..5cf9c9fed 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php @@ -1,45 +1,11 @@ disks = $disks; - $this->folders = $folders; - } - - /** - * Run the seeder. - */ public function run() { // Users Fields Seeder diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 422a476cf..0a2d8a4cc 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -19,7 +19,6 @@ use Visiosoft\ProfileModule\Http\Middleware\OGImage; use Visiosoft\ProfileModule\Profile\Password\ForgotPassFormBuilder; use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder; use Visiosoft\ProfileModule\Profile\Profile\ProfileFormBuilder; -use Illuminate\Routing\Router; use Visiosoft\ProfileModule\Profile\Register2\Register2FormBuilder; use Visiosoft\ProfileModule\Profile\SignIn\SignInFormBuilder; use Visiosoft\ProfileModule\Profile\sites\SitesFormBuilder;