Merge pull request #15 from LearningLocker/issue/14

Make validateIdentifiers a truthy experience in both Agent and Group
LearningLocker · Aug 25, 2016 · 61a6aa2 · 61a6aa2
2 parents 3b6a473 + 43585f0
commit 61a6aa2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Agent.php b/src/Agent.php
@@ -34,17 +34,18 @@ protected function identifierError($used_identifiers) {
   }
 
   protected function validateIdentifiers($used_identifiers) {
-    return $used_identifiers !== 1;
+    return $used_identifiers === 1;
   }
 
   public function validate() {
     $errors = $this->validateTypedElement();
 
     // Gets the used identifiers.
     $used_identifiers = $this->countIdentifiers();
+    $hasOneIdent = $this->validateIdentifiers($used_identifiers);
 
     // Checks that only one identifier is used.
-    if ($this->validateIdentifiers($used_identifiers)) {
+    if (!$hasOneIdent) {
       $errors[] = new Error($this->identifierError($used_identifiers));
     }
 

diff --git a/src/Group.php b/src/Group.php
@@ -13,9 +13,9 @@ protected function identifierError($used_identifiers) {
   }
 
   protected function validateIdentifiers($used_identifiers) {
-    $members = $this->getPropValue('member') ?: null;
-    $validateIdentifiers = parent::validateIdentifiers($used_identifiers);
-    $validateMembers = $members === null || count($members) === 0;
-    return $validateIdentifiers && $validateMembers;
+    $members = $this->getPropValue('member');
+    $hasOneIdent = parent::validateIdentifiers($used_identifiers);
+    $hasMembers = !is_null($members) && count($members) > 0;
+    return $hasOneIdent || (!$hasOneIdent && $hasMembers);
   }
 }