Merge pull request #14 from brazanation/cleanup

remove unsed code
brazanation · Aug 25, 2016 · eb5e707 · eb5e707
2 parents 6a2c868 + 68addaa
commit eb5e707
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/src/Cnpj.php b/src/Cnpj.php
@@ -12,8 +12,6 @@ final class Cnpj implements DocumentInterface
 
     const REGEX = '/^([\d]{2,3})([\d]{3})([\d]{3})([\d]{4})([\d]{2})$/';
 
-    const FORMAT_REGEX = '/^[\d]{2,3}\.[\d]{3}\.[\d]{3}\/[\d]{4}-[\d]{2}$/';
-
     /**
      * @var string
      */

diff --git a/src/Cpf.php b/src/Cpf.php
@@ -12,8 +12,6 @@ final class Cpf implements DocumentInterface
 
     const REGEX = '/^([\d]{3})([\d]{3})([\d]{3})([\d]{2})$/';
 
-    const FORMAT_REGEX = '/^[\d]{3}\.[\d]{3}\.[\d]{3}-[\d]{2}$/';
-
     /**
      * @var string
      */

diff --git a/src/NFeAccessKey.php b/src/NFeAccessKey.php
@@ -52,14 +52,14 @@ public static function generate($state, \DateTime $generatedAt, Cnpj $cnpj, $ser
 
         $baseNumber = "{$state}{$yearMonth}{$cnpj}{$model}{$serie}{$invoiceNumber}{$controlNumber}";
 
-        $digit = self::calculateDigits($baseNumber);
+        $digit = self::calculateDigit($baseNumber);
 
         return new self("{$baseNumber}{$digit}");
     }
 
     public function format()
     {
-        return trim(preg_replace(static::REGEX, static::MASK, $this->nfeKey));
+        return trim(preg_replace(self::REGEX, self::MASK, $this->nfeKey));
     }
 
     public function __toString()
@@ -70,29 +70,34 @@ public function __toString()
     private function validate($number)
     {
         if (empty($number)) {
-            throw InvalidDocumentException::notEmpty(static::LABEL);
+            throw InvalidDocumentException::notEmpty(self::LABEL);
         }
         if (!$this->isValid($number)) {
-            throw InvalidDocumentException::isNotValid(static::LABEL, $number);
+            throw InvalidDocumentException::isNotValid(self::LABEL, $number);
         }
     }
 
     private function isValid($number)
     {
-        if (strlen($number) != static::LENGTH) {
+        if (strlen($number) != self::LENGTH) {
             return false;
         }
 
-        if (preg_match("/^{$number[0]}{" . static::LENGTH . '}$/', $number)) {
+        if (preg_match("/^{$number[0]}{" . self::LENGTH . '}$/', $number)) {
             return false;
         }
 
-        $digits = static::calculateDigits(substr($number, 0, -1));
+        $digits = self::calculateDigit(substr($number, 0, -1));
 
         return $digits === substr($number, -1);
     }
 
-    private static function calculateDigits($baseNumber)
+    /**
+     * @param string $baseNumber
+     *
+     * @return string
+     */
+    private static function calculateDigit($baseNumber)
     {
         $calculator = new DigitCalculator($baseNumber);
         $calculator->useComplementaryInsteadOfModule();

diff --git a/src/PisPasep.php b/src/PisPasep.php
@@ -12,15 +12,11 @@ final class PisPasep implements DocumentInterface
 
     const REGEX = '/^([\d]{3})([\d]{5})([\d]{2})([\d]{1})$/';
 
-    const FORMAT_REGEX = '/^[\d]{3}\.[\d]{5}\.[\d]{2}-[\d]{1}$/';
-
     /**
      * @var string
      */
     private $pispasep;
 
-    protected $mask = '000.00000.00-0';
-
     /**
      * PisPasep constructor.
      *
@@ -53,7 +49,7 @@ private function isValidCV($number)
             return false;
         }
 
-        $digits = $this->calculateDigits(substr($number, 0, -1));
+        $digits = $this->calculateDigit(substr($number, 0, -1));
 
         return $digits === substr($number, -1);
     }
@@ -80,7 +76,7 @@ public function __toString()
      *
      * @return string
      */
-    private function calculateDigits($number)
+    private function calculateDigit($number)
     {
         $calculator = new DigitCalculator($number);
         $calculator->withMultipliersInterval(2, 9);