Minor CS/test changes

- Whitespace and conditional formatting in main class
- Use labels with all data provider cases

Author: weierophinney

src/Uuid.php

@@ -1,11 +1,7 @@
 <?php
-
 /**
- * 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
  */
 
@@ -28,8 +24,8 @@ final class Uuid extends AbstractValidator
      * @var array
      */
     protected $messageTemplates = [
-        self::NOT_STRING => 'Invalid type given. String expected',
-        self::INVALID => 'Invalid Uuid format',
+        self::NOT_STRING => 'Invalid type given; string expected',
+        self::INVALID => 'Invalid UUID format',
     ];
 
     /**
@@ -47,18 +43,18 @@ final class Uuid extends AbstractValidator
      */
     public function isValid($value)
     {
-        if (!is_string($value)) {
+        if (! is_string($value)) {
             $this->error(self::NOT_STRING);
-
             return false;
         }
 
         $this->setValue($value);
 
-        if (empty($value) || $value !== '00000000-0000-0000-0000-000000000000'
-            && !preg_match(self::REGEX_UUID, $value)) {
+        if (empty($value)
+            || $value !== '00000000-0000-0000-0000-000000000000'
+            && ! preg_match(self::REGEX_UUID, $value)
+        ) {
             $this->error(self::INVALID);
-
             return false;
         }
 

test/UuidTest.php

@@ -1,39 +1,34 @@
 <?php
-
 /**
- * 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
  */
 
 namespace ZendTest\Validator;
 
+use PHPUnit_Framework_TestCase as TestCase;
+use stdClass;
 use Zend\Validator\Uuid;
 
 /**
  * Class UuidTest.
  *
  * Uuid test cases based on https://github.com/beberlei/assert/blob/master/tests/Assert/Tests/AssertTest.php
  */
-final class UuidTest extends \PHPUnit_Framework_TestCase
+final class UuidTest extends TestCase
 {
-    /** @var Uuid */
-    protected $validator;
-
     /**
-     * setUp.
+     * @var Uuid
      */
+    protected $validator;
+
     public function setUp()
     {
         $this->validator = new Uuid();
     }
 
     /**
-     * testValidUuids.
-     *
      * @param $uuid
      * @dataProvider validUuidProvider
      */
@@ -45,8 +40,6 @@ public function testValidUuid($uuid)
     }
 
     /**
-     * testValidUuids.
-     *
      * @param $uuid
      * @dataProvider invalidUuidProvider
      */
@@ -60,40 +53,36 @@ public function testInvalidUuid($uuid, $expectedMessageKey)
     }
 
     /**
-     * providesValidUuids.
-     *
      * @return array
      */
     public function validUuidProvider()
     {
         return [
-            ['00000000-0000-0000-0000-000000000000'],
-            ['ff6f8cb0-c57d-11e1-9b21-0800200c9a66'],
-            ['ff6f8cb0-c57d-21e1-9b21-0800200c9a66'],
-            ['ff6f8cb0-c57d-31e1-9b21-0800200c9a66'],
-            ['ff6f8cb0-c57d-41e1-9b21-0800200c9a66'],
-            ['ff6f8cb0-c57d-51e1-9b21-0800200c9a66'],
-            ['FF6F8CB0-C57D-11E1-9B21-0800200C9A66'],
+            'zero-fill' => ['00000000-0000-0000-0000-000000000000'],
+            'version-1' => ['ff6f8cb0-c57d-11e1-9b21-0800200c9a66'],
+            'version-2' => ['ff6f8cb0-c57d-21e1-9b21-0800200c9a66'],
+            'version-3' => ['ff6f8cb0-c57d-31e1-9b21-0800200c9a66'],
+            'version-4' => ['ff6f8cb0-c57d-41e1-9b21-0800200c9a66'],
+            'version-5' => ['ff6f8cb0-c57d-51e1-9b21-0800200c9a66'],
+            'uppercase' => ['FF6F8CB0-C57D-11E1-9B21-0800200C9A66'],
         ];
     }
 
     /**
-     * invalidUuidProvider.
-     *
      * @return array
      */
     public function invalidUuidProvider()
     {
         return [
-            ['zf6f8cb0-c57d-11e1-9b21-0800200c9a66', Uuid::INVALID],
-            ['af6f8cb0c57d11e19b210800200c9a66', Uuid::INVALID],
-            ['ff6f8cb0-c57da-51e1-9b21-0800200c9a66', Uuid::INVALID],
-            ['af6f8cb-c57d-11e1-9b21-0800200c9a66', Uuid::INVALID],
-            ['3f6f8cb0-c57d-11e1-9b21-0800200c9a6', Uuid::INVALID],
-            ['3f6f8cb0', Uuid::INVALID],
-            ['', Uuid::INVALID],
-            [123, Uuid::NOT_STRING],
-            [new \stdClass(), Uuid::NOT_STRING],
+            'invalid-characters' => ['zf6f8cb0-c57d-11e1-9b21-0800200c9a66', Uuid::INVALID],
+            'missing-separators' => ['af6f8cb0c57d11e19b210800200c9a66', Uuid::INVALID],
+            'invalid-segment-2'  => ['ff6f8cb0-c57da-51e1-9b21-0800200c9a66', Uuid::INVALID],
+            'invalid-segment-1'  => ['af6f8cb-c57d-11e1-9b21-0800200c9a66', Uuid::INVALID],
+            'invalid-segement-5' => ['3f6f8cb0-c57d-11e1-9b21-0800200c9a6', Uuid::INVALID],
+            'truncated'          => ['3f6f8cb0', Uuid::INVALID],
+            'empty-string'       => ['', Uuid::INVALID],
+            'all-numeric'        => [123, Uuid::NOT_STRING],
+            'object'             => [new stdClass(), Uuid::NOT_STRING],
         ];
     }
 }