Merge branch 'feature/47' into develop

Close #47

Author: weierophinney

CHANGELOG.md

@@ -8,6 +8,11 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#18](https://github.com/zendframework/zend-validator/pull/18) adds a `GpsPoint`
   validator for validating GPS coordinates.
+- [#47](https://github.com/zendframework/zend-validator/pull/47) adds two new
+  classes, `Zend\Validator\Isbn\Isbn10` and `Isbn13`; these classes are the
+  result of an extract class refactoring, and contain the logic specific to
+  calcualting the checksum for each ISBN style. `Zend\Validator\Isbn` now
+  instantiates the appropriate one and invokes it.
 
 ### Deprecated
 

src/Isbn.php

@@ -2,8 +2,8 @@
 /**
  * Zend Framework (http://framework.zend.com/)
  *
- * @link      http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @link      http://github.com/zendframework/zend-validator for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
  */
 
@@ -101,45 +101,21 @@ public function isValid($value)
 
         switch ($this->detectFormat()) {
             case self::ISBN10:
-                // sum
-                $isbn10 = str_replace($this->getSeparator(), '', $value);
-                $sum    = 0;
-                for ($i = 0; $i < 9; $i++) {
-                    $sum += (10 - $i) * $isbn10{$i};
-                }
-
-                // checksum
-                $checksum = 11 - ($sum % 11);
-                if ($checksum == 11) {
-                    $checksum = '0';
-                } elseif ($checksum == 10) {
-                    $checksum = 'X';
-                }
+                $isbn = new Isbn\Isbn10();
                 break;
 
             case self::ISBN13:
-                // sum
-                $isbn13 = str_replace($this->getSeparator(), '', $value);
-                $sum    = 0;
-                for ($i = 0; $i < 12; $i++) {
-                    if ($i % 2 == 0) {
-                        $sum += $isbn13{$i};
-                    } else {
-                        $sum += 3 * $isbn13{$i};
-                    }
-                }
-                // checksum
-                $checksum = 10 - ($sum % 10);
-                if ($checksum == 10) {
-                    $checksum = '0';
-                }
+                $isbn = new Isbn\Isbn13();
                 break;
 
             default:
                 $this->error(self::NO_ISBN);
                 return false;
         }
 
+        $value = str_replace($this->getSeparator(), '', $value);
+        $checksum = $isbn->getChecksum($value);
+
         // validate
         if (substr($this->getValue(), -1) != $checksum) {
             $this->error(self::NO_ISBN);

src/Isbn/Isbn10.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zend-validator for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Validator\Isbn;
+
+class Isbn10
+{
+    /**
+     * @param int|string $value
+     * @return int|string
+     */
+    public function getChecksum($value)
+    {
+        $sum = $this->sum($value);
+        return $this->checksum($sum);
+    }
+
+    /**
+     * Calculate the value sum.
+     *
+     * @param int|string $value
+     * @return int
+     */
+    private function sum($value)
+    {
+        $sum = 0;
+
+        for ($i = 0; $i < 9; $i++) {
+            $sum += (10 - $i) * $value{$i};
+        }
+
+        return $sum;
+    }
+
+    /**
+     * Calculate the checksum for the value's sum.
+     *
+     * @param int $sum
+     * @return int|string
+     */
+    private function checksum($sum)
+    {
+        $checksum = 11 - ($sum % 11);
+
+        if ($checksum == 11) {
+            return '0';
+        }
+
+        if ($checksum == 10) {
+            return 'X';
+        }
+
+        return $checksum;
+    }
+}

src/Isbn/Isbn13.php

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zend-validator for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace Zend\Validator\Isbn;
+
+class Isbn13
+{
+    /**
+     * @param int|string $value
+     * @return int|string
+     */
+    public function getChecksum($value)
+    {
+        $sum = $this->sum($value);
+        return $this->checksum($sum);
+    }
+
+    /**
+     * Calculate the value sum.
+     *
+     * @param int|string $value
+     * @return int
+     */
+    private function sum($value)
+    {
+        $sum = 0;
+
+        for ($i = 0; $i < 12; $i++) {
+            if ($i % 2 == 0) {
+                $sum += $value{$i};
+                continue;
+            }
+
+            $sum += 3 * $value{$i};
+        }
+
+        return $sum;
+    }
+
+    /**
+     * Calculate the checksum for the value's sum.
+     *
+     * @param int $sum
+     * @return int|string
+     */
+    private function checksum($sum)
+    {
+        $checksum = 10 - ($sum % 10);
+
+        if ($checksum == 10) {
+            return '0';
+        }
+
+        return $checksum;
+    }
+}