Continued:

[core.git] / framework / main / classes / filter / validator / class_PasswordValidatorFilter.php

diff --git a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
index 3c0ad07113dd851db4002e3f62f93d53f5da7889..87a8ebe6f0caa5f27e1fd1fc266f909c24ac9109 100644 (file)
--- a/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
+++ b/framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
@@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Validator\Password;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
@@ -14,11 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
-<<<<<<< HEAD:framework/main/classes/filter/validator/class_PasswordValidatorFilter.php
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
-=======
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
->>>>>>> Some updates::inc/main/classes/filter/validator/class_PasswordValidatorFilter.php
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2021 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -41,7 +38,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -90,13 +87,13 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
                        if (empty($password1)) {
                                // Add a message to the response
                                $responseInstance->addFatalMessage('pass1_empty');
-                       } // END - if
+                       }
 
                        // Is the confirmation empty?
                        if (empty($password2)) {
                                // Add a message to the response
                                $responseInstance->addFatalMessage('pass2_empty');
-                       } // END - if
+                       }
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
@@ -109,7 +106,7 @@ class PasswordValidatorFilter extends BaseFilter implements Filterable {
 
                        // Abort here
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
-               } // END - elseif
+               }
        }
 
 }