Static variables where possible to reduce memory usage

nilportugues · Sep 18, 2015 · 86f4c75 · 86f4c75
1 parent 96cd438
commit 86f4c75
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 30 deletions.
diff --git a/examples/basic_validation.php b/examples/basic_validation.php
@@ -48,7 +48,7 @@ class UserValidator
     /**
      * @var NilPortugues\Validator\Validator
      */
-    private $validator;
+    private static $validator;
 
     /**
      * @var array
@@ -61,11 +61,13 @@ class UserValidator
     private $isValid = true;
 
     /**
-     * @param \NilPortugues\Validator\Validator $validator
+     * 
      */
-    public function __construct(\NilPortugues\Validator\Validator $validator)
+    public function __construct()
     {
-        $this->validator = $validator;
+        if(!isset(self::$validator)) {
+            self::$validator = new \NilPortugues\Validator\Validator();
+        }
     }
 
     /**
@@ -98,7 +100,7 @@ public function getErrors()
      */
     private function validateGender(Request $request)
     {
-        $gender = $this->validator->isInteger('gender');
+        $gender = self::$validator->isInteger('gender');
 
         $result = $gender
             ->isRequired()
@@ -117,7 +119,7 @@ private function validateGender(Request $request)
      */
     private function validateEmail(Request $request)
     {
-        $email = $this->validator->isString('email');
+        $email = self::$validator->isString('email');
 
         $result = $email
             ->isRequired()
@@ -135,7 +137,7 @@ private function validateEmail(Request $request)
      */
     private function validatePassword(Request $request)
     {
-        $password = $this->validator->isString('password');
+        $password = self::$validator->isString('password');
 
         $result = $password
             ->isRequired()
@@ -156,7 +158,7 @@ private function validatePassword(Request $request)
      */
     private function validateUsername(Request $request)
     {
-        $username = $this->validator->isString('username');
+        $username = self::$validator->isString('username');
 
         $result = $username
             ->isRequired()
@@ -169,8 +171,9 @@ private function validateUsername(Request $request)
     }
 }
 
-$validator     = new \NilPortugues\Validator\Validator();
-$userValidator = new UserValidator($validator);
+
+
+$userValidator = new UserValidator();
 
 $request1 = new Request('nilportugues', 'password', 'hello@world.com', '1');
 $request2 = new Request('nil', 'password', 'not-an-email.com', '');

diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php
@@ -19,12 +19,12 @@ abstract class AbstractValidator
     /**
      * @var Validator
      */
-    protected static $validator;
+    protected $validator;
 
     /**
      * @var ValidatorFunctionMap
      */
-    protected static $functionMap;
+    protected $functionMap;
 
     /**
      * @var array
@@ -39,7 +39,7 @@ abstract class AbstractValidator
     /**
      * @var array
      */
-    protected static $errorArray = [];
+    protected $errorArray = [];
 
     /**
      * @param Validator $validator
@@ -48,9 +48,9 @@ abstract class AbstractValidator
      */
     public function __construct(Validator $validator, array &$errorMessages, array &$functionMap)
     {
-        self::$validator   = $validator;
-        self::$functionMap = new ValidatorFunctionMap($this, $functionMap);
-        self::$errorArray  = $errorMessages;
+        $this->validator   = $validator;
+        $this->functionMap = ValidatorFunctionMap::getInstance($this, $functionMap);
+        $this->errorArray  = $errorMessages;
     }
 
     /**
@@ -99,12 +99,12 @@ public function validate($value, $stopOnError = false)
                 $arguments = array_merge([$value], $condition['arguments']);
             }
 
-            $isValid = $isValid && self::$functionMap->get(
-                    self::$validator->getPropertyName(),
+            $isValid = $isValid && $this->functionMap->get(
+                    $this->validator->getPropertyName(),
                     $condition['key'],
                     $arguments,
                     $condition['values'],
-                    self::$errorArray
+                    $this->errorArray
                 );
 
             if (false === $isValid) {
@@ -143,7 +143,7 @@ private function getErrorsForValidatorsAsArguments($arguments)
      */
     public function setError($error, $propertyName)
     {
-        $this->errors[self::$validator->getPropertyName()][$propertyName] = $error;
+        $this->errors[$this->validator->getPropertyName()][$propertyName] = $error;
 
         return $this;
     }

diff --git a/src/ValidatorFunctionMap.php b/src/ValidatorFunctionMap.php
@@ -28,15 +28,35 @@ class ValidatorFunctionMap
      */
     private $validator;
 
+    /**
+     * @var self
+     */
+    private static $instance;
+
     /**
      * @param AbstractValidator $abstractValidator
-     * @param array             $functionMap
+     * @param array $functionMap
      */
-    public function __construct(AbstractValidator $abstractValidator, array &$functionMap)
+    private function __construct(AbstractValidator $abstractValidator, array &$functionMap)
     {
         $this->validator   = $abstractValidator;
         $this->functionMap = $functionMap;
     }
+    /**
+     * @param AbstractValidator $abstractValidator
+     * @param array $functionMap
+     * @return ValidatorFunctionMap
+     */
+    public static function getInstance(AbstractValidator $abstractValidator, array &$functionMap)
+    {
+        if (!isset(self::$instance)) {
+            self::$instance = new self($abstractValidator, $functionMap);
+        }
+        $i = self::$instance;
+        $i->validator = $abstractValidator;
+
+        return self::$instance;
+    }
 
     /**
      * Gets the function from the function map and runs it against the values.

diff --git a/tests/Resources/DummyFileUpload.php b/tests/Resources/DummyFileUpload.php
@@ -23,7 +23,7 @@ class DummyFileUpload
      *
      * @throws \NilPortugues\Validator\Validation\FileUpload\FileUploadException
      */
-    public static function isBetween($uploadName)
+    public static function isBetween($minSize, $maxSize, $format = 'B', $inclusive = false)
     {
         throw new FileUploadException($uploadName);
     }

diff --git a/tests/ValidatorFunctionMapTest.php b/tests/ValidatorFunctionMapTest.php
@@ -29,7 +29,7 @@ public function itShouldInvalidArgumentExceptionWhenFunctionNoInMap()
             ->getMock();
 
         $functionMapArray = [];
-        $functionMap      = new ValidatorFunctionMap($abstractValidator, $functionMapArray);
+        $functionMap      = ValidatorFunctionMap::getInstance($abstractValidator, $functionMapArray);
         $errors           = [];
         $errorValues      = [];
 
@@ -51,15 +51,15 @@ public function itShouldThrowExceptionWhenErrorMessageDoesNotExist()
             ->getMock();
 
         $functionMapArray = ['String::isAlpha' => '\NilPortugues\Validator\Validation\String\StringValidation::isAlpha'];
-        $functionMap      = new ValidatorFunctionMap($abstractValidator, $functionMapArray);
+        $functionMap      = ValidatorFunctionMap::getInstance($abstractValidator, $functionMapArray);
         $errors           = [];
         $values           = ['@'];
 
         $this->setExpectedException(
             '\InvalidArgumentException',
             'Validator key \'string.is_alpha\' not found in error file'
         );
-        $functionMap->get('property', 'String::isAlpha', $values, $values, $errors);
+        $functionMap->get('property', 'StringAttribute::isAlpha', $values, $values, $errors);
     }
 
     /**
@@ -83,13 +83,13 @@ public function itShouldFileUploadException()
             ->getMock();
 
         $functionMapArray = [
-            'FileUpload::isBetween' => '\Tests\NilPortugues\Validator\Resources\DummyFileUpload::isBetween',
+            'FileUploadAttribute::isBetween' => '\Tests\NilPortugues\Validator\Resources\DummyFileUpload::isBetween',
         ];
 
-        $functionMap = new ValidatorFunctionMap($abstractValidator, $functionMapArray);
-        $values      = ['image'];
+        $functionMap =  ValidatorFunctionMap::getInstance($abstractValidator, $functionMapArray);
+        $values      = ['image', 0, 2, 'MB', true];
         $errors      = ['FileUpload::UPLOAD_ERR_INI_SIZE' => 'error message'];
 
-        $this->assertFalse($functionMap->get('image', 'FileUpload::isBetween', $values, $values, $errors));
+        $this->assertFalse($functionMap->get('image', 'FileUploadAttribute::isBetween', $values, $values, $errors));
     }
 }