Stronger conditions for filtering parameters

~dev_rating/application/classes/Model/Helper/CourseWorkBuilder.php

@@ -42,7 +42,7 @@ class Model_Helper_CourseWorkBuilder extends Model_Helper_Builder
 
     /** Must be called after subtype() */
     function & subject($id) {
-        if ($this->data['Subtype'] == Model_CourseWork::SCIENTIFIC)
+        if ($this->data['Subtype'] === Model_CourseWork::SCIENTIFIC)
             $id = self::COURSEWORK_DISCIPLINE_ID;
 
         if (!is_numeric($id) || $id <= 0)
@@ -53,6 +53,9 @@ class Model_Helper_CourseWorkBuilder extends Model_Helper_Builder
     }
 
     function & subtype($name) {
+        if (!is_string($name))
+            throw new InvalidArgumentException('Type is incorrect');
+
         switch ($name) {
             case Model_CourseWork::DISCIPLINARY:
             case Model_CourseWork::SCIENTIFIC:

~dev_rating/application/classes/Model/Helper/DisciplineBuilder.php

@@ -65,8 +65,18 @@ class Model_Helper_DisciplineBuilder extends Model_Helper_Builder
     }
 
     function & type($name) {
-        if (!$name)  // todo: enum
-            throw new InvalidArgumentException('type is incorrect');
+        if (!is_string($name))
+            throw new InvalidArgumentException('Type is incorrect');
+
+        switch ($name) {
+            case Model_Discipline::EXAM:
+            case Model_Discipline::CREDIT:
+            case Model_Discipline::GRADING_CREDIT:
+                break;
+            default:
+                throw new InvalidArgumentException('Type is incorrect');
+        }
+
         $this->data['Type'] = $name;
         return $this;
     }